[qmapshack] 01/05: New upstream version 1.10.0

Bas Couwenberg sebastic at debian.org
Thu Dec 21 17:17:16 UTC 2017


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qmapshack.

commit 45c0ce7f710c9b0fb6888ed7071089b412109da7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 21 16:56:01 2017 +0100

    New upstream version 1.10.0
---
 CMakeLists.txt                                     |     4 +-
 CMakeLists.txt.user                                |    31 +-
 README.md                                          |     2 +-
 changelog.txt                                      |    19 +
 src/CMainWindow.cpp                                |   137 +-
 src/CMainWindow.h                                  |     9 +-
 src/CMakeLists.txt                                 |  1100 +-
 src/IMainWindow.ui                                 |   106 +-
 src/canvas/CCanvas.cpp                             |   106 +-
 src/canvas/CCanvas.h                               |    11 +-
 src/cursors/cursorRadiusWpt.png                    |   Bin 0 -> 1557 bytes
 src/dem/IDemList.ui                                |    14 +-
 src/device/IDevice.cpp                             |    22 +
 src/device/IDevice.h                               |     3 +
 src/gis/{CSetupFilter.cpp => CGisDatabase.cpp}     |    49 +-
 src/gis/{CSetupFilter.h => CGisDatabase.h}         |    31 +-
 src/gis/CGisDraw.cpp                               |     8 +-
 src/gis/CGisListDB.cpp                             |     8 +-
 src/gis/CGisListWks.cpp                            |   142 +-
 src/gis/CGisListWks.h                              |     8 +
 src/gis/{CGisWidget.cpp => CGisWorkspace.cpp}      |   257 +-
 src/gis/{CGisWidget.h => CGisWorkspace.h}          |    41 +-
 src/gis/CSetupFilter.cpp                           |     8 +-
 src/gis/CSetupFilter.h                             |     6 +-
 src/gis/IGisDatabase.ui                            |   123 +
 src/gis/IGisItem.cpp                               |    30 +-
 src/gis/IGisItem.h                                 |     5 +-
 src/gis/{IGisWidget.ui => IGisWorkspace.ui}        |    87 +-
 src/gis/db/CDBFolderLostFound.cpp                  |     8 +-
 src/gis/db/CDBItem.cpp                             |    10 +-
 src/gis/db/CDBProject.cpp                          |     9 +-
 src/gis/db/CExportDatabaseThread.cpp               |     2 +-
 src/gis/db/CSearchDatabase.cpp                     |     2 +-
 src/gis/db/IDBFolder.cpp                           |    16 +-
 src/gis/gpx/serialization.cpp                      |     2 +-
 src/gis/ovl/CGisItemOvlArea.h                      |     2 +-
 src/gis/ovl/CScrOptOvlArea.cpp                     |    12 +-
 src/gis/prj/CDetailsPrj.cpp                        |     6 +-
 src/gis/prj/IGisProject.cpp                        |    65 +-
 src/gis/prj/IGisProject.h                          |    10 +
 src/gis/qlb/CQlbProject.cpp                        |   145 +
 src/gis/{CSetupFilter.h => qlb/CQlbProject.h}      |    36 +-
 src/gis/qms/serialization.cpp                      |     3 +
 src/gis/rte/CCreateRouteFromWpt.cpp                |     6 +-
 src/gis/rte/CGisItemRte.cpp                        |     8 +-
 src/gis/rte/CGisItemRte.h                          |     2 +-
 src/gis/rte/CScrOptRte.cpp                         |    20 +-
 src/gis/rte/router/CRouterBRouter.cpp              |    59 +-
 src/gis/rte/router/CRouterBRouter.h                |     4 +-
 src/gis/rte/router/CRouterMapQuest.cpp             |     6 +-
 src/gis/rte/router/CRouterRoutino.cpp              |     4 +-
 src/gis/rte/router/CRouterSetup.cpp                |     2 +-
 src/gis/rte/router/IRouter.h                       |    19 +
 src/gis/rte/router/IRouterBRouter.ui               |    43 +-
 src/gis/rte/router/IRouterRoutino.ui               |    15 +-
 src/gis/suunto/CLogProject.cpp                     |   259 +
 .../CMouseDummy.h => gis/suunto/CLogProject.h}     |    41 +-
 src/gis/suunto/CSmlProject.cpp                     |   260 +
 .../CMouseDummy.h => gis/suunto/CSmlProject.h}     |    41 +-
 src/gis/suunto/ISuuntoProject.cpp                  |   182 +
 src/gis/suunto/ISuuntoProject.h                    |    81 +
 src/gis/trk/CActivityTrk.cpp                       |    36 +-
 src/gis/trk/CCombineTrk.cpp                        |     8 +-
 src/gis/trk/CDetailsTrk.cpp                        |     8 +-
 src/gis/trk/CGisItemTrk.cpp                        |   270 +-
 src/gis/trk/CGisItemTrk.h                          |    45 +-
 src/gis/trk/CKnownExtension.cpp                    |   121 +-
 src/gis/trk/CKnownExtension.h                      |    35 +-
 src/gis/trk/CPropertyTrk.cpp                       |    27 +-
 src/gis/trk/CPropertyTrk.h                         |    11 +-
 src/gis/trk/CScrOptTrk.cpp                         |    26 +-
 src/gis/trk/CTableTrk.cpp                          |    18 +-
 src/gis/trk/filter/CFilterDeleteExtension.cpp      |     2 +-
 src/gis/trk/filter/filter.cpp                      |     6 +-
 src/gis/wpt/CGisItemWpt.cpp                        |   195 +-
 src/gis/wpt/CGisItemWpt.h                          |    41 +-
 src/gis/wpt/CScrOptWpt.cpp                         |    68 +-
 src/gis/wpt/CScrOptWpt.h                           |     4 +
 src/gis/wpt/CScrOptWptRadius.cpp                   |    98 +
 src/gis/wpt/{CScrOptWpt.h => CScrOptWptRadius.h}   |    20 +-
 src/gis/wpt/IScrOptWpt.ui                          |    56 +
 src/gis/wpt/{IScrOptWpt.ui => IScrOptWptRadius.ui} |   106 +-
 src/helpers/CDraw.cpp                              |     5 +-
 src/helpers/CDraw.h                                |     3 +-
 src/helpers/CProgressDialog.cpp                    |    12 +
 src/helpers/CProgressDialog.h                      |     3 +
 src/icons/32x32/Filter.png                         |   Bin 0 -> 694 bytes
 src/icons/32x32/LogProject.png                     |   Bin 0 -> 1279 bytes
 src/icons/32x32/QlbProject.png                     |   Bin 0 -> 1296 bytes
 src/icons/32x32/SmlProject.png                     |   Bin 0 -> 1222 bytes
 src/icons/32x32/ToggleDatabase.png                 |   Bin 0 -> 1356 bytes
 src/icons/32x32/TrackMinMax.png                    |   Bin 0 -> 1244 bytes
 src/icons/32x32/WptAvoid.png                       |   Bin 0 -> 1736 bytes
 src/icons/32x32/WptDelProx.png                     |   Bin 0 -> 711 bytes
 src/icons/32x32/WptEditProx.png                    |   Bin 0 -> 1134 bytes
 src/icons/48x48/Filter.png                         |   Bin 0 -> 996 bytes
 src/icons/48x48/LogProject.png                     |   Bin 0 -> 1888 bytes
 src/icons/48x48/QlbProject.png                     |   Bin 0 -> 1990 bytes
 src/icons/48x48/SmlProject.png                     |   Bin 0 -> 1814 bytes
 src/icons/48x48/ToggleDatabase.png                 |   Bin 0 -> 2045 bytes
 src/icons/48x48/TrackMinMax.png                    |   Bin 0 -> 1969 bytes
 src/icons/48x48/WptAvoid.png                       |   Bin 0 -> 2794 bytes
 src/icons/48x48/WptDelProx.png                     |   Bin 0 -> 1110 bytes
 src/icons/48x48/WptEditProx.png                    |   Bin 0 -> 1780 bytes
 src/icons/Filter.svg                               |    74 +
 src/icons/LogProject.svg                           |   111 +
 src/icons/QlbProject.svg                           |   111 +
 src/icons/SmlProject.svg                           |   111 +
 src/icons/ToggleDatabase.svg                       |   184 +
 src/icons/TrackMinMax.svg                          |   210 +
 src/icons/WptAvoid.svg                             |   163 +
 src/icons/WptDelProx.svg                           |    76 +
 src/icons/WptEditProx.svg                          |   287 +
 src/icons/waypoints/32x32/Summit.png               |   Bin 1194 -> 1169 bytes
 src/icons/waypoints/Summit.svg                     |    47 +-
 src/locale/qmapshack.ts                            |  1362 +-
 src/locale/{qmapshack_es.ts => qmapshack_ca.ts}    |  5371 ++---
 src/locale/qmapshack_cs.ts                         |  2224 ++-
 src/locale/qmapshack_de.ts                         |  1476 +-
 src/locale/qmapshack_es.ts                         | 19921 ++++++++++---------
 src/locale/qmapshack_fr.ts                         |  1820 +-
 src/locale/qmapshack_nl.ts                         |  1432 +-
 src/locale/qmapshack_ru.ts                         |  1461 +-
 src/map/IMapList.ui                                |    12 +-
 src/mouse/CMouseDummy.h                            |     3 -
 src/mouse/CMouseEditArea.cpp                       |     6 +-
 src/mouse/CMouseEditRte.cpp                        |     6 +-
 src/mouse/CMouseEditTrk.cpp                        |     6 +-
 src/mouse/CMouseMoveWpt.cpp                        |    39 +-
 src/mouse/CMouseMoveWpt.h                          |     8 +-
 src/mouse/CMouseNormal.cpp                         |    71 +-
 src/mouse/CMouseNormal.h                           |     4 +-
 src/mouse/CMouseRadiusWpt.cpp                      |   144 +
 src/mouse/{CMouseMoveWpt.h => CMouseRadiusWpt.h}   |    29 +-
 src/mouse/CMouseRangeTrk.cpp                       |    39 +-
 src/mouse/CMouseRangeTrk.h                         |     1 +
 src/mouse/CMouseSelect.cpp                         |    18 +-
 src/mouse/CMouseWptBubble.cpp                      |    12 +-
 src/mouse/CMouseWptBubble.h                        |     1 -
 src/mouse/IMouse.h                                 |    15 +-
 src/mouse/IMouseSelect.cpp                         |     5 -
 src/mouse/IMouseSelect.h                           |     2 -
 src/mouse/IScrOpt.cpp                              |     2 +
 src/mouse/line/CLineOpAddPoint.cpp                 |     3 +
 src/mouse/line/CLineOpDeletePoint.cpp              |     2 +-
 src/mouse/line/ILineOp.cpp                         |    93 +-
 src/mouse/line/ILineOp.h                           |    17 +-
 src/mouse/line/IMouseEditLine.cpp                  |    11 +
 src/mouse/line/IMouseEditLine.h                    |     2 +
 src/plot/CPlot.cpp                                 |     4 +-
 src/plot/CPlotProfile.cpp                          |     4 +-
 src/plot/IPlot.cpp                                 |     8 +-
 src/print/CPrintDialog.cpp                         |     2 +-
 src/qlgt/converter.cpp                             |    21 +-
 src/resources.qrc                                  |   897 +-
 src/tool/CRoutinoDatabaseBuilder.cpp               |     6 +
 src/tool/CRoutinoDatabaseBuilder.h                 |     1 +
 src/tool/IMapVrtBuilder.ui                         |    16 +-
 src/tool/IRoutinoDatabaseBuilder.ui                |    55 +-
 src/units/CUnitsSetup.cpp                          |    20 +
 src/units/ITimeZoneSetup.ui                        |    21 +-
 src/units/IUnit.cpp                                |    50 +-
 src/units/IUnit.h                                  |    14 +
 src/units/IUnitsSetup.ui                           |   145 +-
 src/widgets/CHistoryListWidget.cpp                 |     8 +-
 165 files changed, 25631 insertions(+), 17604 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6be2e4..70131cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,8 @@ endif(WIN32)
 set(APPLICATION_NAME qmapshack)
 
 set(APPLICATION_VERSION_MAJOR "1")
-set(APPLICATION_VERSION_MINOR "9")
-set(APPLICATION_VERSION_PATCH "1")
+set(APPLICATION_VERSION_MINOR "10")
+set(APPLICATION_VERSION_PATCH "0")
 
 add_definitions(-DVER_MAJOR=${APPLICATION_VERSION_MAJOR} -DVER_MINOR=${APPLICATION_VERSION_MINOR} -DVER_STEP=${APPLICATION_VERSION_PATCH} -DAPPLICATION_NAME=${PROJECT_NAME})
 
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
index f443d06..0dbbfec 100644
--- a/CMakeLists.txt.user
+++ b/CMakeLists.txt.user
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.1, 2017-09-17T18:37:15. -->
+<!-- Written by QtCreator 4.4.1, 2017-12-21T08:47:17. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{dde28225-baec-4799-bf76-35ee2cd74ec5}</value>
+  <value type="QByteArray">{866bca39-16eb-4541-961c-07f20b41e42e}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -59,16 +59,21 @@
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
   <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{d45dd77d-c492-49f6-8679-9d0bf3a1f5ad}</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.6.2 (qt5)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.6.2 (qt5)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{8715122a-3e83-46ae-83d4-72f9a7d29e4c}</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <valuelist type="QVariantList" key="CMake.Configuration">
      <value type="QString">BUILD_FOR_LOCAL_SYSTEM:BOOL=ON</value>
-     <value type="QString">CMAKE_BUILD_TYPE:STRING=RelWithDebInfo</value>
+     <value type="QString">CMAKE_BUILD_TYPE:STRING=Debug</value>
+     <value type="QString">CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-7</value>
+     <value type="QString">CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc-7</value>
+     <value type="QString">CMAKE_INSTALL_PREFIX:PATH=/usr</value>
+     <value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
+     <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
      <value type="QString">UPDATE_TRANSLATIONS:BOOL=OFF</value>
     </valuelist>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/oeichler/Code/cpp/build_QMapShack</value>
@@ -79,7 +84,7 @@
        <value type="QString">all</value>
       </valuelist>
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">CMake Build</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
      </valuemap>
@@ -95,7 +100,7 @@
        <value type="QString">clean</value>
       </valuelist>
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">CMake Build</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
      </valuemap>
@@ -169,7 +174,7 @@
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmapshack</value>
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/cpp/build_QMapShack/bin</value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichlerx/Code/cpp/build_QMapShack/bin</value>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmapshack</value>
@@ -222,15 +227,15 @@
      <value type="int">13</value>
      <value type="int">14</value>
     </valuelist>
-    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qttest</value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmaptool</value>
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/cpp/build_QMapShack/bin</value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichlerx/Code/cpp/build_QMapShack/bin</value>
     <value type="int" key="PE.EnvironmentAspect.Base">-1</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qttest (deaktiviert)</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmaptool (deaktiviert)</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.qttest</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.qmaptool</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
diff --git a/README.md b/README.md
index 434266f..98d5ec5 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ And change back to build_QMapShack:
 
         make
 
-As everything is better with a GUI you might want to have a look at [TortoiseHg](http://tortoisehg.bitbucket.org/).
+As everything is better with a GUI you might want to have a look at [TortoiseHg](https://tortoisehg.bitbucket.io/).
 
 Dependencies
 
diff --git a/changelog.txt b/changelog.txt
index c53177d..1a69d07 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,22 @@
+V 1.10.0
+* Fine tune code for screen gestures.
+[Issue #253] Tracksorting in Datawindow somehow random- should be alphabetical
+[Issue #254] Selection in Datawindow does not highligt track on map
+[Issue #257] Diagram - Zoom: Center of zoom should be the mouse position
+[Issue #276] No-go areas in BRouter
+[Issue #279] Suunto SML/LOG : wrong start time
+[Issue #285] Do not add auto-increment number to waypoint names that have no number as last character
+[Issue #284] Read *.qlb from QLandkarte
+[Issue #277] Show position of min/max values for track properties like elevation, speed, etc
+[Issue #275] Some Suunto sml files do not have <UTC> in first <sample>
+[Issue #274] Make visibility of database a toggle option in the menu
+[Issue #256] Option to show inclination in % instead of °
+[Issue #272] Skip message box when changing an imported item
+[Issue #271] Drag'n drop missing - Openambit files
+[Issue #263] Reduce size of y label strings in graphs to avoid unintended truncation
+[Issue #270] Ask to hide invalid points when loading a GPX file with invalid points.
+[Issue #265] Inconsistent timestamp formats?
+
 V 1.9.1
 Add: Fullscreen mode
 Add: Templates for project documentation
diff --git a/src/CMainWindow.cpp b/src/CMainWindow.cpp
index c4a27d4..aed829f 100644
--- a/src/CMainWindow.cpp
+++ b/src/CMainWindow.cpp
@@ -23,7 +23,8 @@
 #include "config.h"
 #include "dem/CDemDraw.h"
 #include "dem/CDemList.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisDatabase.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/IGisLine.h"
 #include "gis/WptIcons.h"
 #include "gis/db/CSetupWorkspace.h"
@@ -76,12 +77,29 @@ CMainWindow::CMainWindow()
 
     initWptIcons();
 
-    IUnit::self().setUnitType((IUnit::type_e)cfg.value("MainWindow/units",IUnit::eTypeMetric).toInt(), this);
+    IUnit::setUnitType((IUnit::type_e)cfg.value("MainWindow/units",IUnit::eTypeMetric).toInt(), this);
+    IUnit::setSlopeMode((IUnit::slope_mode_e)cfg.value("Units/slopeMode", IUnit::eSlopeDegrees).toInt());
+
+    QByteArray tz;
+    IUnit::tz_mode_e tzmode;
+    bool useShortFormat;
+    tz = cfg.value("Units/timezone", "UTC").toByteArray();
+    tzmode = (IUnit::tz_mode_e)cfg.value("Units/timezone/mode", IUnit::eTZUtc).toInt();
+    useShortFormat = cfg.value("Units/time/useShortFormat", false).toBool();
+    IUnit::setTimeZoneSetup(tzmode, tz, useShortFormat);
+
+    IUnit::coord_format_e coordFormat;
+    coordFormat = (IUnit::coord_format_e)cfg.value("Units/coordFormat", IUnit::eCoordFormat1).toInt();
+    IUnit::setCoordFormat(coordFormat);
+
     CKnownExtension::init(IUnit::self());
     CActivityTrk::init();
 
-    gisWidget = new CGisWidget(menuProject, this);
-    dockGis->setWidget(gisWidget);
+    widgetGisWorkspace = new CGisWorkspace(menuProject, this);
+    dockWorkspace->setWidget(widgetGisWorkspace);
+
+    widgetGisDatabase = new CGisDatabase(this);
+    dockDatabase->setWidget(widgetGisDatabase);
 
     // start ---- restore window geometry -----
     cfg.beginGroup("MainWindow");
@@ -133,6 +151,7 @@ CMainWindow::CMainWindow()
     connect(actionPOIText,               &QAction::changed,              this,      &CMainWindow::slotUpdateCurrentWidget);
     connect(actionMapToolTip,            &QAction::changed,              this,      &CMainWindow::slotUpdateCurrentWidget);
     connect(actionNightDay,              &QAction::changed,              this,      &CMainWindow::slotUpdateCurrentWidget);
+    connect(actionMinMaxTrackValues,     &QAction::changed,              this,      &CMainWindow::slotUpdateCurrentWidget);
     connect(actionProfileIsWindow,       &QAction::toggled,              this,      &CMainWindow::slotSetProfileMode);
     connect(actionSetupMapFont,          &QAction::triggered,            this,      &CMainWindow::slotSetupMapFont);
     connect(actionSetupMapBackground,    &QAction::triggered,            this,      &CMainWindow::slotSetupMapBackground);
@@ -146,7 +165,7 @@ CMainWindow::CMainWindow()
     connect(actionSetupCoordFormat,      &QAction::triggered,            this,      &CMainWindow::slotSetupCoordFormat);
     connect(actionSetupToolbar,          &QAction::triggered,            this,      &CMainWindow::slotSetupToolbar);
     connect(actionImportDatabase,        &QAction::triggered,            this,      &CMainWindow::slotImportDatabase);
-    connect(actionSaveGISData,           &QAction::triggered,            gisWidget, &CGisWidget::slotSaveAll);
+    connect(actionSaveGISData,           &QAction::triggered,            widgetGisWorkspace, &CGisWorkspace::slotSaveAll);
     connect(actionLoadGISData,           &QAction::triggered,            this,      &CMainWindow::slotLoadGISData);
     connect(actionVrtBuilder,            &QAction::triggered,            this,      &CMainWindow::slotBuildVrt);
     connect(actionStoreView,             &QAction::triggered,            this,      &CMainWindow::slotStoreView);
@@ -172,9 +191,7 @@ CMainWindow::CMainWindow()
 
     for(const QString &name : names)
     {
-        CCanvas * view = new CCanvas(tabWidget, name);
-        tabWidget->addTab(view, view->objectName());
-        connect(view, &CCanvas::sigMousePosition, this, &CMainWindow::slotMousePosition);
+        CCanvas * view = addView(name);
 
         cfg.beginGroup(name);
         view->loadConfig(cfg);
@@ -182,40 +199,28 @@ CMainWindow::CMainWindow()
     }
     if(names.isEmpty())
     {
-        CCanvas * view = new CCanvas(tabWidget, QString());
+        CCanvas * view = addView(QString());
+        // call just to setup default values
         view->loadConfig(cfg);
-        tabWidget->addTab(view, view->objectName());
-        connect(view, &CCanvas::sigMousePosition, this, &CMainWindow::slotMousePosition);
     }
     cfg.endGroup(); // Views
     testForNoView();
 
     CCanvas::gisLayerOpacity = cfg.value("gisLayerOpacity",1.0).toFloat();
-    gisWidget->setOpacity(CCanvas::gisLayerOpacity);
+    widgetGisWorkspace->setOpacity(CCanvas::gisLayerOpacity);
 
     actionShowScale->setChecked(cfg.value("isScaleVisible", true).toBool());
     actionShowGrid->setChecked(cfg.value("isGridVisible", false).toBool());
     actionPOIText->setChecked(cfg.value("POIText", true).toBool());
     actionMapToolTip->setChecked(cfg.value("MapToolTip", true).toBool());
     actionNightDay->setChecked(cfg.value("isNight", false).toBool());
+    actionMinMaxTrackValues->setChecked(cfg.value("MinMaxTrackValues", false).toBool());
     actionFlipMouseWheel->setChecked(cfg.value("flipMouseWheel", false).toBool());
     actionProfileIsWindow->setChecked(cfg.value("profileIsWindow", false).toBool());
     mapFont = cfg.value("mapFont", font()).value<QFont>();
     tabWidget->setCurrentIndex(cfg.value("visibleCanvas",0).toInt());
     cfg.endGroup(); // Canvas
 
-    QByteArray tz;
-    IUnit::tz_mode_e tzmode;
-    bool useShortFormat;
-    tz = cfg.value("Units/timezone", "UTC").toByteArray();
-    tzmode = (IUnit::tz_mode_e)cfg.value("Units/timezone/mode", IUnit::eTZUtc).toInt();
-    useShortFormat = cfg.value("Units/time/useShortFormat", false).toBool();
-
-    IUnit::setTimeZoneSetup(tzmode, tz, useShortFormat);
-
-    IUnit::coord_format_e coordFormat;
-    coordFormat = (IUnit::coord_format_e)cfg.value("Units/coordFormat", IUnit::eCoordFormat1).toInt();
-    IUnit::setCoordFormat(coordFormat);
 
 
     QStatusBar * status = statusBar();
@@ -234,7 +239,8 @@ CMainWindow::CMainWindow()
 
     docks << dockMaps
           << dockDem
-          << dockGis
+          << dockWorkspace
+          << dockDatabase
           << dockRte;
 
     if (cfg.contains("MainWindow/activedocks"))
@@ -270,16 +276,22 @@ CMainWindow::CMainWindow()
     actionToggleDem->setIcon(QIcon(":/icons/32x32/ToggleDem.png"));
     menuWindow->insertAction(actionSetupToolbar,actionToggleDem);
 
-    QAction * actionToggleGis = dockGis->toggleViewAction();
-    actionToggleGis->setObjectName("actionToggleGis");
-    actionToggleGis->setIcon(QIcon(":/icons/32x32/ToggleGis.png"));
-    menuWindow->insertAction(actionSetupToolbar,actionToggleGis);
+    QAction * actionToggleWorkspace = dockWorkspace->toggleViewAction();
+    actionToggleWorkspace->setObjectName("actionToggleWorkspace");
+    actionToggleWorkspace->setIcon(QIcon(":/icons/32x32/ToggleGis.png"));
+    menuWindow->insertAction(actionSetupToolbar,actionToggleWorkspace);
+
+    QAction * actionToggleDatabase = dockDatabase->toggleViewAction();
+    actionToggleDatabase->setObjectName("actionToggleDatabase");
+    actionToggleDatabase->setIcon(QIcon(":/icons/32x32/ToggleDatabase.png"));
+    menuWindow->insertAction(actionSetupToolbar,actionToggleDatabase);
 
     QAction * actionToggleRte = dockRte->toggleViewAction();
     actionToggleRte->setObjectName("actionToggleRte");
     actionToggleRte->setIcon(QIcon(":/icons/32x32/ToggleRouter.png"));
     menuWindow->insertAction(actionSetupToolbar,actionToggleRte);
 
+
     menuWindow->insertSeparator(actionSetupToolbar);
 
     QAction * separator = new QAction("---------------",this);
@@ -298,6 +310,7 @@ CMainWindow::CMainWindow()
                      << actionPOIText
                      << actionNightDay
                      << actionMapToolTip
+                     << actionMinMaxTrackValues
                      << actionSetupDEMPaths
                      << actionAbout
                      << actionHelp
@@ -327,7 +340,8 @@ CMainWindow::CMainWindow()
                      << actionSetupToolbar
                      << actionToggleMaps
                      << actionToggleDem
-                     << actionToggleGis
+                     << actionToggleWorkspace
+                     << actionToggleDatabase
                      << actionToggleRte
                      << actionToggleDocks
                      << actionToggleToolBar
@@ -348,12 +362,14 @@ CMainWindow::CMainWindow()
                    << actionPOIText
                    << actionNightDay
                    << actionMapToolTip
+                   << actionMinMaxTrackValues
                    << actionProfileIsWindow
                    << separator1
                    << actionSetupToolbar
                    << actionToggleMaps
                    << actionToggleDem
-                   << actionToggleGis
+                   << actionToggleWorkspace
+                   << actionToggleDatabase
                    << actionToggleRte
                    << actionToggleDocks
                    << actionFullScreen;
@@ -383,7 +399,8 @@ void CMainWindow::prepareMenuForMac()
     toolBar->toggleViewAction()->setMenuRole(QAction::NoRole);
     dockMaps->toggleViewAction()->setMenuRole(QAction::NoRole);
     dockDem->toggleViewAction()->setMenuRole(QAction::NoRole);
-    dockGis->toggleViewAction()->setMenuRole(QAction::NoRole);
+    dockWorkspace->toggleViewAction()->setMenuRole(QAction::NoRole);
+    dockDatabase->toggleViewAction()->setMenuRole(QAction::NoRole);
     dockRte->toggleViewAction()->setMenuRole(QAction::NoRole);
 }
 
@@ -446,6 +463,7 @@ CMainWindow::~CMainWindow()
     cfg.setValue("POIText", actionPOIText->isChecked());
     cfg.setValue("MapToolTip", actionMapToolTip->isChecked());
     cfg.setValue("isNight", actionNightDay->isChecked());
+    cfg.setValue("MinMaxTrackValues", actionMinMaxTrackValues->isChecked());
     cfg.setValue("flipMouseWheel", actionFlipMouseWheel->isChecked());
     cfg.setValue("profileIsWindow",actionProfileIsWindow->isChecked());
     cfg.setValue("mapFont", mapFont);
@@ -463,7 +481,7 @@ CMainWindow::~CMainWindow()
     /*
         Delete all canvas objects now to make sure they are destroyed before all
         other objects. This allows children of the canvas to access central objects
-        like CGisWidget safely upon their destruction. (e.g. CMouseRangeTrk to reset
+        like CGisWorkspace safely upon their destruction. (e.g. CMouseRangeTrk to reset
         it's track's draw mode by key)
      */
     qDeleteAll(allViews);
@@ -476,12 +494,22 @@ CMainWindow::~CMainWindow()
     cfg.setValue("Units/timezone", tz);
     cfg.setValue("Units/timezone/mode", tzmode);
     cfg.setValue("Units/time/useShortFormat", useShortFormat);
-
     cfg.setValue("Units/coordFormat", IUnit::getCoordFormat());
+    cfg.setValue("Units/slopeMode", IUnit::getSlopeMode());
 
     toolBarConfig->saveSettings();
 }
 
+CCanvas *CMainWindow::addView(const QString& name)
+{
+    CCanvas * view = new CCanvas(tabWidget, name);
+    tabWidget->addTab(view, view->objectName());
+    connect(view, &CCanvas::sigMousePosition, this, &CMainWindow::slotMousePosition);
+    connect(actionMinMaxTrackValues, &QAction::triggered, view, &CCanvas::slotUpdateTrackStatistic);
+
+    return view;
+}
+
 QWidget * CMainWindow::getBestWidgetForParent()
 {
     QWidget * w = CProgressDialog::self();
@@ -546,6 +574,11 @@ bool CMainWindow::isMapToolTip() const
     return actionMapToolTip->isChecked();
 }
 
+bool CMainWindow::isMinMaxTrackValues() const
+{
+    return actionMinMaxTrackValues->isChecked();
+}
+
 bool CMainWindow::flipMouseWheel() const
 {
     return actionFlipMouseWheel->isChecked();
@@ -582,6 +615,22 @@ CCanvas* CMainWindow::getVisibleCanvas() const
     return dynamic_cast<CCanvas*>(tabWidget->currentWidget());
 }
 
+QList<CCanvas*> CMainWindow::getCanvas() const
+{
+    QList<CCanvas*> result;
+    const int N = tabWidget->count();
+    for(int n = 0; n < N; n++)
+    {
+        CCanvas * canvas = dynamic_cast<CCanvas*>(tabWidget->widget(n));
+        if(canvas != nullptr)
+        {
+            result << canvas;
+        }
+    }
+
+    return result;
+}
+
 void CMainWindow::zoomCanvasTo(const QRectF rect)
 {
     CCanvas * canvas = getVisibleCanvas();
@@ -754,11 +803,8 @@ void CMainWindow::slotAddCanvas()
         }
     }
 
-    CCanvas * canvas = new CCanvas(tabWidget, QString());
-    tabWidget->addTab(canvas, canvas->objectName());
-    connect(canvas, &CCanvas::sigMousePosition, this, &CMainWindow::slotMousePosition);
-
-    tabWidget->setCurrentWidget(canvas);
+    CCanvas * view = addView(QString());
+    tabWidget->setCurrentWidget(view);
 
     testForNoView();
 }
@@ -938,7 +984,7 @@ void CMainWindow::slotMousePosition(const QPointF& pos, qreal ele, qreal slope)
     {
         QString val, unit;
         IUnit::self().meter2elevation(ele, val, unit);
-        lblElevation->setText(tr("Ele: %1%2").arg(val).arg(unit));
+        lblElevation->setText(tr("Ele.: %1%2").arg(val).arg(unit));
         lblElevation->show();
     }
     else
@@ -950,7 +996,7 @@ void CMainWindow::slotMousePosition(const QPointF& pos, qreal ele, qreal slope)
     {
         QString val;
         val.sprintf("%.1f", slope);
-        lblSlope->setText(tr("Slope: %1%2").arg(val).arg(QChar(0260)));
+        lblSlope->setText(tr("Slope: %1%2", "terrain").arg(val).arg("°"));
         lblSlope->show();
     }
     else
@@ -1126,7 +1172,7 @@ void CMainWindow::loadGISData(const QStringList& filenames)
 {
     for(const QString &filename : filenames)
     {
-        gisWidget->loadGisProject(filename);
+        widgetGisWorkspace->loadGisProject(filename);
     }
 }
 
@@ -1251,11 +1297,16 @@ void CMainWindow::slotToggleDocks()
 {
     if (docksVisible())
     {
+        dockStates = saveState();
         hideDocks();
     }
     else
     {
         showDocks();
+        if (!dockStates.isEmpty())
+        {
+            restoreState(dockStates);
+        }
     }
 }
 
@@ -1450,7 +1501,7 @@ void CMainWindow::dragEnterEvent(QDragEnterEvent *event)
         QFileInfo fi(urls[0].path());
         QString ext = fi.suffix().toUpper();
 
-        if ((ext == "QMS") || (ext == "GPX") || (ext == "SLF") || (ext == "FIT") || (ext == "TCX"))
+        if ((ext == "QMS") || (ext == "GPX") || (ext == "SLF") || (ext == "FIT") || (ext == "TCX") || (ext == "SML") || (ext == "LOG"))
         {
             event->acceptProposedAction();
         }
diff --git a/src/CMainWindow.h b/src/CMainWindow.h
index af3b485..ab5505e 100644
--- a/src/CMainWindow.h
+++ b/src/CMainWindow.h
@@ -26,7 +26,8 @@
 class CMapList;
 class CDemList;
 class QLabel;
-class CGisWidget;
+class CGisWorkspace;
+class CGisDatabase;
 class CCanvas;
 class CToolBarConfig;
 struct SGisLine;
@@ -55,6 +56,7 @@ public:
     bool isNight()         const;
     bool isPOIText()       const;
     bool isMapToolTip()    const;
+    bool isMinMaxTrackValues() const;
     bool flipMouseWheel()  const;
     bool profileIsWindow() const;
     const QFont& getMapFont() const
@@ -79,6 +81,7 @@ public:
        @return If the currently visible tab does not contain a CCanvas object 0 is returned.
      */
     CCanvas* getVisibleCanvas() const;
+    QList<CCanvas*> getCanvas() const;
 
     QAction * getMapSetupAction()
     {
@@ -150,6 +153,7 @@ private:
     void hideDocks();
     void displayRegular();
     void displayFullscreen();
+    CCanvas * addView(const QString &name);
 
     static CMainWindow * pSelf;
 
@@ -161,7 +165,8 @@ private:
 
     QFont mapFont;
 
-    CGisWidget * gisWidget;
+    CGisWorkspace * widgetGisWorkspace;
+    CGisDatabase * widgetGisDatabase;
 
     CToolBarConfig * toolBarConfig;
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 69f8d90..8fdae64 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,7 +57,7 @@ if(USE_QT5DBus)
 endif(USE_QT5DBus)
 
 
-if(${Qt5Widgets_VERSION} MATCHES "5\\.[0-2]+\\..*")
+if(${Qt5Widgets_VERSION} MATCHES "5\\.[0-2]{1}\\..*")
     message( SEND_ERROR "You need at least Qt5.3 or newer.")
 endif()
 
@@ -83,268 +83,275 @@ if(APPLE)
 endif(APPLE)
 
 
-set( SRCS
-        main.cpp
-        GeoMath.cpp
-        CMainWindow.cpp
-        CSingleInstanceProxy.cpp
-        CAbout.cpp
-        widgets/CTinySpinBox.cpp
-        widgets/CDoubleSpinBox.cpp
-        widgets/CFadingIcon.cpp
-        widgets/CTextEdit.cpp
-        widgets/CTextEditWidget.cpp
-        widgets/CTextEditWidgetSelMenu.cpp
-        widgets/CLineEdit.cpp
-        widgets/CHistoryListWidget.cpp
-        widgets/CPhotoAlbum.cpp
-        widgets/CColorLegend.cpp
-        widgets/CColorChooser.cpp
-        widgets/CSelectDoubleListWidget.cpp
-        widgets/CTemplateWidget.cpp
-        helpers/CInputDialog.cpp
-        helpers/CPositionDialog.cpp
-        helpers/CWptIconDialog.cpp
-        helpers/CSelectProjectDialog.cpp
-        helpers/CSelectCopyAction.cpp
-        helpers/CElevationDialog.cpp
-        helpers/CLinksDialog.cpp
-        helpers/CPhotoViewer.cpp
-        helpers/CProgressDialog.cpp
-        helpers/CDraw.cpp
-        helpers/CValue.cpp
-        helpers/CLimit.cpp
-        helpers/CToolBarConfig.cpp
-        helpers/CToolBarSetupDialog.cpp
-        canvas/CCanvas.cpp
-        canvas/CCanvasSetup.cpp
-        canvas/IDrawContext.cpp
-        canvas/IDrawObject.cpp
-        dem/IDem.cpp
-        map/IMapProp.cpp
-        dem/IDemProp.cpp
-        dem/CDemDraw.cpp
-        dem/CDemVRT.cpp
-        dem/CDemList.cpp
-        dem/CDemItem.cpp
-        dem/CDemPathSetup.cpp
-        dem/CDemPropSetup.cpp
-        map/IMap.cpp
-        map/IMapOnline.cpp
-        map/CMapDraw.cpp
-        map/CMapGEMF.cpp
-        map/CMapItem.cpp
-        map/CMapList.cpp
-        map/CMapRMAP.cpp
-        map/CMapJNX.cpp
-        map/CMapIMG.cpp
-        map/CMapMAP.cpp
-        map/CMapVRT.cpp
-        map/CMapWMTS.cpp
-        map/CMapTMS.cpp
-        map/CMapPathSetup.cpp
-        map/CMapPropSetup.cpp
-        map/garmin/IGarminStrTbl.cpp
-        map/garmin/CGarminStrTbl6.cpp
-        map/garmin/CGarminStrTbl8.cpp
-        map/garmin/CGarminStrTblUtf8.cpp
-        map/garmin/CGarminPoint.cpp
-        map/garmin/CGarminPolygon.cpp
-        map/garmin/CGarminTyp.cpp
-        map/cache/CDiskCache.cpp
-        map/mapsforge/types.cpp
-        units/IUnit.cpp
-        units/CUnitImperial.cpp
-        units/CUnitMetric.cpp
-        units/CUnitNautic.cpp
-        units/CTimeZoneSetup.cpp
-        units/CUnitsSetup.cpp
-        units/CCoordFormatSetup.cpp
-        grid/CGrid.cpp
-        grid/CGridSetup.cpp
-        grid/CProjWizard.cpp
-        grid/mitab.cpp
-        mouse/IMouse.cpp
-        mouse/IMouseSelect.cpp
-        mouse/IScrOpt.cpp
-        mouse/CMouseDummy.cpp
-        mouse/CMouseNormal.cpp
-        mouse/CMouseMoveWpt.cpp
-        mouse/CMouseEditTrk.cpp
-        mouse/CMouseEditRte.cpp
-        mouse/CMouseEditArea.cpp
-        mouse/CMouseRangeTrk.cpp
-        mouse/CMouseWptBubble.cpp
-        mouse/CMousePrint.cpp
-        mouse/CMouseSelect.cpp
-        mouse/CScrOptUnclutter.cpp
-        mouse/CScrOptRangeTrk.cpp
-        mouse/CScrOptSelect.cpp
-        mouse/CScrOptPrint.cpp
-        mouse/line/IMouseEditLine.cpp
-        mouse/line/CScrOptEditLine.cpp
-        mouse/line/CScrOptRangeLine.cpp
-        mouse/line/ILineOp.cpp
-        mouse/line/CLineOpMovePoint.cpp
-        mouse/line/CLineOpAddPoint.cpp
-        mouse/line/CLineOpDeletePoint.cpp
-        mouse/line/CLineOpSelectRange.cpp
-        gis/WptIcons.cpp
-        gis/CGisDraw.cpp
-        gis/IGisItem.cpp
-        gis/IGisLine.cpp
-        gis/CGisWidget.cpp
-        gis/CGisListDB.cpp
-        gis/CGisListWks.cpp
-        gis/CSelDevices.cpp
-        gis/CSetupFilter.cpp
-        gis/prj/IGisProject.cpp
-        gis/prj/CDetailsPrj.cpp
-        gis/gpx/CGpxProject.cpp
-        gis/gpx/serialization.cpp
-        gis/qms/CQmsProject.cpp
-        gis/qms/serialization.cpp
-        gis/slf/CSlfProject.cpp
-        gis/slf/CSlfReader.cpp
-        gis/tnv/CTwoNavProject.cpp
-        gis/tnv/serialization.cpp
-        gis/tcx/CTcxProject.cpp
-        gis/tcx/serialization.cpp
-        gis/db/IDB.cpp
-        gis/db/IDBSqlite.cpp
-        gis/db/IDBMysql.cpp
-        gis/db/CSetupDatabase.cpp
-        gis/db/CSetupWorkspace.cpp
-        gis/db/CSetupFolder.cpp
-        gis/db/IDBFolder.cpp
-        gis/db/IDBFolderSql.cpp
-        gis/db/CDBFolderLostFound.cpp
-        gis/db/CDBFolderSqlite.cpp
-        gis/db/CDBFolderMysql.cpp
-        gis/db/CDBFolderGroup.cpp
-        gis/db/CDBFolderOther.cpp
-        gis/db/CDBFolderProject.cpp
-        gis/db/CDBItem.cpp
-        gis/db/CDBProject.cpp
-        gis/db/CLostFoundProject.cpp
-        gis/db/CSelectSaveAction.cpp
-        gis/db/CSelectDBFolder.cpp
-        gis/db/CSearchDatabase.cpp
-        gis/db/CExportDatabase.cpp
-        gis/db/CExportDatabaseThread.cpp
-        gis/search/CSearchGoogle.cpp
-        gis/wpt/CGisItemWpt.cpp
-        gis/wpt/CScrOptWpt.cpp
-        gis/wpt/CDetailsWpt.cpp
-        gis/wpt/CDetailsGeoCache.cpp
-        gis/wpt/CProjWpt.cpp
-        gis/wpt/CSetupNewWpt.cpp
-        gis/trk/CGisItemTrk.cpp
-        gis/trk/CScrOptTrk.cpp
-        gis/trk/CDetailsTrk.cpp
-        gis/trk/CCombineTrk.cpp
-        gis/trk/CCutTrk.cpp
-        gis/trk/CSelectActivityColor.cpp
-        gis/trk/CActivityTrk.cpp
-        gis/trk/CPropertyTrk.cpp
-        gis/trk/CKnownExtension.cpp
-        gis/trk/CTableTrk.cpp
-        gis/trk/filter/filter.cpp
-        gis/trk/filter/CFilterDouglasPeuker.cpp
-        gis/trk/filter/CFilterInvalid.cpp
-        gis/trk/filter/CFilterReset.cpp
-        gis/trk/filter/CFilterSubPt2Pt.cpp
-        gis/trk/filter/CFilterDelete.cpp
-        gis/trk/filter/CFilterDeleteExtension.cpp
-        gis/trk/filter/CFilterMedian.cpp
-        gis/trk/filter/CFilterReplaceElevation.cpp
-        gis/trk/filter/CFilterInterpolateElevation.cpp
-        gis/trk/filter/CFilterOffsetElevation.cpp
-        gis/trk/filter/CFilterNewDate.cpp
-        gis/trk/filter/CFilterObscureDate.cpp
-        gis/trk/filter/CFilterSpeed.cpp
-        gis/trk/filter/CFilterSplitSegment.cpp
-        gis/trk/filter/CFilterTerrainSlope.cpp
-        gis/trk/CTrackData.cpp
-        gis/rte/CGisItemRte.cpp
-        gis/rte/CScrOptRte.cpp
-        gis/rte/CCreateRouteFromWpt.cpp
-        gis/rte/CDetailsRte.cpp
-        gis/rte/router/IRouter.cpp
-        gis/rte/router/CRouterSetup.cpp
-        gis/rte/router/CRouterRoutino.cpp
-        gis/rte/router/CRouterMapQuest.cpp
-        gis/rte/router/routino/CRouterRoutinoPathSetup.cpp
-        gis/rte/router/CRouterBRouter.cpp
-        gis/rte/router/brouter/CRouterBRouterInfo.cpp
-        gis/rte/router/brouter/CRouterBRouterSetup.cpp
-        gis/rte/router/brouter/CRouterBRouterSetupPage.cpp
-        gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp
-        gis/rte/router/brouter/CRouterBRouterToolShell.cpp
-        gis/rte/router/brouter/CRouterBRouterTilesPage.cpp
-        gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp
-        gis/rte/router/brouter/CRouterBRouterTilesSelectArea.cpp
-        gis/ovl/CGisItemOvlArea.cpp
-        gis/ovl/CScrOptOvlArea.cpp
-        gis/ovl/CDetailsOvlArea.cpp
-        gis/fit/CFitProject.cpp
-        gis/fit/CFitStream.cpp
-        gis/fit/serialization.cpp
-        gis/fit/decoder/CFitMessage.cpp
-        gis/fit/decoder/CFitField.cpp
-        gis/fit/decoder/CFitDefinitionMessage.cpp
-        gis/fit/decoder/CFitFieldDefinition.cpp
-        gis/fit/defs/CFitProfile.cpp
-        gis/fit/decoder/IFitDecoderState.cpp
-        gis/fit/decoder/CFitHeaderState.cpp
-        gis/fit/decoder/CFitRecordHeaderState.cpp
-        gis/fit/decoder/CFitFieldDataState.cpp
-        gis/fit/decoder/CFitFieldDefinitionState.cpp
-        gis/fit/decoder/CFitRecordContentState.cpp
-        gis/fit/decoder/CFitCrcState.cpp
-        gis/fit/defs/CFitBaseType.cpp
-        gis/fit/decoder/CFitDecoder.cpp
-        gis/fit/defs/CFitProfileLookup.cpp
-        gis/fit/defs/CFitFieldProfile.cpp
-        gis/fit/decoder/CFitByteDataTransformer.cpp
-        gis/fit/decoder/CFitFieldBuilder.cpp
-        gis/fit/decoder/CFitDevFieldDefinition.cpp
-        gis/fit/decoder/CFitDevFieldDefinitionState.cpp
-        plot/IPlot.cpp
-        plot/CPlotAxis.cpp
-        plot/CPlotAxisTime.cpp
-        plot/CPlotData.cpp
-        plot/CPlotProfile.cpp
-        plot/ITrack.cpp
-        plot/CPlotTrack.cpp
-        plot/CPlot.cpp
-        qlgt/converter.cpp
-        qlgt/CQlb.cpp
-        qlgt/IItem.cpp
-        qlgt/CQlgtFolder.cpp
-        qlgt/CQlgtWpt.cpp
-        qlgt/CQlgtTrack.cpp
-        qlgt/CQlgtRoute.cpp
-        qlgt/CQlgtDiary.cpp
-        qlgt/IQlgtOverlay.cpp
-        qlgt/CQlgtDb.cpp
-        qlgt/CQmsDb.cpp
-        device/IDeviceWatcher.cpp
-        device/IDevice.cpp
-        device/CDeviceGarmin.cpp
-        device/CDeviceGarminArchive.cpp
-        device/CDeviceTwoNav.cpp
-        tool/IToolShell.cpp
-        tool/CMapVrtBuilder.cpp
-        tool/CImportDatabase.cpp
-        tool/CRoutinoDatabaseBuilder.cpp
-        print/CPrintDialog.cpp
-        setup/IAppSetup.cpp
-        setup/CAppSetupLinux.cpp
-        setup/CAppSetupWin.cpp
-        setup/CAppSetupMac.cpp
-        setup/CCommandProcessor.cpp
-        setup/CLogHandler.cpp
+set( SRCS    
+    CAbout.cpp
+    CMainWindow.cpp
+    CSingleInstanceProxy.cpp
+    GeoMath.cpp
+    canvas/CCanvas.cpp
+    canvas/CCanvasSetup.cpp
+    canvas/IDrawContext.cpp
+    canvas/IDrawObject.cpp
+    dem/CDemDraw.cpp
+    dem/CDemItem.cpp
+    dem/CDemList.cpp
+    dem/CDemPathSetup.cpp
+    dem/CDemPropSetup.cpp
+    dem/CDemVRT.cpp
+    dem/IDem.cpp
+    dem/IDemProp.cpp
+    device/CDeviceGarmin.cpp
+    device/CDeviceGarminArchive.cpp
+    device/CDeviceTwoNav.cpp
+    device/IDevice.cpp
+    device/IDeviceWatcher.cpp
+    gis/CGisDatabase.cpp
+    gis/CGisDraw.cpp
+    gis/CGisListDB.cpp
+    gis/CGisListWks.cpp
+    gis/CGisWorkspace.cpp
+    gis/CSelDevices.cpp
+    gis/CSetupFilter.cpp
+    gis/IGisItem.cpp
+    gis/IGisLine.cpp
+    gis/WptIcons.cpp
+    gis/db/CDBFolderGroup.cpp
+    gis/db/CDBFolderLostFound.cpp
+    gis/db/CDBFolderMysql.cpp
+    gis/db/CDBFolderOther.cpp
+    gis/db/CDBFolderProject.cpp
+    gis/db/CDBFolderSqlite.cpp
+    gis/db/CDBItem.cpp
+    gis/db/CDBProject.cpp
+    gis/db/CExportDatabase.cpp
+    gis/db/CExportDatabaseThread.cpp
+    gis/db/CLostFoundProject.cpp
+    gis/db/CSearchDatabase.cpp
+    gis/db/CSelectDBFolder.cpp
+    gis/db/CSelectSaveAction.cpp
+    gis/db/CSetupDatabase.cpp
+    gis/db/CSetupFolder.cpp
+    gis/db/CSetupWorkspace.cpp
+    gis/db/IDB.cpp
+    gis/db/IDBFolder.cpp
+    gis/db/IDBFolderSql.cpp
+    gis/db/IDBMysql.cpp
+    gis/db/IDBSqlite.cpp
+    gis/fit/CFitProject.cpp
+    gis/fit/CFitStream.cpp
+    gis/fit/decoder/CFitByteDataTransformer.cpp
+    gis/fit/decoder/CFitCrcState.cpp
+    gis/fit/decoder/CFitDecoder.cpp
+    gis/fit/decoder/CFitDefinitionMessage.cpp
+    gis/fit/decoder/CFitDevFieldDefinition.cpp
+    gis/fit/decoder/CFitDevFieldDefinitionState.cpp
+    gis/fit/decoder/CFitField.cpp
+    gis/fit/decoder/CFitFieldBuilder.cpp
+    gis/fit/decoder/CFitFieldDataState.cpp
+    gis/fit/decoder/CFitFieldDefinition.cpp
+    gis/fit/decoder/CFitFieldDefinitionState.cpp
+    gis/fit/decoder/CFitHeaderState.cpp
+    gis/fit/decoder/CFitMessage.cpp
+    gis/fit/decoder/CFitRecordContentState.cpp
+    gis/fit/decoder/CFitRecordHeaderState.cpp
+    gis/fit/decoder/IFitDecoderState.cpp
+    gis/fit/defs/CFitBaseType.cpp
+    gis/fit/defs/CFitFieldProfile.cpp
+    gis/fit/defs/CFitProfile.cpp
+    gis/fit/defs/CFitProfileLookup.cpp
+    gis/fit/serialization.cpp
+    gis/gpx/CGpxProject.cpp
+    gis/gpx/serialization.cpp
+    gis/ovl/CDetailsOvlArea.cpp
+    gis/ovl/CGisItemOvlArea.cpp
+    gis/ovl/CScrOptOvlArea.cpp
+    gis/prj/CDetailsPrj.cpp
+    gis/prj/IGisProject.cpp
+    gis/qlb/CQlbProject.cpp
+    gis/qms/CQmsProject.cpp
+    gis/qms/serialization.cpp
+    gis/rte/CCreateRouteFromWpt.cpp
+    gis/rte/CDetailsRte.cpp
+    gis/rte/CGisItemRte.cpp
+    gis/rte/CScrOptRte.cpp
+    gis/rte/router/CRouterBRouter.cpp
+    gis/rte/router/CRouterMapQuest.cpp
+    gis/rte/router/CRouterRoutino.cpp
+    gis/rte/router/CRouterSetup.cpp
+    gis/rte/router/IRouter.cpp
+    gis/rte/router/brouter/CRouterBRouterInfo.cpp
+    gis/rte/router/brouter/CRouterBRouterSetup.cpp
+    gis/rte/router/brouter/CRouterBRouterSetupPage.cpp
+    gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp
+    gis/rte/router/brouter/CRouterBRouterTilesPage.cpp
+    gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp
+    gis/rte/router/brouter/CRouterBRouterTilesSelectArea.cpp
+    gis/rte/router/brouter/CRouterBRouterToolShell.cpp
+    gis/rte/router/routino/CRouterRoutinoPathSetup.cpp
+    gis/search/CSearchGoogle.cpp
+    gis/slf/CSlfProject.cpp
+    gis/slf/CSlfReader.cpp
+    gis/suunto/CLogProject.cpp
+    gis/suunto/CSmlProject.cpp
+    gis/suunto/ISuuntoProject.cpp
+    gis/tcx/CTcxProject.cpp
+    gis/tcx/serialization.cpp
+    gis/tnv/CTwoNavProject.cpp
+    gis/tnv/serialization.cpp
+    gis/trk/CActivityTrk.cpp
+    gis/trk/CCombineTrk.cpp
+    gis/trk/CCutTrk.cpp
+    gis/trk/CDetailsTrk.cpp
+    gis/trk/CGisItemTrk.cpp
+    gis/trk/CKnownExtension.cpp
+    gis/trk/CPropertyTrk.cpp
+    gis/trk/CScrOptTrk.cpp
+    gis/trk/CSelectActivityColor.cpp
+    gis/trk/CTableTrk.cpp
+    gis/trk/CTrackData.cpp
+    gis/trk/filter/CFilterDelete.cpp
+    gis/trk/filter/CFilterDeleteExtension.cpp
+    gis/trk/filter/CFilterDouglasPeuker.cpp
+    gis/trk/filter/CFilterInterpolateElevation.cpp
+    gis/trk/filter/CFilterInvalid.cpp
+    gis/trk/filter/CFilterMedian.cpp
+    gis/trk/filter/CFilterNewDate.cpp
+    gis/trk/filter/CFilterObscureDate.cpp
+    gis/trk/filter/CFilterOffsetElevation.cpp
+    gis/trk/filter/CFilterReplaceElevation.cpp
+    gis/trk/filter/CFilterReset.cpp
+    gis/trk/filter/CFilterSpeed.cpp
+    gis/trk/filter/CFilterSplitSegment.cpp
+    gis/trk/filter/CFilterSubPt2Pt.cpp
+    gis/trk/filter/CFilterTerrainSlope.cpp
+    gis/trk/filter/filter.cpp
+    gis/wpt/CDetailsGeoCache.cpp
+    gis/wpt/CDetailsWpt.cpp
+    gis/wpt/CGisItemWpt.cpp
+    gis/wpt/CProjWpt.cpp
+    gis/wpt/CScrOptWpt.cpp
+    gis/wpt/CScrOptWptRadius.cpp
+    gis/wpt/CSetupNewWpt.cpp
+    grid/CGrid.cpp
+    grid/CGridSetup.cpp
+    grid/CProjWizard.cpp
+    grid/mitab.cpp
+    helpers/CDraw.cpp
+    helpers/CElevationDialog.cpp
+    helpers/CInputDialog.cpp
+    helpers/CLimit.cpp
+    helpers/CLinksDialog.cpp
+    helpers/CPhotoViewer.cpp
+    helpers/CPositionDialog.cpp
+    helpers/CProgressDialog.cpp
+    helpers/CSelectCopyAction.cpp
+    helpers/CSelectProjectDialog.cpp
+    helpers/CToolBarConfig.cpp
+    helpers/CToolBarSetupDialog.cpp
+    helpers/CValue.cpp
+    helpers/CWptIconDialog.cpp
+    main.cpp
+    map/CMapDraw.cpp
+    map/CMapGEMF.cpp
+    map/CMapIMG.cpp
+    map/CMapItem.cpp
+    map/CMapJNX.cpp
+    map/CMapList.cpp
+    map/CMapMAP.cpp
+    map/CMapPathSetup.cpp
+    map/CMapPropSetup.cpp
+    map/CMapRMAP.cpp
+    map/CMapTMS.cpp
+    map/CMapVRT.cpp
+    map/CMapWMTS.cpp
+    map/IMap.cpp
+    map/IMapOnline.cpp
+    map/IMapProp.cpp
+    map/cache/CDiskCache.cpp
+    map/garmin/CGarminPoint.cpp
+    map/garmin/CGarminPolygon.cpp
+    map/garmin/CGarminStrTbl6.cpp
+    map/garmin/CGarminStrTbl8.cpp
+    map/garmin/CGarminStrTblUtf8.cpp
+    map/garmin/CGarminTyp.cpp
+    map/garmin/IGarminStrTbl.cpp
+    map/mapsforge/types.cpp
+    mouse/CMouseDummy.cpp
+    mouse/CMouseEditArea.cpp
+    mouse/CMouseEditRte.cpp
+    mouse/CMouseEditTrk.cpp
+    mouse/CMouseMoveWpt.cpp
+    mouse/CMouseNormal.cpp
+    mouse/CMousePrint.cpp
+    mouse/CMouseRadiusWpt.cpp
+    mouse/CMouseRangeTrk.cpp
+    mouse/CMouseSelect.cpp
+    mouse/CMouseWptBubble.cpp
+    mouse/CScrOptPrint.cpp
+    mouse/CScrOptRangeTrk.cpp
+    mouse/CScrOptSelect.cpp
+    mouse/CScrOptUnclutter.cpp
+    mouse/IMouse.cpp
+    mouse/IMouseSelect.cpp
+    mouse/IScrOpt.cpp
+    mouse/line/CLineOpAddPoint.cpp
+    mouse/line/CLineOpDeletePoint.cpp
+    mouse/line/CLineOpMovePoint.cpp
+    mouse/line/CLineOpSelectRange.cpp
+    mouse/line/CScrOptEditLine.cpp
+    mouse/line/CScrOptRangeLine.cpp
+    mouse/line/ILineOp.cpp
+    mouse/line/IMouseEditLine.cpp
+    plot/CPlot.cpp
+    plot/CPlotAxis.cpp
+    plot/CPlotAxisTime.cpp
+    plot/CPlotData.cpp
+    plot/CPlotProfile.cpp
+    plot/CPlotTrack.cpp
+    plot/IPlot.cpp
+    plot/ITrack.cpp
+    print/CPrintDialog.cpp
+    qlgt/CQlb.cpp
+    qlgt/CQlgtDb.cpp
+    qlgt/CQlgtDiary.cpp
+    qlgt/CQlgtFolder.cpp
+    qlgt/CQlgtRoute.cpp
+    qlgt/CQlgtTrack.cpp
+    qlgt/CQlgtWpt.cpp
+    qlgt/CQmsDb.cpp
+    qlgt/IItem.cpp
+    qlgt/IQlgtOverlay.cpp
+    qlgt/converter.cpp
+    setup/CAppSetupLinux.cpp
+    setup/CAppSetupMac.cpp
+    setup/CAppSetupWin.cpp
+    setup/CCommandProcessor.cpp
+    setup/CLogHandler.cpp
+    setup/IAppSetup.cpp
+    tool/CImportDatabase.cpp
+    tool/CMapVrtBuilder.cpp
+    tool/CRoutinoDatabaseBuilder.cpp
+    tool/IToolShell.cpp
+    units/CCoordFormatSetup.cpp
+    units/CTimeZoneSetup.cpp
+    units/CUnitImperial.cpp
+    units/CUnitMetric.cpp
+    units/CUnitNautic.cpp
+    units/CUnitsSetup.cpp
+    units/IUnit.cpp
+    widgets/CColorChooser.cpp
+    widgets/CColorLegend.cpp
+    widgets/CDoubleSpinBox.cpp
+    widgets/CFadingIcon.cpp
+    widgets/CHistoryListWidget.cpp
+    widgets/CLineEdit.cpp
+    widgets/CPhotoAlbum.cpp
+    widgets/CSelectDoubleListWidget.cpp
+    widgets/CTemplateWidget.cpp
+    widgets/CTextEdit.cpp
+    widgets/CTextEditWidget.cpp
+    widgets/CTextEditWidgetSelMenu.cpp
+    widgets/CTinySpinBox.cpp
 )
 
 
@@ -372,273 +379,280 @@ endif(WIN32)
 
 
 set( HDRS
-        version.h
-        GeoMath.h
+        CAbout.h
         CMainWindow.h
         CSingleInstanceProxy.h
-        CAbout.h
-        widgets/CTinySpinBox.h
-        widgets/CDoubleSpinBox.h
-        widgets/CFadingIcon.h
-        widgets/CHistoryListWidget.h
-        widgets/CTextEdit.h
-        widgets/CTextEditWidget.h
-        widgets/CTextEditWidgetSelMenu.h
-        widgets/CLineEdit.h
-        widgets/CPhotoAlbum.h
-        widgets/CColorLegend.h
-        widgets/CColorChooser.h
-        widgets/CSelectDoubleListWidget.h
-        widgets/CTemplateWidget.h
-        helpers/Platform.h
-        helpers/CFileExt.h
-        helpers/CSettings.h
-        helpers/CInputDialog.h
-        helpers/CPositionDialog.h
-        helpers/CSelectCopyAction.h
-        helpers/CWptIconDialog.h
-        helpers/CSelectProjectDialog.h
-        helpers/CElevationDialog.h
-        helpers/CLinksDialog.h
-        helpers/CPhotoViewer.h
-        helpers/CProgressDialog.h
-        helpers/CDraw.h
-        helpers/CValue.h
-        helpers/CLimit.h
-        helpers/Signals.h
-        helpers/CToolBarConfig.h
-        helpers/CToolBarSetupDialog.h
+        GeoMath.h
         canvas/CCanvas.h
         canvas/CCanvasSetup.h
         canvas/IDrawContext.h
         canvas/IDrawObject.h
-        dem/IDem.h
-        dem/IDemProp.h
         dem/CDemDraw.h
-        dem/CDemVRT.h
-        dem/CDemList.h
         dem/CDemItem.h
+        dem/CDemList.h
         dem/CDemPathSetup.h
         dem/CDemPropSetup.h
-        map/IMap.h
-        map/IMapOnline.h
-        map/IMapProp.h
-        map/CMapDraw.h
-        map/CMapGEMF.h
-        map/CMapItem.h
-        map/CMapList.h
-        map/CMapRMAP.h
-        map/CMapJNX.h
-        map/CMapIMG.h
-        map/CMapMAP.h
-        map/CMapVRT.h
-        map/CMapWMTS.h
-        map/CMapTMS.h
-        map/CMapPathSetup.h
-        map/CMapPropSetup.h
-        map/garmin/Garmin.h
-        map/garmin/IGarminStrTbl.h
-        map/garmin/CGarminStrTbl6.h
-        map/garmin/CGarminStrTbl8.h
-        map/garmin/CGarminStrTblUtf8.h
-        map/garmin/CGarminPoint.h
-        map/garmin/CGarminPolygon.h
-        map/garmin/CGarminTyp.h
-        map/cache/CDiskCache.h
-        map/mapsforge/types.h
-        units/IUnit.h
-        units/CUnitImperial.h
-        units/CUnitMetric.h
-        units/CUnitNautic.h
-        units/CTimeZoneSetup.h
-        units/CUnitsSetup.h
-        units/CCoordFormatSetup.h
-        grid/CGrid.h
-        grid/CGridSetup.h
-        grid/CProjWizard.h
-        grid/mitab.h
-        mouse/IMouse.h
-        mouse/IMouseSelect.h
-        mouse/IScrOpt.h
-        mouse/CMouseDummy.h
-        mouse/CMouseNormal.h
-        mouse/CMouseMoveWpt.h
-        mouse/CMouseEditTrk.h
-        mouse/CMouseEditRte.h
-        mouse/CMouseEditArea.h
-        mouse/CMouseRangeTrk.h
-        mouse/CMouseWptBubble.h
-        mouse/CMousePrint.h
-        mouse/CMouseSelect.h
-        mouse/CScrOptUnclutter.h
-        mouse/CScrOptRangeTrk.h
-        mouse/CScrOptSelect.h
-        mouse/CScrOptPrint.h
-        mouse/line/CScrOptEditLine.h
-        mouse/line/CScrOptRangeLine.h
-        mouse/line/IMouseEditLine.h
-        mouse/line/ILineOp.h
-        mouse/line/CLineOpMovePoint.h
-        mouse/line/CLineOpAddPoint.h
-        mouse/line/CLineOpDeletePoint.h
-        mouse/line/CLineOpSelectRange.h
-        gis/Poi.h
-        gis/WptIcons.h
+        dem/CDemVRT.h
+        dem/IDem.h
+        dem/IDemProp.h
+        device/CDeviceGarmin.h
+        device/CDeviceGarminArchive.h
+        device/CDeviceTwoNav.h
+        device/IDevice.h
+        device/IDeviceWatcher.h
+        gis/CGisDatabase.h
         gis/CGisDraw.h
-        gis/IGisItem.h
-        gis/IGisLine.h
-        gis/prj/IGisProject.h
-        gis/prj/CDetailsPrj.h
-        gis/CGisWidget.h
         gis/CGisListDB.h
         gis/CGisListWks.h
+        gis/CGisWorkspace.h
         gis/CSelDevices.h
         gis/CSetupFilter.h
-        gis/qms/CQmsProject.h
-        gis/tnv/CTwoNavProject.h
-        gis/tcx/CTcxProject.h
-        gis/db/IDB.h
-        gis/db/IDBSqlite.h
-        gis/db/IDBMysql.h
-        gis/db/macros.h
-        gis/db/CSetupDatabase.h
-        gis/db/CSetupWorkspace.h
-        gis/db/CSetupFolder.h
-        gis/db/IDBFolder.h
-        gis/db/IDBFolderSql.h
+        gis/IGisItem.h
+        gis/IGisLine.h
+        gis/Poi.h
+        gis/WptIcons.h
+        gis/db/CDBFolderGroup.h
         gis/db/CDBFolderLostFound.h
-        gis/db/CDBFolderSqlite.h
         gis/db/CDBFolderMysql.h
-        gis/db/CDBFolderGroup.h
         gis/db/CDBFolderOther.h
         gis/db/CDBFolderProject.h
+        gis/db/CDBFolderSqlite.h
         gis/db/CDBItem.h
         gis/db/CDBProject.h
-        gis/db/CLostFoundProject.h
-        gis/db/CSelectSaveAction.h
-        gis/db/CSelectDBFolder.h
-        gis/db/CSearchDatabase.h
         gis/db/CExportDatabase.h
         gis/db/CExportDatabaseThread.h
-        gis/wpt/CGisItemWpt.h
-        gis/wpt/CScrOptWpt.h
-        gis/wpt/CDetailsWpt.h
-        gis/wpt/CDetailsGeoCache.h
-        gis/wpt/CProjWpt.h
-        gis/wpt/CSetupNewWpt.h
-        gis/trk/CGisItemTrk.h
-        gis/trk/CScrOptTrk.h
-        gis/trk/CDetailsTrk.h
-        gis/trk/CCombineTrk.h
-        gis/trk/CCutTrk.h
-        gis/trk/CSelectActivityColor.h
-        gis/trk/CActivityTrk.h
-        gis/trk/CPropertyTrk.h
-        gis/trk/CKnownExtension.h
-        gis/trk/CTableTrk.h
-        gis/trk/filter/CFilterDouglasPeuker.h
-        gis/trk/filter/CFilterInvalid.h
-        gis/trk/filter/CFilterReset.h
-        gis/trk/filter/CFilterSubPt2Pt.h
-        gis/trk/filter/CFilterDelete.h
-        gis/trk/filter/CFilterDeleteExtension.h
-        gis/trk/filter/CFilterMedian.h
-        gis/trk/filter/CFilterReplaceElevation.h
-        gis/trk/filter/CFilterInterpolateElevation.h
-        gis/trk/filter/CFilterOffsetElevation.h
-        gis/trk/filter/CFilterNewDate.h
-        gis/trk/filter/CFilterObscureDate.h
-        gis/trk/filter/CFilterSpeed.h
-        gis/trk/filter/CFilterSplitSegment.h
-        gis/trk/filter/CFilterTerrainSlope.h
-        gis/trk/CTrackData.h
-        gis/rte/CGisItemRte.h
-        gis/rte/CScrOptRte.h
+        gis/db/CLostFoundProject.h
+        gis/db/CSearchDatabase.h
+        gis/db/CSelectDBFolder.h
+        gis/db/CSelectSaveAction.h
+        gis/db/CSetupDatabase.h
+        gis/db/CSetupFolder.h
+        gis/db/CSetupWorkspace.h
+        gis/db/IDB.h
+        gis/db/IDBFolder.h
+        gis/db/IDBFolderSql.h
+        gis/db/IDBMysql.h
+        gis/db/IDBSqlite.h
+        gis/db/macros.h
+        gis/fit/CFitProject.h
+        gis/fit/CFitStream.h
+        gis/fit/decoder/CFitByteDataTransformer.h
+        gis/fit/decoder/CFitCrcState.h
+        gis/fit/decoder/CFitDecoder.h
+        gis/fit/decoder/CFitDefinitionMessage.h
+        gis/fit/decoder/CFitDevFieldDefinition.h
+        gis/fit/decoder/CFitDevFieldDefinitionState.h
+        gis/fit/decoder/CFitField.h
+        gis/fit/decoder/CFitFieldBuilder.h
+        gis/fit/decoder/CFitFieldDataState.h
+        gis/fit/decoder/CFitFieldDefinition.h
+        gis/fit/decoder/CFitFieldDefinitionState.h
+        gis/fit/decoder/CFitHeaderState.h
+        gis/fit/decoder/CFitMessage.h
+        gis/fit/decoder/CFitRecordContentState.h
+        gis/fit/decoder/CFitRecordHeaderState.h
+        gis/fit/decoder/IFitDecoderState.h
+        gis/fit/defs/CFitBaseType.h
+        gis/fit/defs/CFitFieldProfile.h
+        gis/fit/defs/CFitProfile.h
+        gis/fit/defs/CFitProfileLookup.h
+        gis/fit/defs/fit_const.h
+        gis/fit/defs/fit_enums.h
+        gis/fit/defs/fit_fields.h
+        gis/gpx/CGpxProject.h
+        gis/ovl/CDetailsOvlArea.h
+        gis/ovl/CGisItemOvlArea.h
+        gis/ovl/CScrOptOvlArea.h
+        gis/prj/CDetailsPrj.h
+        gis/prj/IGisProject.h
+        gis/qlb/CQlbProject.h
+        gis/qms/CQmsProject.h
         gis/rte/CCreateRouteFromWpt.h
         gis/rte/CDetailsRte.h
-        gis/rte/router/IRouter.h
-        gis/rte/router/CRouterSetup.h
-        gis/rte/router/CRouterRoutino.h
-        gis/rte/router/CRouterMapQuest.h
-        gis/rte/router/routino/CRouterRoutinoPathSetup.h
+        gis/rte/CGisItemRte.h
+        gis/rte/CScrOptRte.h
         gis/rte/router/CRouterBRouter.h
+        gis/rte/router/CRouterMapQuest.h
+        gis/rte/router/CRouterRoutino.h
+        gis/rte/router/CRouterSetup.h
+        gis/rte/router/IRouter.h
         gis/rte/router/brouter/CRouterBRouterInfo.h
         gis/rte/router/brouter/CRouterBRouterSetup.h
         gis/rte/router/brouter/CRouterBRouterSetupPage.h
         gis/rte/router/brouter/CRouterBRouterSetupWizard.h
-        gis/rte/router/brouter/CRouterBRouterToolShell.h
         gis/rte/router/brouter/CRouterBRouterTilesPage.h
         gis/rte/router/brouter/CRouterBRouterTilesSelect.h
         gis/rte/router/brouter/CRouterBRouterTilesSelectArea.h
         gis/rte/router/brouter/CRouterBRouterTilesSelectLayout.h
         gis/rte/router/brouter/CRouterBRouterTilesStatus.h
-        gis/ovl/CGisItemOvlArea.h
-        gis/ovl/CScrOptOvlArea.h
-        gis/ovl/CDetailsOvlArea.h
-        gis/gpx/CGpxProject.h
+        gis/rte/router/brouter/CRouterBRouterToolShell.h
+        gis/rte/router/routino/CRouterRoutinoPathSetup.h
+        gis/search/CSearchGoogle.h
         gis/slf/CSlfProject.h
         gis/slf/CSlfReader.h
-        gis/search/CSearchGoogle.h
-        gis/fit/CFitProject.h
-        gis/fit/CFitStream.h
-        gis/fit/defs/fit_const.h
-        gis/fit/decoder/CFitMessage.h
-        gis/fit/decoder/CFitField.h
-        gis/fit/decoder/CFitDefinitionMessage.h
-        gis/fit/decoder/CFitFieldDefinition.h
-        gis/fit/defs/CFitProfile.h
-        gis/fit/defs/CFitBaseType.h
-        gis/fit/defs/fit_enums.h
-        gis/fit/defs/fit_fields.h
-        gis/fit/decoder/IFitDecoderState.h
-        gis/fit/decoder/CFitHeaderState.h
-        gis/fit/decoder/CFitRecordHeaderState.h
-        gis/fit/decoder/CFitFieldDataState.h
-        gis/fit/decoder/CFitFieldDefinitionState.h
-        gis/fit/decoder/CFitRecordContentState.h
-        gis/fit/decoder/CFitCrcState.h
-        gis/fit/decoder/CFitDecoder.h
-        gis/fit/defs/CFitProfileLookup.h
-        gis/fit/defs/CFitFieldProfile.h
-        gis/fit/decoder/CFitByteDataTransformer.h
-        gis/fit/decoder/CFitFieldBuilder.h
-        gis/fit/decoder/CFitDevFieldDefinition.h
-        gis/fit/decoder/CFitDevFieldDefinitionState.h
-        plot/IPlot.h
+        gis/suunto/CLogProject.h
+        gis/suunto/CSmlProject.h
+        gis/suunto/ISuuntoProject.h
+        gis/tcx/CTcxProject.h
+        gis/tnv/CTwoNavProject.h
+        gis/trk/CActivityTrk.h
+        gis/trk/CCombineTrk.h
+        gis/trk/CCutTrk.h
+        gis/trk/CDetailsTrk.h
+        gis/trk/CGisItemTrk.h
+        gis/trk/CKnownExtension.h
+        gis/trk/CPropertyTrk.h
+        gis/trk/CScrOptTrk.h
+        gis/trk/CSelectActivityColor.h
+        gis/trk/CTableTrk.h
+        gis/trk/CTrackData.h
+        gis/trk/filter/CFilterDelete.h
+        gis/trk/filter/CFilterDeleteExtension.h
+        gis/trk/filter/CFilterDouglasPeuker.h
+        gis/trk/filter/CFilterInterpolateElevation.h
+        gis/trk/filter/CFilterInvalid.h
+        gis/trk/filter/CFilterMedian.h
+        gis/trk/filter/CFilterNewDate.h
+        gis/trk/filter/CFilterObscureDate.h
+        gis/trk/filter/CFilterOffsetElevation.h
+        gis/trk/filter/CFilterReplaceElevation.h
+        gis/trk/filter/CFilterReset.h
+        gis/trk/filter/CFilterSpeed.h
+        gis/trk/filter/CFilterSplitSegment.h
+        gis/trk/filter/CFilterSubPt2Pt.h
+        gis/trk/filter/CFilterTerrainSlope.h
+        gis/wpt/CDetailsGeoCache.h
+        gis/wpt/CDetailsWpt.h
+        gis/wpt/CGisItemWpt.h
+        gis/wpt/CProjWpt.h
+        gis/wpt/CScrOptWpt.h
+        gis/wpt/CScrOptWptRadius.h
+        gis/wpt/CSetupNewWpt.h
+        grid/CGrid.h
+        grid/CGridSetup.h
+        grid/CProjWizard.h
+        grid/mitab.h
+        helpers/CDraw.h
+        helpers/CElevationDialog.h
+        helpers/CFileExt.h
+        helpers/CInputDialog.h
+        helpers/CLimit.h
+        helpers/CLinksDialog.h
+        helpers/CPhotoViewer.h
+        helpers/CPositionDialog.h
+        helpers/CProgressDialog.h
+        helpers/CSelectCopyAction.h
+        helpers/CSelectProjectDialog.h
+        helpers/CSettings.h
+        helpers/CToolBarConfig.h
+        helpers/CToolBarSetupDialog.h
+        helpers/CValue.h
+        helpers/CWptIconDialog.h
+        helpers/Platform.h
+        helpers/Signals.h
+        map/CMapDraw.h
+        map/CMapGEMF.h
+        map/CMapIMG.h
+        map/CMapItem.h
+        map/CMapJNX.h
+        map/CMapList.h
+        map/CMapMAP.h
+        map/CMapPathSetup.h
+        map/CMapPropSetup.h
+        map/CMapRMAP.h
+        map/CMapTMS.h
+        map/CMapVRT.h
+        map/CMapWMTS.h
+        map/IMap.h
+        map/IMapOnline.h
+        map/IMapProp.h
+        map/cache/CDiskCache.h
+        map/garmin/CGarminPoint.h
+        map/garmin/CGarminPolygon.h
+        map/garmin/CGarminStrTbl6.h
+        map/garmin/CGarminStrTbl8.h
+        map/garmin/CGarminStrTblUtf8.h
+        map/garmin/CGarminTyp.h
+        map/garmin/Garmin.h
+        map/garmin/IGarminStrTbl.h
+        map/mapsforge/types.h
+        mouse/CMouseDummy.h
+        mouse/CMouseEditArea.h
+        mouse/CMouseEditRte.h
+        mouse/CMouseEditTrk.h
+        mouse/CMouseMoveWpt.h
+        mouse/CMouseNormal.h
+        mouse/CMousePrint.h
+        mouse/CMouseRadiusWpt.h
+        mouse/CMouseRangeTrk.h
+        mouse/CMouseSelect.h
+        mouse/CMouseWptBubble.h
+        mouse/CScrOptPrint.h
+        mouse/CScrOptRangeTrk.h
+        mouse/CScrOptSelect.h
+        mouse/CScrOptUnclutter.h
+        mouse/IMouse.h
+        mouse/IMouseSelect.h
+        mouse/IScrOpt.h
+        mouse/line/CLineOpAddPoint.h
+        mouse/line/CLineOpDeletePoint.h
+        mouse/line/CLineOpMovePoint.h
+        mouse/line/CLineOpSelectRange.h
+        mouse/line/CScrOptEditLine.h
+        mouse/line/CScrOptRangeLine.h
+        mouse/line/ILineOp.h
+        mouse/line/IMouseEditLine.h
+        plot/CPlot.h
         plot/CPlotAxis.h
         plot/CPlotAxisTime.h
         plot/CPlotData.h
         plot/CPlotProfile.h
-        plot/ITrack.h
         plot/CPlotTrack.h
-        plot/CPlot.h
+        plot/IPlot.h
+        plot/ITrack.h
+        print/CPrintDialog.h
         qlgt/CQlb.h
-        qlgt/IItem.h
+        qlgt/CQlgtDb.h
+        qlgt/CQlgtDiary.h
         qlgt/CQlgtFolder.h
-        qlgt/CQlgtWpt.h
-        qlgt/CQlgtTrack.h
         qlgt/CQlgtRoute.h
-        qlgt/CQlgtDiary.h
-        qlgt/IQlgtOverlay.h
-        qlgt/CQlgtDb.h
+        qlgt/CQlgtTrack.h
+        qlgt/CQlgtWpt.h
         qlgt/CQmsDb.h
-        device/IDeviceWatcher.h
-        device/IDevice.h
-        device/CDeviceGarmin.h
-        device/CDeviceGarminArchive.h
-        device/CDeviceTwoNav.h
-        tool/IToolShell.h
-        tool/CMapVrtBuilder.h
-        tool/CImportDatabase.h
-        tool/CRoutinoDatabaseBuilder.h
-        print/CPrintDialog.h
+        qlgt/IItem.h
+        qlgt/IQlgtOverlay.h
         setup/CAppOpts.h
         setup/CAppSetupLinux.h
-        setup/CAppSetupWin.h
         setup/CAppSetupMac.h
+        setup/CAppSetupWin.h
         setup/CCommandProcessor.h
         setup/CLogHandler.h
         setup/IAppSetup.h
+        tool/CImportDatabase.h
+        tool/CMapVrtBuilder.h
+        tool/CRoutinoDatabaseBuilder.h
+        tool/IToolShell.h
+        units/CCoordFormatSetup.h
+        units/CTimeZoneSetup.h
+        units/CUnitImperial.h
+        units/CUnitMetric.h
+        units/CUnitNautic.h
+        units/CUnitsSetup.h
+        units/IUnit.h
+        version.h
+        widgets/CColorChooser.h
+        widgets/CColorLegend.h
+        widgets/CDoubleSpinBox.h
+        widgets/CFadingIcon.h
+        widgets/CHistoryListWidget.h
+        widgets/CLineEdit.h
+        widgets/CPhotoAlbum.h
+        widgets/CSelectDoubleListWidget.h
+        widgets/CTemplateWidget.h
+        widgets/CTextEdit.h
+        widgets/CTextEditWidget.h
+        widgets/CTextEditWidgetSelMenu.h
+        widgets/CTinySpinBox.h
 )
 
 
@@ -665,93 +679,95 @@ set( HDRS
 endif(WIN32)
 
 set( UIS
-    IMainWindow.ui
     IAbout.ui
-    widgets/ITextEditWidget.ui
-    widgets/ITextEditWidgetSelMenu.ui
-    widgets/IPhotoAlbum.ui
-    widgets/IColorChooser.ui
-    widgets/ISelectDoubleListWidget.ui
-    widgets/ITemplateWidget.ui
-    helpers/IInputDialog.ui
-    helpers/IPositionDialog.ui
-    helpers/IWptIconDialog.ui
-    helpers/ISelectProjectDialog.ui
-    helpers/ISelectCopyAction.ui
-    helpers/IElevationDialog.ui
-    helpers/ILinksDialog.ui
-    helpers/IProgressDialog.ui
-    helpers/IToolBarSetupDialog.ui
+    IMainWindow.ui
     canvas/ICanvasSetup.ui
     dem/IDemList.ui
     dem/IDemPathSetup.ui
     dem/IDemPropSetup.ui
-    map/IMapList.ui
-    map/IMapPathSetup.ui
-    map/IMapPropSetup.ui
-    grid/IGridSetup.ui
-    grid/IProjWizard.ui
-    mouse/IScrOptRangeTrk.ui
-    mouse/IScrOptSelect.ui
-    mouse/IScrOptPrint.ui
-    mouse/line/IScrOptEditLine.ui
-    mouse/line/IScrOptRangeLine.ui
-    gis/IGisWidget.ui
+    gis/IGisDatabase.ui
+    gis/IGisWorkspace.ui
     gis/ISelDevices.ui
     gis/ISetupFilter.ui
-    gis/prj/IDetailsPrj.ui
+    gis/db/IExportDatabase.ui
+    gis/db/ISearchDatabase.ui
+    gis/db/ISelectDBFolder.ui
+    gis/db/ISelectSaveAction.ui
     gis/db/ISetupDatabase.ui
-    gis/db/ISetupWorkspace.ui
     gis/db/ISetupFolder.ui
-    gis/db/ISelectSaveAction.ui
-    gis/db/ISelectDBFolder.ui
-    gis/db/ISearchDatabase.ui
-    gis/db/IExportDatabase.ui
-    gis/wpt/IScrOptWpt.ui
-    gis/wpt/IDetailsWpt.ui
-    gis/wpt/IDetailsGeoCache.ui
-    gis/wpt/IProjWpt.ui
-    gis/wpt/ISetupNewWpt.ui
-    gis/trk/IScrOptTrk.ui
-    gis/trk/IDetailsTrk.ui
+    gis/db/ISetupWorkspace.ui
+    gis/ovl/IDetailsOvlArea.ui
+    gis/ovl/IScrOptOvlArea.ui
+    gis/prj/IDetailsPrj.ui
+    gis/rte/ICreateRouteFromWpt.ui
+    gis/rte/IDetailsRte.ui
+    gis/rte/IScrOptRte.ui
+    gis/rte/router/IRouterBRouter.ui
+    gis/rte/router/IRouterMapQuest.ui
+    gis/rte/router/IRouterRoutino.ui
+    gis/rte/router/IRouterSetup.ui
+    gis/rte/router/brouter/IRouterBRouterInfo.ui
+    gis/rte/router/brouter/IRouterBRouterSetupWizard.ui
+    gis/rte/router/routino/IRouterRoutinoPathSetup.ui
     gis/trk/ICombineTrk.ui
     gis/trk/ICutTrk.ui
+    gis/trk/IDetailsTrk.ui
+    gis/trk/IScrOptTrk.ui
     gis/trk/ISelectActivityColor.ui
-    gis/trk/filter/IFilterDouglasPeuker.ui
-    gis/trk/filter/IFilterInvalid.ui
-    gis/trk/filter/IFilterReset.ui
-    gis/trk/filter/IFilterSubPt2Pt.ui
     gis/trk/filter/IFilterDelete.ui
     gis/trk/filter/IFilterDeleteExtension.ui
-    gis/trk/filter/IFilterMedian.ui
-    gis/trk/filter/IFilterReplaceElevation.ui
+    gis/trk/filter/IFilterDouglasPeuker.ui
     gis/trk/filter/IFilterInterpolateElevation.ui
-    gis/trk/filter/IFilterOffsetElevation.ui
+    gis/trk/filter/IFilterInvalid.ui
+    gis/trk/filter/IFilterMedian.ui
     gis/trk/filter/IFilterNewDate.ui
     gis/trk/filter/IFilterObscureDate.ui
+    gis/trk/filter/IFilterOffsetElevation.ui
+    gis/trk/filter/IFilterReplaceElevation.ui
+    gis/trk/filter/IFilterReset.ui
     gis/trk/filter/IFilterSpeed.ui
     gis/trk/filter/IFilterSplitSegment.ui
+    gis/trk/filter/IFilterSubPt2Pt.ui
     gis/trk/filter/IFilterTerrainSlope.ui
-    gis/rte/IScrOptRte.ui
-    gis/rte/ICreateRouteFromWpt.ui
-    gis/rte/IDetailsRte.ui
-    gis/rte/router/IRouterSetup.ui
-    gis/rte/router/IRouterRoutino.ui
-    gis/rte/router/IRouterMapQuest.ui
-    gis/rte/router/routino/IRouterRoutinoPathSetup.ui
-    gis/rte/router/IRouterBRouter.ui
-    gis/rte/router/brouter/IRouterBRouterInfo.ui
-    gis/rte/router/brouter/IRouterBRouterSetupWizard.ui
-    gis/ovl/IScrOptOvlArea.ui
-    gis/ovl/IDetailsOvlArea.ui
-    units/ITimeZoneSetup.ui
-    units/IUnitsSetup.ui
-    units/ICoordFormatSetup.ui
+    gis/wpt/IDetailsGeoCache.ui
+    gis/wpt/IDetailsWpt.ui
+    gis/wpt/IProjWpt.ui
+    gis/wpt/IScrOptWpt.ui
+    gis/wpt/IScrOptWptRadius.ui
+    gis/wpt/ISetupNewWpt.ui
+    grid/IGridSetup.ui
+    grid/IProjWizard.ui
+    helpers/IElevationDialog.ui
+    helpers/IInputDialog.ui
+    helpers/ILinksDialog.ui
+    helpers/IPositionDialog.ui
+    helpers/IProgressDialog.ui
+    helpers/ISelectCopyAction.ui
+    helpers/ISelectProjectDialog.ui
+    helpers/IToolBarSetupDialog.ui
+    helpers/IWptIconDialog.ui
+    map/IMapList.ui
+    map/IMapPathSetup.ui
+    map/IMapPropSetup.ui
+    mouse/IScrOptPrint.ui
+    mouse/IScrOptRangeTrk.ui
+    mouse/IScrOptSelect.ui
+    mouse/line/IScrOptEditLine.ui
+    mouse/line/IScrOptRangeLine.ui
+    print/IPrintDialog.ui
+    templates/Hiking_Tour_Summary.ui
     tool/IImportDatabase.ui
     tool/IMapVrtBuilder.ui
     tool/IRoutinoDatabaseBuilder.ui
-    print/IPrintDialog.ui
-    templates/Hiking_Tour_Summary.ui
+    units/ICoordFormatSetup.ui
+    units/ITimeZoneSetup.ui
+    units/IUnitsSetup.ui
+    widgets/IColorChooser.ui
+    widgets/IPhotoAlbum.ui
+    widgets/ISelectDoubleListWidget.ui
+    widgets/ITemplateWidget.ui
+    widgets/ITextEditWidget.ui
+    widgets/ITextEditWidgetSelMenu.ui
 )
 
 
diff --git a/src/IMainWindow.ui b/src/IMainWindow.ui
index 385b11f..c01edb9 100644
--- a/src/IMainWindow.ui
+++ b/src/IMainWindow.ui
@@ -55,7 +55,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>22</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -87,6 +87,7 @@
     <addaction name="actionPOIText"/>
     <addaction name="actionMapToolTip"/>
     <addaction name="actionNightDay"/>
+    <addaction name="actionMinMaxTrackValues"/>
     <addaction name="separator"/>
     <addaction name="actionFlipMouseWheel"/>
     <addaction name="actionProfileIsWindow"/>
@@ -118,7 +119,7 @@
    </widget>
    <widget class="QMenu" name="menuProject">
     <property name="title">
-     <string>Project</string>
+     <string>Workspace</string>
     </property>
     <addaction name="actionAddEmptyProject"/>
     <addaction name="actionSearchGoogle"/>
@@ -144,12 +145,6 @@
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <widget class="QDockWidget" name="dockMaps">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
    <property name="features">
     <set>QDockWidget::DockWidgetFeatureMask</set>
    </property>
@@ -187,12 +182,6 @@
    </widget>
   </widget>
   <widget class="QDockWidget" name="dockDem">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
    <property name="features">
     <set>QDockWidget::DockWidgetFeatureMask</set>
    </property>
@@ -225,74 +214,59 @@
     </layout>
    </widget>
   </widget>
-  <widget class="QDockWidget" name="dockGis">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
+  <widget class="QDockWidget" name="dockWorkspace">
    <property name="features">
     <set>QDockWidget::DockWidgetFeatureMask</set>
    </property>
    <property name="windowTitle">
-    <string>Data</string>
+    <string>Workspace</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>2</number>
    </attribute>
    <widget class="QWidget" name="dockWidgetContents_2"/>
   </widget>
-  <widget class="QDockWidget" name="dockRte">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>Toolbar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <widget class="QDockWidget" name="dockDatabase">
+   <property name="features">
+    <set>QDockWidget::DockWidgetFeatureMask</set>
+   </property>
+   <property name="windowTitle">
+    <string>Database</string>
    </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents_4"/>
+  </widget>
+  <widget class="QDockWidget" name="dockRte">
    <property name="features">
     <set>QDockWidget::DockWidgetFeatureMask</set>
    </property>
    <property name="windowTitle">
-    <string>Route</string>
+    <string>Routing</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>2</number>
    </attribute>
-   <widget class="QWidget" name="dockWidgetContents_5">
+   <widget class="QWidget" name="dockWidgetContents_6">
     <layout class="QVBoxLayout" name="verticalLayout_4">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
      <item>
-      <widget class="CRouterSetup" name="widget" native="true"/>
+      <widget class="CRouterSetup" name="widget_2" native="true"/>
      </item>
     </layout>
    </widget>
   </widget>
-  <widget class="QToolBar" name="toolBar">
-   <property name="windowTitle">
-    <string>Toolbar</string>
-   </property>
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-  </widget>
   <action name="actionAddMapView">
    <property name="icon">
     <iconset resource="resources.qrc">
@@ -857,6 +831,24 @@
     <string>F11</string>
    </property>
   </action>
+  <action name="actionMinMaxTrackValues">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="resources.qrc">
+     <normaloff>:/icons/32x32/TrackMinMax.png</normaloff>:/icons/32x32/TrackMinMax.png</iconset>
+   </property>
+   <property name="text">
+    <string>Min./Max. Track Values</string>
+   </property>
+   <property name="toolTip">
+    <string>Show the minimum and maximum values of the track properties along the track in the map view.</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/canvas/CCanvas.cpp b/src/canvas/CCanvas.cpp
index d6abfc2..b65765e 100644
--- a/src/canvas/CCanvas.cpp
+++ b/src/canvas/CCanvas.cpp
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -22,7 +23,7 @@
 #include "canvas/CCanvasSetup.h"
 #include "dem/CDemDraw.h"
 #include "gis/CGisDraw.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/IGisLine.h"
 #include "gis/Poi.h"
 #include "gis/ovl/CGisItemOvlArea.h"
@@ -38,6 +39,7 @@
 #include "mouse/CMouseMoveWpt.h"
 #include "mouse/CMouseNormal.h"
 #include "mouse/CMousePrint.h"
+#include "mouse/CMouseRadiusWpt.h"
 #include "mouse/CMouseRangeTrk.h"
 #include "mouse/CMouseSelect.h"
 #include "mouse/CMouseWptBubble.h"
@@ -104,9 +106,13 @@ CCanvas::CCanvas(QWidget *parent, const QString &name)
     labelStatusMessages = new QLabel(this);
     labelStatusMessages->setWordWrap(true);
     labelStatusMessages->setMinimumWidth(300);
-    labelStatusMessages->setAlignment(Qt::AlignJustify);
     labelStatusMessages->hide();
 
+    labelTrackStatistic = new QLabel(this);
+    labelTrackStatistic->setWordWrap(true);
+    labelTrackStatistic->setMinimumWidth(300);
+    labelTrackStatistic->hide();
+
     connect(map, &CMapDraw::sigStartThread, mapLoadIndicator, &QLabel::show);
     connect(map, &CMapDraw::sigStopThread,  mapLoadIndicator, &QLabel::hide);
 
@@ -207,6 +213,11 @@ void CCanvas::resetMouse()
     }
 }
 
+void CCanvas::mouseTrackingLost()
+{
+    mouseLost = true;
+}
+
 void CCanvas::setMouseCursor(IMouse& mouse, const QString& src)
 {
     if(underMouse())
@@ -223,6 +234,13 @@ void CCanvas::setMouseMoveWpt(CGisItemWpt& wpt)
     setMouseCursor(*mouse, "setMouseMoveWpt");
 }
 
+void CCanvas::setMouseRadiusWpt(CGisItemWpt& wpt)
+{
+    mouse->deleteLater();
+    mouse = new CMouseRadiusWpt(wpt, gis, this);
+    setMouseCursor(*mouse, "setMouseWptRadius");
+}
+
 void CCanvas::setMouseEditTrk(const QPointF &pt)
 {
     mouse->deleteLater();
@@ -332,15 +350,18 @@ void CCanvas::resizeEvent(QResizeEvent * e)
     setDrawContextSize(e->size());
     QWidget::resizeEvent(e);
 
+    const QRect& r = rect();
+
     // move map loading indicator to new center of canvas
     QPoint p1(mapLoadIndicator->width()>>1, mapLoadIndicator->height()>>1);
-    mapLoadIndicator->move(rect().center() - p1);
+    mapLoadIndicator->move(r.center() - p1);
 
     QPoint p2(demLoadIndicator->width()>>1, demLoadIndicator->height()>>1);
-    demLoadIndicator->move(rect().center() - p2);
+    demLoadIndicator->move(r.center() - p2);
 
     labelStatusMessages->move(20,50);
 
+    slotUpdateTrackStatistic(CMainWindow::self().isMinMaxTrackValues());
     setSizeTrackProfile();
 }
 
@@ -381,6 +402,7 @@ void CCanvas::paintEvent(QPaintEvent*)
 
 
     drawStatusMessages(p);
+    drawTrackStatistic(p);
     drawScale(p);
 
     p.end();
@@ -544,9 +566,20 @@ void CCanvas::drawStatusMessages(QPainter& p)
 {
     if(labelStatusMessages->isVisible())
     {
-        QRect r = labelStatusMessages->rect();
+        QRect r = labelStatusMessages->frameGeometry();
+        r.adjust(-5, -5, 5, 5);
+        p.setPen(CDraw::penBorderGray);
+        p.setBrush(CDraw::brushBackWhite);
+        p.drawRoundedRect(r, RECT_RADIUS, RECT_RADIUS);
+    }
+}
+
+void CCanvas::drawTrackStatistic(QPainter& p)
+{
+    if(labelTrackStatistic->isVisible())
+    {
+        QRect r = labelTrackStatistic->frameGeometry();
         r.adjust(-5, -5, 5, 5);
-        r.moveTopLeft(QPoint(15,45));
         p.setPen(CDraw::penBorderGray);
         p.setBrush(CDraw::brushBackWhite);
         p.drawRoundedRect(r, RECT_RADIUS, RECT_RADIUS);
@@ -648,9 +681,11 @@ void CCanvas::slotCheckTrackOnFocus()
         delete plotTrackProfile;
         delete colorLegend;
         keyTrackOnFocus.clear();
+        labelTrackStatistic->clear();
+        labelTrackStatistic->hide();
 
         // get access to next track object
-        CGisItemTrk * trk2 = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+        CGisItemTrk * trk2 = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
         if(nullptr == trk2)
         {
             return;
@@ -669,6 +704,32 @@ void CCanvas::slotCheckTrackOnFocus()
 
         // finally store the new key as track on focus
         keyTrackOnFocus = key;
+
+        slotUpdateTrackStatistic(CMainWindow::self().isMinMaxTrackValues());
+    }
+}
+
+void CCanvas::slotUpdateTrackStatistic(bool show)
+{
+    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(keyTrackOnFocus));
+
+    if(show && trk)
+    {
+        QString text = trk->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowActivity);
+        text += trk->getInfoLimits();
+
+        labelTrackStatistic->setMinimumWidth((trk->getActivities().getActivityCount() > 1) ? 450 : 350);
+        labelTrackStatistic->setText(text);
+        labelTrackStatistic->adjustSize();
+
+        labelTrackStatistic->move(rect().width() - labelTrackStatistic->width() - 20, rect().height() - labelTrackStatistic->height() - 60);
+        labelTrackStatistic->show();
+        update();
+    }
+    else
+    {
+        labelTrackStatistic->clear();
+        labelTrackStatistic->hide();
     }
 }
 
@@ -886,7 +947,7 @@ void CCanvas::showProfileAsWindow(bool yes)
         delete plotTrackProfile;
         keyTrackOnFocus.clear();
 
-        CGisWidget::self().focusTrkByKey(true, key);
+        CGisWorkspace::self().focusTrkByKey(true, key);
     }
 }
 
@@ -957,31 +1018,15 @@ bool CCanvas::event(QEvent *event)
     {
         return gestureEvent(static_cast<QGestureEvent*>(event));
     }
-    else if (isPinch)
+    else if (mouseLost)
     {
         QMouseEvent * me = dynamic_cast<QMouseEvent*>(event);
         if (me != nullptr)
         {
-            isPinch = false;
-
-            // right after executing a pinchgesture when placing the finger at some
-            // other place on the screen the generated QMouseEvent sometimes is not the expected
-            // MouseButtonPress but a MouseMove. As the last known position is where the first
-            // finger was set to start the pinch this MouseMove forces the map to 'jump' by a major
-            // and unexpected distance.
-            // As a workouround an artificial MouseButtonPress-event is inserted which resets the start
-            // of the beginning MouseMove to the current finger-position.
-
-            if (event->type() == QEvent::MouseMove)
-            {
-                QWidget::event(new QMouseEvent(QEvent::MouseButtonPress,
-                                               me->pos(),
-                                               me->windowPos(),
-                                               me->globalPos(),
-                                               Qt::LeftButton,
-                                               Qt::LeftButton,
-                                               me->modifiers()));
-            }
+            // notify IMouse that the upcomming QMouseEvent needs special treatment
+            // as some mouse-events may have been lost
+            mouse->afterMouseLostEvent(me);
+            mouseLost = false;
         }
     }
     return QWidget::event(event);
@@ -1019,7 +1064,8 @@ bool CCanvas::gestureEvent(QGestureEvent* e)
                 slotTriggerCompleteUpdate(needsRedraw);
             }
         }
-        isPinch = true;
+        mouseLost = true;
+        mouse->pinchGestureEvent(pinch);
     }
     return true;
 }
diff --git a/src/canvas/CCanvas.h b/src/canvas/CCanvas.h
index cee4058..b2ebf94 100644
--- a/src/canvas/CCanvas.h
+++ b/src/canvas/CCanvas.h
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -108,7 +109,9 @@ public:
 
 
     void resetMouse();
+    void mouseTrackingLost();
     void setMouseMoveWpt(CGisItemWpt& wpt);
+    void setMouseRadiusWpt(CGisItemWpt& wpt);
     void setMouseEditTrk(CGisItemTrk& trk);
     void setMouseRangeTrk(CGisItemTrk& trk);
     void setMouseEditTrk(const QPointF& pt);
@@ -160,6 +163,7 @@ signals:
 
 public slots:
     void slotTriggerCompleteUpdate(CCanvas::redraw_e flags);
+    void slotUpdateTrackStatistic(bool show);
 
 protected:
     bool event(QEvent *) override;
@@ -180,8 +184,10 @@ private slots:
     void slotToolTip();
     void slotCheckTrackOnFocus();
 
+
 private:
     void drawStatusMessages(QPainter& p);
+    void drawTrackStatistic(QPainter& p);
     void drawScale(QPainter& p);
     void setZoom(bool in, redraw_e &needsRedraw);
     void setSizeTrackProfile();
@@ -189,6 +195,7 @@ private:
     void setDrawContextSize(const QSize& s);
     void setMouseCursor(IMouse& mouse, const QString& src);
 
+
     QColor backColor = "#FFFFBF";       //< the background color used in case of missing map tiles
     redraw_e needsRedraw = eRedrawAll;  //< set true to initiate a complete redraw of the screen content
     CMapDraw * map;                     //< the map object attached to this canvas
@@ -226,12 +233,14 @@ private:
     IGisItem::key_t keyTrackOnFocus;
     /// the track profile plot
     QPointer<IPlot>  plotTrackProfile;
+    /// a label with a track
+    QLabel * labelTrackStatistic;
 
     QLabel * labelStatusMessages;
     QMap<QString, QString> statusMessages;
 
     QMutex mousePressMutex;
-    bool isPinch = false;
+    bool mouseLost = false;
 };
 
 #endif //CCANVAS_H
diff --git a/src/cursors/cursorRadiusWpt.png b/src/cursors/cursorRadiusWpt.png
new file mode 100644
index 0000000..83aeb2c
Binary files /dev/null and b/src/cursors/cursorRadiusWpt.png differ
diff --git a/src/dem/IDemList.ui b/src/dem/IDemList.ui
index 89023fd..96d562f 100644
--- a/src/dem/IDemList.ui
+++ b/src/dem/IDemList.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>622</height>
+    <width>245</width>
+    <height>250</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -73,17 +73,11 @@
      <item>
       <widget class="QLabel" name="labelIcon">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>64</width>
-         <height>16777215</height>
-        </size>
-       </property>
        <property name="text">
         <string/>
        </property>
@@ -91,7 +85,7 @@
         <pixmap resource="../resources.qrc">:/icons/48x48/Help.png</pixmap>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignHCenter|Qt::AlignTop</set>
        </property>
       </widget>
      </item>
diff --git a/src/device/IDevice.cpp b/src/device/IDevice.cpp
index 5796dbe..c609878 100644
--- a/src/device/IDevice.cpp
+++ b/src/device/IDevice.cpp
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -20,6 +21,7 @@
 #include "device/IDevice.h"
 #include "gis/CGisListWks.h"
 #include "gis/prj/IGisProject.h"
+#include "gis/rte/router/IRouter.h"
 #include "helpers/CSelectCopyAction.h"
 
 #ifdef HAVE_DBUS
@@ -122,6 +124,26 @@ void IDevice::getItemsByArea(const QRectF& area, IGisItem::selflags_t flags, QLi
     }
 }
 
+void IDevice::getNogoAreas(QVector<IRouter::circle_t> & areas)
+{
+    const int N = childCount();
+    for(int n = 0; n < N; n++)
+    {
+        IGisProject * project = dynamic_cast<IGisProject*>(child(n));
+        if(project != nullptr)
+        {
+            project->getNogoAreas(areas);
+            continue;
+        }
+
+        IDevice * device = dynamic_cast<IDevice*>(child(n));
+        if(device != nullptr)
+        {
+            device->getNogoAreas(areas);
+        }
+    }
+}
+
 IGisItem * IDevice::getItemByKey(const IGisItem::key_t& key)
 {
     IGisItem * item = nullptr;
diff --git a/src/device/IDevice.h b/src/device/IDevice.h
index 9c698b2..d433258 100644
--- a/src/device/IDevice.h
+++ b/src/device/IDevice.h
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -23,6 +24,7 @@
 #include <QTreeWidgetItem>
 
 #include "gis/IGisItem.h"
+#include "gis/rte/router/IRouter.h"
 class CGisDraw;
 class CGisItemWpt;
 class CDeviceGarmin;
@@ -68,6 +70,7 @@ public:
 
     void getItemsByPos(const QPointF& pos, QList<IGisItem *> &items);
     void getItemsByArea(const QRectF& area, IGisItem::selflags_t flags, QList<IGisItem *> &items);
+    void getNogoAreas(QVector<IRouter::circle_t> &areas);
     IGisItem * getItemByKey(const IGisItem::key_t& key);
     void getItemsByKeys(const QList<IGisItem::key_t>& keys, QList<IGisItem*>& items);
     void editItemByKey(const IGisItem::key_t& key);
diff --git a/src/gis/CSetupFilter.cpp b/src/gis/CGisDatabase.cpp
similarity index 52%
copy from src/gis/CSetupFilter.cpp
copy to src/gis/CGisDatabase.cpp
index 9cdaa3d..c4308da 100644
--- a/src/gis/CSetupFilter.cpp
+++ b/src/gis/CGisDatabase.cpp
@@ -16,36 +16,45 @@
 
 **********************************************************************************************/
 
-#include "gis/CGisWidget.h"
-#include "gis/CSetupFilter.h"
-#include "gis/prj/IGisProject.h"
+#include "gis/CGisDatabase.h"
+#include "helpers/CSettings.h"
 
-CSetupFilter::CSetupFilter(CGisWidget *parent)
+#include <QtWidgets>
+
+CGisDatabase * CGisDatabase::pSelf = nullptr;
+
+CGisDatabase::CGisDatabase(QWidget *parent)
     : QWidget(parent)
-    , gisWidget(parent)
 {
+    pSelf = this;
     setupUi(this);
 
-    switch (IGisProject::filterMode)
-    {
-    case IGisProject::eFilterModeName:
-        radioName->setChecked(true);
-        break;
+    SETTINGS;
+    treeDB->header()->restoreState(cfg.value("Database/treeDB/state", treeDB->header()->saveState()).toByteArray());
+
+    connect(treeDB,  &CGisListDB::sigChanged,  this, &CGisDatabase::slotHelpText);
 
-    case IGisProject::eFilterModeText:
-        radioText->setChecked(true);
-        break;
-    }
 
-    connect(radioName, &QRadioButton::clicked, this, &CSetupFilter::slotSelect);
-    connect(radioText, &QRadioButton::clicked, this, &CSetupFilter::slotSelect);
+    QTimer::singleShot(1, this, SLOT(slotHelpText()));
+}
+
+CGisDatabase::~CGisDatabase()
+{
+    SETTINGS;
+    cfg.setValue("Database/treeDB/state", treeDB->header()->saveState());
 }
 
+void CGisDatabase::slotHelpText()
+{
+    frameHelp->setVisible(treeDB->topLevelItemCount() == 0);
+}
 
-void CSetupFilter::slotSelect()
+void CGisDatabase::postEventForDb(QEvent * event)
 {
-    IGisProject::filterMode = radioName->isChecked() ? IGisProject::eFilterModeName : IGisProject::eFilterModeText;
-    gisWidget->applyFilter();
-    deleteLater();
+    QCoreApplication::postEvent(treeDB, event);
 }
 
+void CGisDatabase::sendEventForDb(QEvent * event)
+{
+    QCoreApplication::sendEvent(treeDB, event);
+}
diff --git a/src/gis/CSetupFilter.h b/src/gis/CGisDatabase.h
similarity index 67%
copy from src/gis/CSetupFilter.h
copy to src/gis/CGisDatabase.h
index 5f07bb1..9964af3 100644
--- a/src/gis/CSetupFilter.h
+++ b/src/gis/CGisDatabase.h
@@ -16,27 +16,34 @@
 
 **********************************************************************************************/
 
-#ifndef CSETUPFILTER_H
-#define CSETUPFILTER_H
+#ifndef CGISDATABASE_H
+#define CGISDATABASE_H
 
-#include "ui_ISetupFilter.h"
-#include <QWidget>
+#include "ui_IGisDatabase.h"
 
-class CGisWidget;
-
-class CSetupFilter : public QWidget, private Ui::ISetupFilter
+class CGisDatabase : public QWidget, private Ui::IGisDatabase
 {
     Q_OBJECT
 public:
-    CSetupFilter(CGisWidget *parent);
-    virtual ~CSetupFilter() = default;
+    static CGisDatabase& self()
+    {
+        return *pSelf;
+    }
+
+    virtual ~CGisDatabase();
+
+    void postEventForDb(QEvent * event);
+    void sendEventForDb(QEvent * event);
 
 private slots:
-    void slotSelect();
+    void slotHelpText();
 
 private:
-    CGisWidget * gisWidget;
+    friend class CMainWindow;
+    CGisDatabase(QWidget * parent);
+
+    static CGisDatabase * pSelf;
 };
 
-#endif //CSETUPFILTER_H
+#endif //CGISDATABASE_H
 
diff --git a/src/gis/CGisDraw.cpp b/src/gis/CGisDraw.cpp
index 5c058e4..ee9ab33 100644
--- a/src/gis/CGisDraw.cpp
+++ b/src/gis/CGisDraw.cpp
@@ -17,7 +17,7 @@
 **********************************************************************************************/
 
 #include "gis/CGisDraw.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "helpers/CDraw.h"
 
 #include <QtWidgets>
@@ -25,7 +25,7 @@
 CGisDraw::CGisDraw(CCanvas *parent)
     : IDrawContext("gis", CCanvas::eRedrawGis, parent)
 {
-    connect(&CGisWidget::self(), &CGisWidget::sigChanged, this, &CGisDraw::emitSigCanvasUpdate);
+    connect(&CGisWorkspace::self(), &CGisWorkspace::sigChanged, this, &CGisDraw::emitSigCanvasUpdate);
 }
 
 CGisDraw::~CGisDraw()
@@ -34,7 +34,7 @@ CGisDraw::~CGisDraw()
 
 void CGisDraw::draw(QPainter& p, const QRect& rect)
 {
-    CGisWidget::self().fastDraw(p, rect, this);
+    CGisWorkspace::self().fastDraw(p, rect, this);
 }
 
 void CGisDraw::drawt(buffer_t& currentBuffer)
@@ -63,5 +63,5 @@ void CGisDraw::drawt(buffer_t& currentBuffer)
     USE_ANTI_ALIASING(p,true);
     p.translate(-pp);
 
-    CGisWidget::self().draw(p,viewport, this);
+    CGisWorkspace::self().draw(p,viewport, this);
 }
diff --git a/src/gis/CGisListDB.cpp b/src/gis/CGisListDB.cpp
index 61c9f29..8ca3ba7 100644
--- a/src/gis/CGisListDB.cpp
+++ b/src/gis/CGisListDB.cpp
@@ -20,7 +20,7 @@
 #include "canvas/CCanvas.h"
 #include "config.h"
 #include "gis/CGisListDB.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/db/CDBFolderLostFound.h"
 #include "gis/db/CDBFolderMysql.h"
 #include "gis/db/CDBFolderSqlite.h"
@@ -308,7 +308,7 @@ bool CGisListDB::event(QEvent * e)
 
                 evt->idChild = idChild;
                 CEvtD2WShowFolder * evt1 = new CEvtD2WShowFolder(idChild, evt->db);
-                CGisWidget::self().postEventForWks(evt1);
+                CGisWorkspace::self().postEventForWks(evt1);
             }
 
             db->announceChange();
@@ -948,7 +948,7 @@ void CGisListDB::slotUpdateDatabase()
             folder->update();
 
             CEvtD2WReload * evt = new CEvtD2WReload(folder->getDBName());
-            CGisWidget::self().postEventForWks(evt);
+            CGisWorkspace::self().postEventForWks(evt);
         }
     }
 }
@@ -1020,7 +1020,7 @@ void CGisListDB::slotReadyRead()
             folder->update();
 
             CEvtD2WReload * evt = new CEvtD2WReload(folder->getDBName());
-            CGisWidget::self().postEventForWks(evt);
+            CGisWorkspace::self().postEventForWks(evt);
         }
     }
 }
diff --git a/src/gis/CGisListWks.cpp b/src/gis/CGisListWks.cpp
index 3110dd8..b8723b9 100644
--- a/src/gis/CGisListWks.cpp
+++ b/src/gis/CGisListWks.cpp
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -28,8 +29,9 @@
 #include "device/CDeviceWatcherMac.h"
 #endif
 #include "device/IDevice.h"
+#include "gis/CGisDatabase.h"
 #include "gis/CGisListWks.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/CSelDevices.h"
 #include "gis/IGisItem.h"
 #include "gis/db/CDBProject.h"
@@ -41,10 +43,13 @@
 #include "gis/gpx/CGpxProject.h"
 #include "gis/ovl/CGisItemOvlArea.h"
 #include "gis/prj/IGisProject.h"
+#include "gis/qlb/CQlbProject.h"
 #include "gis/qms/CQmsProject.h"
 #include "gis/rte/CGisItemRte.h"
 #include "gis/search/CSearchGoogle.h"
 #include "gis/slf/CSlfProject.h"
+#include "gis/suunto/CLogProject.h"
+#include "gis/suunto/CSmlProject.h"
 #include "gis/tcx/CTcxProject.h"
 #include "gis/trk/CGisItemTrk.h"
 #include "gis/wpt/CGisItemWpt.h"
@@ -159,6 +164,7 @@ CGisListWks::CGisListWks(QWidget *parent)
     actionCopyTrkWithWpt = menuItemTrk->addAction(QIcon("://icons/32x32/CopyTrkWithWpt.png"), tr("Copy Track with Waypoints"), this, SLOT(slotCopyTrkWithWpt()));
     menuItemTrk->addSeparator();
     actionDelete    = menuItemTrk->addAction(QIcon("://icons/32x32/DeleteOne.png"),tr("Delete"), this, SLOT(slotDeleteItem()));
+    connect(menuItemTrk, &QMenu::triggered, &CGisWorkspace::self(), &CGisWorkspace::slotWksItemSelectionReset);
 
     menuItemWpt     = new QMenu(this);
     menuItemWpt->addAction(actionEditDetails);
@@ -168,8 +174,13 @@ CGisListWks::CGisListWks(QWidget *parent)
     actionBubbleWpt->setCheckable(true);
     actionMoveWpt   = menuItemWpt->addAction(QIcon("://icons/32x32/WptMove.png"), tr("Move Waypoint"),     this, SLOT(slotMoveWpt()));
     actionProjWpt   = menuItemWpt->addAction(QIcon("://icons/32x32/WptProj.png"), tr("Proj. Waypoint..."), this, SLOT(slotProjWpt()));
+    actionEditRadiusWpt = menuItemWpt->addAction(QIcon("://icons/32x32/WptEditProx.png"), tr("Change Radius"), this, SLOT(slotEditRadiusWpt()));
+    actionNogoAreaWpt = menuItemWpt->addAction(QIcon("://icons/32x32/WptAvoid.png"), tr("Toggle Nogo-Area"), this, SLOT(slotNogoAreaWpt()));
+    actionNogoAreaWpt->setCheckable(true);
+    actionDelRadiusWpt = menuItemWpt->addAction(QIcon("://icons/32x32/WptDelProx.png"), tr("Delete Radius"), this, SLOT(slotDelRadiusWpt()));
     menuItemWpt->addSeparator();
     menuItemWpt->addAction(actionDelete);
+    connect(menuItemWpt, &QMenu::triggered, &CGisWorkspace::self(), &CGisWorkspace::slotWksItemSelectionReset);
 
     menuItemRte     = new QMenu(this);
     menuItemRte->addAction(actionEditDetails);
@@ -183,6 +194,7 @@ CGisListWks::CGisListWks(QWidget *parent)
     actionRte2Trk   = menuItemRte->addAction(QIcon("://icons/32x32/Track.png"),    tr("Convert to Track"),this, SLOT(slotRte2Trk()));
     menuItemRte->addSeparator();
     menuItemRte->addAction(actionDelete);
+    connect(menuItemRte, &QMenu::triggered, &CGisWorkspace::self(), &CGisWorkspace::slotWksItemSelectionReset);
 
 
     menuItemOvl     = new QMenu(this);
@@ -192,6 +204,7 @@ CGisListWks::CGisListWks(QWidget *parent)
     actionEditArea  = menuItemOvl->addAction(QIcon("://icons/32x32/AreaMove.png"),tr("Edit Area Points"), this, SLOT(slotEditArea()));
     menuItemOvl->addSeparator();
     menuItemOvl->addAction(actionDelete);
+    connect(menuItemOvl, &QMenu::triggered, &CGisWorkspace::self(), &CGisWorkspace::slotWksItemSelectionReset);
 
 
     menuItem        = new QMenu(this);
@@ -200,9 +213,8 @@ CGisListWks::CGisListWks(QWidget *parent)
     actionSymWpt    = menuItem->addAction(QIcon("://icons/waypoints/32x32/PinBlue.png"), tr("Change Icon (sel. waypt. only)"), this, SLOT(slotSymWpt()));
     menuItem->addAction(actionCombineTrk);
     menuItem->addAction(actionActivityTrk);
-
     menuItem->addAction(actionDelete);
-
+    connect(menuItem, &QMenu::triggered, &CGisWorkspace::self(), &CGisWorkspace::slotWksItemSelectionReset);
 
     connect(actionFocusTrk, &QAction::triggered, this, &CGisListWks::slotFocusTrk);
     connect(actionFocusRte, &QAction::triggered, this, &CGisListWks::slotFocusRte);
@@ -856,6 +868,14 @@ void CGisListWks::slotLoadWorkspace()
             break;
         }
 
+        case IGisProject::eTypeQlb:
+        {
+            project = new CQlbProject(name, this);
+            project->setCheckState(CGisListDB::eColumnCheckbox, visible); // (1a)
+            *project << stream;
+            break;
+        }
+
         case IGisProject::eTypeGpx:
         {
             project = new CGpxProject(name, this);
@@ -912,6 +932,22 @@ void CGisListWks::slotLoadWorkspace()
             *project << stream;
             break;
         }
+
+        case IGisProject::eTypeSml:
+        {
+            project = new CSmlProject(name, this);
+            project->setCheckState(CGisListDB::eColumnCheckbox, visible);
+            *project << stream;
+            break;
+        }
+
+        case IGisProject::eTypeLog:
+        {
+            project = new CSmlProject(name, this);
+            project->setCheckState(CGisListDB::eColumnCheckbox, visible);
+            *project << stream;
+            break;
+        }
         }
 
         if(nullptr != project)
@@ -1106,11 +1142,18 @@ void CGisListWks::slotContextMenu(const QPoint& point)
             }
 
             case IGisItem::eTypeWpt:
-                actionBubbleWpt->setChecked(dynamic_cast<CGisItemWpt*>(gisItem)->hasBubble());
+            {
+                CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(gisItem);
+                actionBubbleWpt->setChecked(wpt->hasBubble());
+                bool radius = wpt->hasRadius();
+                actionDelRadiusWpt->setEnabled(radius);
+                actionNogoAreaWpt->setEnabled(radius);
+                actionNogoAreaWpt->setChecked(radius && wpt->isNogoArea());
                 actionMoveWpt->setDisabled(isOnDevice);
                 actionProjWpt->setDisabled(isOnDevice);
                 menuItemWpt->exec(p);
                 break;
+            }
 
             case IGisItem::eTypeRte:
                 actionFocusRte->setChecked(gisItem->hasUserFocus());
@@ -1192,6 +1235,9 @@ void CGisListWks::slotCloseAllProjects()
 
     CGisListWksEditLock lock(true, IGisItem::mutexItems);
     closeProjects(findItems("*", Qt::MatchWildcard));
+
+    CGisWorkspace::self().slotWksItemSelectionReset();
+
     emit sigChanged();
 }
 
@@ -1305,8 +1351,9 @@ void CGisListWks::slotItemDoubleClicked(QTreeWidgetItem * item, int )
     IGisItem * gisItem = dynamic_cast<IGisItem*>(item);
     if(gisItem != nullptr)
     {
+        CGisWorkspace::self().slotWksItemSelectionReset();
         CMainWindow::self().zoomCanvasTo(gisItem->getBoundingRect());
-        CGisWidget::self().focusTrkByKey(true, gisItem->getKey());
+        CGisWorkspace::self().focusTrkByKey(true, gisItem->getKey());
     }
 }
 
@@ -1327,7 +1374,7 @@ void CGisListWks::slotEditItem()
     IGisItem * gisItem = dynamic_cast<IGisItem*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().editItemByKey(gisItem->getKey());
+        CGisWorkspace::self().editItemByKey(gisItem->getKey());
     }
 }
 
@@ -1346,7 +1393,7 @@ void CGisListWks::slotDeleteItem()
         }
     }
 
-    CGisWidget::self().delItemsByKey(keys);
+    CGisWorkspace::self().delItemsByKey(keys);
 }
 
 void CGisListWks::slotCopyItem()
@@ -1359,7 +1406,7 @@ void CGisListWks::slotCopyItem()
      * to get invalid, causing a segfault when used.
      *
      * As a fix the keys of the selected items are stored temporarily and
-     * later used to retrieve the item on the workspace via CGisWidget::getItemByKey()
+     * later used to retrieve the item on the workspace via CGisWorkspace::getItemByKey()
      * again. This is always safe.
      */
     QList<QTreeWidgetItem*> items = selectedItems();
@@ -1373,7 +1420,7 @@ void CGisListWks::slotCopyItem()
         }
     }
 
-    CGisWidget::self().copyItemsByKey(keys);
+    CGisWorkspace::self().copyItemsByKey(keys);
 }
 
 void CGisListWks::slotProjWpt()
@@ -1383,7 +1430,7 @@ void CGisListWks::slotProjWpt()
     CGisItemWpt * gisItem = dynamic_cast<CGisItemWpt*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().projWptByKey(gisItem->getKey());
+        CGisWorkspace::self().projWptByKey(gisItem->getKey());
     }
 }
 
@@ -1394,7 +1441,40 @@ void CGisListWks::slotBubbleWpt()
     CGisItemWpt * gisItem = dynamic_cast<CGisItemWpt*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().toggleWptBubble(gisItem->getKey());
+        CGisWorkspace::self().toggleWptBubble(gisItem->getKey());
+    }
+}
+
+void CGisListWks::slotNogoAreaWpt()
+{
+    CGisListWksEditLock lock(false, IGisItem::mutexItems);
+
+    CGisItemWpt * gisItem = dynamic_cast<CGisItemWpt*>(currentItem());
+    if(gisItem != nullptr)
+    {
+        CGisWorkspace::self().toggleWptNogoArea(gisItem->getKey());
+    }
+}
+
+void CGisListWks::slotDelRadiusWpt()
+{
+    CGisListWksEditLock lock(false, IGisItem::mutexItems);
+
+    CGisItemWpt * gisItem = dynamic_cast<CGisItemWpt*>(currentItem());
+    if(gisItem != nullptr)
+    {
+        CGisWorkspace::self().deleteWptRadius(gisItem->getKey());
+    }
+}
+
+void CGisListWks::slotEditRadiusWpt()
+{
+    CGisListWksEditLock lock(false, IGisItem::mutexItems);
+
+    CGisItemWpt * gisItem = dynamic_cast<CGisItemWpt*>(currentItem());
+    if(gisItem != nullptr)
+    {
+        CGisWorkspace::self().editWptRadius(gisItem->getKey());
     }
 }
 
@@ -1405,7 +1485,7 @@ void CGisListWks::slotMoveWpt()
     CGisItemWpt * gisItem = dynamic_cast<CGisItemWpt*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().moveWptByKey(gisItem->getKey());
+        CGisWorkspace::self().moveWptByKey(gisItem->getKey());
     }
 }
 
@@ -1416,7 +1496,7 @@ void CGisListWks::slotFocusTrk(bool on)
     CGisItemTrk * gisItem = dynamic_cast<CGisItemTrk*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().focusTrkByKey(on, gisItem->getKey());
+        CGisWorkspace::self().focusTrkByKey(on, gisItem->getKey());
     }
 }
 
@@ -1427,7 +1507,7 @@ void CGisListWks::slotEditTrk()
     CGisItemTrk * gisItem = dynamic_cast<CGisItemTrk*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().editTrkByKey(gisItem->getKey());
+        CGisWorkspace::self().editTrkByKey(gisItem->getKey());
     }
 }
 
@@ -1438,7 +1518,7 @@ void CGisListWks::slotReverseTrk()
     CGisItemTrk * gisItem = dynamic_cast<CGisItemTrk*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().reverseTrkByKey(gisItem->getKey());
+        CGisWorkspace::self().reverseTrkByKey(gisItem->getKey());
     }
 }
 
@@ -1461,11 +1541,11 @@ void CGisListWks::slotCombineTrk()
     {
         if(keys.size() == 1)
         {
-            CGisWidget::self().combineTrkByKey(keys.first());
+            CGisWorkspace::self().combineTrkByKey(keys.first());
         }
         else
         {
-            CGisWidget::self().combineTrkByKey(keys, keys);
+            CGisWorkspace::self().combineTrkByKey(keys, keys);
         }
     }
 }
@@ -1495,7 +1575,7 @@ void CGisListWks::slotRangeTrk()
     CGisItemTrk * gisItem = dynamic_cast<CGisItemTrk*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().rangeTrkByKey(gisItem->getKey());
+        CGisWorkspace::self().rangeTrkByKey(gisItem->getKey());
     }
 }
 
@@ -1506,7 +1586,7 @@ void CGisListWks::slotCopyTrkWithWpt()
     CGisItemTrk * gisItem = dynamic_cast<CGisItemTrk*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().copyTrkWithWptByKey(gisItem->getKey());
+        CGisWorkspace::self().copyTrkWithWptByKey(gisItem->getKey());
     }
 }
 
@@ -1517,7 +1597,7 @@ void CGisListWks::slotFocusRte(bool on)
     CGisItemRte * gisItem = dynamic_cast<CGisItemRte*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().focusRteByKey(on, gisItem->getKey());
+        CGisWorkspace::self().focusRteByKey(on, gisItem->getKey());
     }
 }
 
@@ -1528,7 +1608,7 @@ void CGisListWks::slotCalcRte()
     CGisItemRte * gisItem = dynamic_cast<CGisItemRte*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().calcRteByKey(gisItem->getKey());
+        CGisWorkspace::self().calcRteByKey(gisItem->getKey());
     }
 }
 
@@ -1539,7 +1619,7 @@ void CGisListWks::slotResetRte()
     CGisItemRte * gisItem = dynamic_cast<CGisItemRte*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().resetRteByKey(gisItem->getKey());
+        CGisWorkspace::self().resetRteByKey(gisItem->getKey());
     }
 }
 
@@ -1551,7 +1631,7 @@ void CGisListWks::slotEditRte()
     CGisItemRte * gisItem = dynamic_cast<CGisItemRte*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().editRteByKey(gisItem->getKey());
+        CGisWorkspace::self().editRteByKey(gisItem->getKey());
     }
 }
 
@@ -1562,7 +1642,7 @@ void CGisListWks::slotRte2Trk()
     CGisItemRte * gisItem = dynamic_cast<CGisItemRte*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().convertRouteToTrack(gisItem->getKey());
+        CGisWorkspace::self().convertRouteToTrack(gisItem->getKey());
     }
 }
 
@@ -1573,7 +1653,7 @@ void CGisListWks::slotEditArea()
     CGisItemOvlArea * gisItem = dynamic_cast<CGisItemOvlArea*>(currentItem());
     if(gisItem != nullptr)
     {
-        CGisWidget::self().editAreaByKey(gisItem->getKey());
+        CGisWorkspace::self().editAreaByKey(gisItem->getKey());
     }
 }
 
@@ -1622,7 +1702,7 @@ void CGisListWks::slotAddEmptyProject()
         }
 
         CEvtW2DCreate * evt = new CEvtW2DCreate(name, type, idParent, db, host);
-        CGisWidget::self().postEventForDb(evt);
+        CGisDatabase::self().postEventForDb(evt);
     }
 }
 
@@ -1805,6 +1885,7 @@ bool CGisListWks::event(QEvent * e)
 
             e->accept();
             emit sigChanged();
+            emit sigItemDeleted();
             return true;
         }
 
@@ -1831,6 +1912,7 @@ bool CGisListWks::event(QEvent * e)
             }
             e->accept();
             emit sigChanged();
+            emit sigItemDeleted();
             return true;
         }
 
@@ -1888,7 +1970,7 @@ bool CGisListWks::event(QEvent * e)
         case eEvtA2WCutTrk:
         {
             CEvtA2WCutTrk * evt = (CEvtA2WCutTrk*)e;
-            CGisWidget::self().cutTrkByKey(evt->key);
+            CGisWorkspace::self().cutTrkByKey(evt->key);
             e->accept();
             return true;
         }
@@ -1929,7 +2011,7 @@ void CGisListWks::slotRteFromWpt()
 
     if(!keys.isEmpty())
     {
-        CGisWidget::self().makeRteFromWpt(keys);
+        CGisWorkspace::self().makeRteFromWpt(keys);
     }
 }
 
@@ -1990,7 +2072,7 @@ void CGisListWks::slotCopyProject()
         }
     }
 
-    CGisWidget::self().copyItemsByKey(keys);
+    CGisWorkspace::self().copyItemsByKey(keys);
 }
 
 
@@ -2016,5 +2098,5 @@ void CGisListWks::slotSymWpt()
         keys << wpt->getKey();
     }
 
-    CGisWidget::self().changeWptSymByKey(keys, tb.objectName());
+    CGisWorkspace::self().changeWptSymByKey(keys, tb.objectName());
 }
diff --git a/src/gis/CGisListWks.h b/src/gis/CGisListWks.h
index ce92df9..799efad 100644
--- a/src/gis/CGisListWks.h
+++ b/src/gis/CGisListWks.h
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -66,6 +67,7 @@ public slots:
 
 signals:
     void sigChanged();
+    void sigItemDeleted();
 
 protected:
     void dragMoveEvent(QDragMoveEvent *e) override;
@@ -87,6 +89,9 @@ private slots:
     void slotEditItem();
     void slotDeleteItem();
     void slotBubbleWpt();
+    void slotNogoAreaWpt();
+    void slotDelRadiusWpt();
+    void slotEditRadiusWpt();
     void slotProjWpt();
     void slotMoveWpt();
     void slotFocusTrk(bool on);
@@ -161,6 +166,9 @@ private:
     QAction * actionCopyItem;
     QAction * actionDelete;
     QAction * actionBubbleWpt;
+    QAction * actionDelRadiusWpt;
+    QAction * actionNogoAreaWpt;
+    QAction * actionEditRadiusWpt;
     QAction * actionProjWpt;
     QAction * actionMoveWpt;
     QAction * actionFocusTrk;
diff --git a/src/gis/CGisWidget.cpp b/src/gis/CGisWorkspace.cpp
similarity index 75%
rename from src/gis/CGisWidget.cpp
rename to src/gis/CGisWorkspace.cpp
index 3285d11..ecd134c 100644
--- a/src/gis/CGisWidget.cpp
+++ b/src/gis/CGisWorkspace.cpp
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -18,8 +19,9 @@
 
 #include "CMainWindow.h"
 #include "device/IDevice.h"
+#include "gis/CGisDatabase.h"
 #include "gis/CGisDraw.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/CSetupFilter.h"
 #include "gis/IGisItem.h"
 #include "gis/db/CDBProject.h"
@@ -31,6 +33,7 @@
 #include "gis/qms/CQmsProject.h"
 #include "gis/rte/CCreateRouteFromWpt.h"
 #include "gis/rte/CGisItemRte.h"
+#include "gis/rte/router/IRouter.h"
 #include "gis/trk/CCombineTrk.h"
 #include "gis/trk/CGisItemTrk.h"
 #include "gis/wpt/CGisItemWpt.h"
@@ -43,9 +46,9 @@
 #include <QtWidgets>
 #include <QtXml>
 
-CGisWidget * CGisWidget::pSelf = nullptr;
+CGisWorkspace * CGisWorkspace::pSelf = nullptr;
 
-CGisWidget::CGisWidget(QMenu *menuProject, QWidget *parent)
+CGisWorkspace::CGisWorkspace(QMenu *menuProject, QWidget *parent)
     : QWidget(parent)
 {
     pSelf = this;
@@ -58,51 +61,45 @@ CGisWidget::CGisWidget(QMenu *menuProject, QWidget *parent)
 
     SETTINGS;
     treeWks->header()->restoreState(cfg.value("Workspace/treeWks/state", treeWks->header()->saveState()).toByteArray());
-    treeDB->header()->restoreState(cfg.value("Workspace/treeDB/state", treeDB->header()->saveState()).toByteArray());
     IGisProject::filterMode = IGisProject::filter_mode_e(cfg.value("Workspace/projects/filterMode", IGisProject::filterMode).toInt());
 
-    connect(treeWks, &CGisListWks::sigChanged, this, &CGisWidget::sigChanged);
-    connect(treeDB,  &CGisListDB::sigChanged,  this, &CGisWidget::slotHelpText);
-    connect(sliderOpacity, &QSlider::valueChanged, this, &CGisWidget::slotSetGisLayerOpacity);
-    connect(lineFilter, &QLineEdit::textChanged, this, &CGisWidget::slotFilter);
-    connect(actionSetupFilter, &QAction::triggered, this, &CGisWidget::slotSetupFilter);
-
-    slotHelpText();
-
-    treeWks->slotLoadWorkspace();
+    connect(treeWks, &CGisListWks::sigChanged, this, &CGisWorkspace::sigChanged);
+    connect(sliderOpacity, &QSlider::valueChanged, this, &CGisWorkspace::slotSetGisLayerOpacity);
+    connect(lineFilter, &QLineEdit::textChanged, this, &CGisWorkspace::slotFilter);
+    connect(actionSetupFilter, &QAction::triggered, this, &CGisWorkspace::slotSetupFilter);
+    connect(treeWks, &CGisListWks::itemPressed, this, &CGisWorkspace::slotWksItemPressed);
+    connect(treeWks, &CGisListWks::itemSelectionChanged, this, &CGisWorkspace::slotWksItemSelectionChanged);
+    connect(treeWks, &CGisListWks::sigItemDeleted, this, &CGisWorkspace::slotWksItemSelectionChanged);
+
+    // [Issue #265] Delay the loading of the workspace to make sure the complete IUnit system
+    //              is up and running.
+    QTimer::singleShot(500, treeWks, SLOT(slotLoadWorkspace()));
 }
 
-CGisWidget::~CGisWidget()
+CGisWorkspace::~CGisWorkspace()
 {
     SETTINGS;
     cfg.setValue("Workspace/treeWks/state", treeWks->header()->saveState());
-    cfg.setValue("Workspace/treeDB/state", treeDB->header()->saveState());
     cfg.setValue("Workspace/projects/filterMode", IGisProject::filterMode);
     /*
         Explicitly delete workspace here, as database projects use
-        CGisWidget upon destruction to signal the database their destruction.
+        CGisWorkspace upon destruction to signal the database their destruction.
 
      */
     delete treeWks;
 }
 
-void CGisWidget::setOpacity(qreal val)
+void CGisWorkspace::setOpacity(qreal val)
 {
     sliderOpacity->setValue(val * 100);
 }
 
-void CGisWidget::postEventForWks(QEvent * event)
+void CGisWorkspace::postEventForWks(QEvent * event)
 {
     QCoreApplication::postEvent(treeWks, event);
 }
 
-void CGisWidget::postEventForDb(QEvent * event)
-{
-    QCoreApplication::postEvent(treeDB, event);
-}
-
-
-void CGisWidget::loadGisProject(const QString& filename)
+void CGisWorkspace::loadGisProject(const QString& filename)
 {
     // add project to workspace
     CCanvas::setOverrideCursor(Qt::WaitCursor, "loadGisProject");
@@ -126,12 +123,8 @@ void CGisWidget::loadGisProject(const QString& filename)
     emit sigChanged();
 }
 
-void CGisWidget::slotHelpText()
-{
-    frameHelp->setVisible(treeDB->topLevelItemCount() == 0);
-}
 
-void CGisWidget::slotSetGisLayerOpacity(int val)
+void CGisWorkspace::slotSetGisLayerOpacity(int val)
 {
     CCanvas::gisLayerOpacity = qreal(val)/100;
     CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
@@ -141,14 +134,14 @@ void CGisWidget::slotSetGisLayerOpacity(int val)
     }
 }
 
-void CGisWidget::applyFilter()
+void CGisWorkspace::applyFilter()
 {
     slotFilter(lineFilter->text());
 }
 
-void CGisWidget::slotFilter(const QString& str)
+void CGisWorkspace::slotFilter(const QString& str)
 {
-    actionClearFilter->setIcon(str.isEmpty() ? QIcon("://icons/32x32/Zoom.png") : QIcon("://icons/32x32/Cancel.png"));
+    actionClearFilter->setIcon(str.isEmpty() ? QIcon("://icons/32x32/Filter.png") : QIcon("://icons/32x32/Cancel.png"));
 
     CCanvas::setOverrideCursor(Qt::WaitCursor, "slotFilter");
     QMutexLocker lock(&IGisItem::mutexItems);
@@ -171,7 +164,7 @@ void CGisWidget::slotFilter(const QString& str)
     CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
-void CGisWidget::slotSetupFilter()
+void CGisWorkspace::slotSetupFilter()
 {
     CSetupFilter * setupFilter = new CSetupFilter(this);
     setupFilter->adjustSize();
@@ -179,7 +172,7 @@ void CGisWidget::slotSetupFilter()
     setupFilter->show();
 }
 
-void CGisWidget::slotSaveAll()
+void CGisWorkspace::slotSaveAll()
 {
     CCanvas::setOverrideCursor(Qt::WaitCursor, "slotSaveAll");
     QMutexLocker lock(&IGisItem::mutexItems);
@@ -203,7 +196,40 @@ void CGisWidget::slotSaveAll()
     CCanvas::restoreOverrideCursor("slotSaveAll");
 }
 
-IGisProject * CGisWidget::selectProject()
+
+void CGisWorkspace::slotWksItemSelectionChanged()
+{
+    slotWksItemPressed(treeWks->currentItem());
+}
+
+void CGisWorkspace::slotWksItemPressed(QTreeWidgetItem * i)
+{
+    IGisItem * item     = dynamic_cast<IGisItem*>(i);
+    if(item != nullptr)
+    {
+        keyWksSelection = item->getKey();
+        for(CCanvas * canvas : CMainWindow::self().getCanvas())
+        {
+            canvas->reportStatus("WksSelection", tr("<b>Item Selection: </b>Item selected from workspace list. Click on the map to switch back to normal mouse selection behavior."));
+        }
+    }
+    else
+    {
+        slotWksItemSelectionReset();
+    }
+}
+
+void CGisWorkspace::slotWksItemSelectionReset()
+{
+    keyWksSelection.clear();
+    for(CCanvas * canvas : CMainWindow::self().getCanvas())
+    {
+        canvas->reportStatus("WksSelection", "");
+    }
+}
+
+
+IGisProject * CGisWorkspace::selectProject()
 {
     QString key, name;
     IGisProject::type_e type = IGisProject::eTypeQms;
@@ -252,7 +278,7 @@ IGisProject * CGisWidget::selectProject()
 
         QMutexLocker lock(&IGisItem::mutexItems);
         CEvtW2DCreate evt(name, type, idParent, db, host);
-        QApplication::sendEvent(treeDB, &evt);
+        CGisDatabase::self().sendEventForDb(&evt);
 
         if(evt.idChild)
         {
@@ -286,9 +312,10 @@ IGisProject * CGisWidget::selectProject()
     return project;
 }
 
-void CGisWidget::getItemsByPos(const QPointF& pos, QList<IGisItem*>& items)
+void CGisWorkspace::getItemsByPos(const QPointF& pos, QList<IGisItem*>& items)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
+
     for(int i = 0; i < treeWks->topLevelItemCount(); i++)
     {
         QTreeWidgetItem * item = treeWks->topLevelItem(i);
@@ -305,9 +332,28 @@ void CGisWidget::getItemsByPos(const QPointF& pos, QList<IGisItem*>& items)
             continue;
         }
     }
+
+    /*
+        If there is an item selected by the workspace limit
+        the list of items to this item. But only if the item
+        is part of the items close to position.
+     */
+    if(!keyWksSelection.item.isEmpty() && !items.isEmpty())
+    {
+        IGisItem * item = getItemByKey(keyWksSelection);
+        if(item && items.contains(item))
+        {
+            items.clear();
+            items << item;
+        }
+        else
+        {
+            items.clear();
+        }
+    }
 }
 
-void CGisWidget::getItemsByKeys(const QList<IGisItem::key_t>& keys, QList<IGisItem*>& items)
+void CGisWorkspace::getItemsByKeys(const QList<IGisItem::key_t>& keys, QList<IGisItem*>& items)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
     for(int i = 0; i < treeWks->topLevelItemCount(); i++)
@@ -328,7 +374,7 @@ void CGisWidget::getItemsByKeys(const QList<IGisItem::key_t>& keys, QList<IGisIt
     }
 }
 
-void CGisWidget::getItemsByArea(const QRectF& area, IGisItem::selflags_t flags, QList<IGisItem *> &items)
+void CGisWorkspace::getItemsByArea(const QRectF& area, IGisItem::selflags_t flags, QList<IGisItem *> &items)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
     for(int i = 0; i < treeWks->topLevelItemCount(); i++)
@@ -349,7 +395,28 @@ void CGisWidget::getItemsByArea(const QRectF& area, IGisItem::selflags_t flags,
     }
 }
 
-void CGisWidget::mouseMove(const QPointF& pos)
+void CGisWorkspace::getNogoAreas(QVector<IRouter::circle_t> &areas)
+{
+    QMutexLocker lock(&IGisItem::mutexItems);
+    for(int i = 0; i < treeWks->topLevelItemCount(); i++)
+    {
+        QTreeWidgetItem * item = treeWks->topLevelItem(i);
+        IGisProject * project = dynamic_cast<IGisProject*>(item);
+        if(project)
+        {
+            project->getNogoAreas(areas);
+            continue;
+        }
+        IDevice * device = dynamic_cast<IDevice*>(item);
+        if(device)
+        {
+            device->getNogoAreas(areas);
+            continue;
+        }
+    }
+}
+
+void CGisWorkspace::mouseMove(const QPointF& pos)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
     for(int i = 0; i < treeWks->topLevelItemCount(); i++)
@@ -364,7 +431,7 @@ void CGisWidget::mouseMove(const QPointF& pos)
     }
 }
 
-IGisItem * CGisWidget::getItemByKey(const IGisItem::key_t& key)
+IGisItem * CGisWorkspace::getItemByKey(const IGisItem::key_t& key)
 {
     IGisItem *item = nullptr;
     QMutexLocker lock(&IGisItem::mutexItems);
@@ -407,7 +474,7 @@ IGisItem * CGisWidget::getItemByKey(const IGisItem::key_t& key)
     return item;
 }
 
-void CGisWidget::delItemByKey(const IGisItem::key_t& key)
+void CGisWorkspace::delItemByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
     QMessageBox::StandardButtons last = QMessageBox::NoButton;
@@ -439,7 +506,7 @@ void CGisWidget::delItemByKey(const IGisItem::key_t& key)
     emit sigChanged();
 }
 
-void CGisWidget::delItemsByKey(const QList<IGisItem::key_t> &keys)
+void CGisWorkspace::delItemsByKey(const QList<IGisItem::key_t> &keys)
 {
     QMessageBox::StandardButtons last   = QMessageBox::NoButton;
 
@@ -496,7 +563,7 @@ void CGisWidget::delItemsByKey(const QList<IGisItem::key_t> &keys)
     CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
-void CGisWidget::editItemByKey(const IGisItem::key_t& key)
+void CGisWorkspace::editItemByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
     for(int i = 0; i < treeWks->topLevelItemCount(); i++)
@@ -519,7 +586,7 @@ void CGisWidget::editItemByKey(const IGisItem::key_t& key)
     emit sigChanged();
 }
 
-void CGisWidget::copyItemByKey(const IGisItem::key_t &key)
+void CGisWorkspace::copyItemByKey(const IGisItem::key_t &key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -542,7 +609,7 @@ void CGisWidget::copyItemByKey(const IGisItem::key_t &key)
     emit sigChanged();
 }
 
-void CGisWidget::copyItemsByKey(const QList<IGisItem::key_t> &keys)
+void CGisWorkspace::copyItemsByKey(const QList<IGisItem::key_t> &keys)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -571,7 +638,7 @@ void CGisWidget::copyItemsByKey(const QList<IGisItem::key_t> &keys)
     CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
-void CGisWidget::changeWptSymByKey(const QList<IGisItem::key_t>& keys, const QString& sym)
+void CGisWorkspace::changeWptSymByKey(const QList<IGisItem::key_t>& keys, const QString& sym)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -591,7 +658,7 @@ void CGisWidget::changeWptSymByKey(const QList<IGisItem::key_t>& keys, const QSt
 }
 
 
-void CGisWidget::projWptByKey(const IGisItem::key_t& key)
+void CGisWorkspace::projWptByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -606,7 +673,7 @@ void CGisWidget::projWptByKey(const IGisItem::key_t& key)
     emit sigChanged();
 }
 
-void CGisWidget::moveWptByKey(const IGisItem::key_t& key)
+void CGisWorkspace::moveWptByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
     CGisItemWpt *wpt = dynamic_cast<CGisItemWpt*>(getItemByKey(key));
@@ -625,7 +692,7 @@ void CGisWidget::moveWptByKey(const IGisItem::key_t& key)
     }
 }
 
-void CGisWidget::toggleWptBubble(const IGisItem::key_t &key)
+void CGisWorkspace::toggleWptBubble(const IGisItem::key_t &key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
     CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(getItemByKey(key));
@@ -635,7 +702,46 @@ void CGisWidget::toggleWptBubble(const IGisItem::key_t &key)
     }
 }
 
-void CGisWidget::addWptByPos(QPointF pt, const QString& label, const QString& desc) const
+void CGisWorkspace::deleteWptRadius(const IGisItem::key_t &key)
+{
+    IGisItem * item = getItemByKey(key);
+    if(nullptr != item)
+    {
+        CGisItemWpt * wpt = dynamic_cast<CGisItemWpt *>(item);
+        wpt->setProximity(NOFLOAT);
+    }
+}
+
+void CGisWorkspace::toggleWptNogoArea(const IGisItem::key_t &key)
+{
+    QMutexLocker lock(&IGisItem::mutexItems);
+    CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(getItemByKey(key));
+    if(nullptr != wpt)
+    {
+        wpt->toggleNogoArea();
+    }
+}
+
+void CGisWorkspace::editWptRadius(const IGisItem::key_t &key)
+{
+    QMutexLocker lock(&IGisItem::mutexItems);
+    CGisItemWpt *wpt = dynamic_cast<CGisItemWpt*>(getItemByKey(key));
+    if(nullptr != wpt)
+    {
+        if(!wpt->setReadOnlyMode(false))
+        {
+            return;
+        }
+
+        CCanvas *canvas = CMainWindow::self().getVisibleCanvas();
+        if(nullptr != canvas)
+        {
+            canvas->setMouseRadiusWpt(*wpt);
+        }
+    }
+}
+
+void CGisWorkspace::addWptByPos(QPointF pt, const QString& label, const QString& desc) const
 {
     QString name = label;
     QString icon;
@@ -644,7 +750,7 @@ void CGisWidget::addWptByPos(QPointF pt, const QString& label, const QString& de
         return;
     }
 
-    IGisProject * project = CGisWidget::self().selectProject();
+    IGisProject * project = CGisWorkspace::self().selectProject();
     if(nullptr == project)
     {
         return;
@@ -659,7 +765,7 @@ void CGisWidget::addWptByPos(QPointF pt, const QString& label, const QString& de
     wpt->edit();
 }
 
-void CGisWidget::focusTrkByKey(bool yes, const IGisItem::key_t& key)
+void CGisWorkspace::focusTrkByKey(bool yes, const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -672,7 +778,7 @@ void CGisWidget::focusTrkByKey(bool yes, const IGisItem::key_t& key)
     emit sigChanged();
 }
 
-void CGisWidget::focusRteByKey(bool yes, const IGisItem::key_t &key)
+void CGisWorkspace::focusRteByKey(bool yes, const IGisItem::key_t &key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -685,7 +791,7 @@ void CGisWidget::focusRteByKey(bool yes, const IGisItem::key_t &key)
     emit sigChanged();
 }
 
-void CGisWidget::convertRouteToTrack(const IGisItem::key_t &key)
+void CGisWorkspace::convertRouteToTrack(const IGisItem::key_t &key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
     CGisItemRte * rte = dynamic_cast<CGisItemRte*>(getItemByKey(key));
@@ -697,7 +803,7 @@ void CGisWidget::convertRouteToTrack(const IGisItem::key_t &key)
     emit sigChanged();
 }
 
-void CGisWidget::cutTrkByKey(const IGisItem::key_t& key)
+void CGisWorkspace::cutTrkByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -714,7 +820,7 @@ void CGisWidget::cutTrkByKey(const IGisItem::key_t& key)
     emit sigChanged();
 }
 
-void CGisWidget::reverseTrkByKey(const IGisItem::key_t& key)
+void CGisWorkspace::reverseTrkByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -727,7 +833,7 @@ void CGisWidget::reverseTrkByKey(const IGisItem::key_t& key)
     emit sigChanged();
 }
 
-void CGisWidget::combineTrkByKey(const IGisItem::key_t& keyTrk)
+void CGisWorkspace::combineTrkByKey(const IGisItem::key_t& keyTrk)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -763,7 +869,7 @@ void CGisWidget::combineTrkByKey(const IGisItem::key_t& keyTrk)
     combineTrkByKey(keys, {keyTrk});
 }
 
-void CGisWidget::combineTrkByKey(const QList<IGisItem::key_t>& keys, const QList<IGisItem::key_t>& keysPreSel)
+void CGisWorkspace::combineTrkByKey(const QList<IGisItem::key_t>& keys, const QList<IGisItem::key_t>& keysPreSel)
 {
     if(keys.isEmpty())
     {
@@ -778,7 +884,7 @@ void CGisWidget::combineTrkByKey(const QList<IGisItem::key_t>& keys, const QList
     emit sigChanged();
 }
 
-void CGisWidget::activityTrkByKey(const QList<IGisItem::key_t>& keys)
+void CGisWorkspace::activityTrkByKey(const QList<IGisItem::key_t>& keys)
 {
     if(keys.isEmpty())
     {
@@ -800,7 +906,7 @@ void CGisWidget::activityTrkByKey(const QList<IGisItem::key_t>& keys)
     }
 }
 
-void CGisWidget::editTrkByKey(const IGisItem::key_t& key)
+void CGisWorkspace::editTrkByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -820,7 +926,7 @@ void CGisWidget::editTrkByKey(const IGisItem::key_t& key)
     }
 }
 
-void CGisWidget::rangeTrkByKey(const IGisItem::key_t& key)
+void CGisWorkspace::rangeTrkByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -835,11 +941,11 @@ void CGisWidget::rangeTrkByKey(const IGisItem::key_t& key)
     }
 }
 
-void CGisWidget::copyTrkWithWptByKey(const IGisItem::key_t &key)
+void CGisWorkspace::copyTrkWithWptByKey(const IGisItem::key_t &key)
 {
     QList<IGisItem::key_t> keys;
 
-    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
     if(nullptr != trk)
     {
         keys << key;
@@ -859,7 +965,7 @@ void CGisWidget::copyTrkWithWptByKey(const IGisItem::key_t &key)
     }
 }
 
-void CGisWidget::editRteByKey(const IGisItem::key_t& key)
+void CGisWorkspace::editRteByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -879,7 +985,7 @@ void CGisWidget::editRteByKey(const IGisItem::key_t& key)
     }
 }
 
-void CGisWidget::calcRteByKey(const IGisItem::key_t& key)
+void CGisWorkspace::calcRteByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -890,7 +996,7 @@ void CGisWidget::calcRteByKey(const IGisItem::key_t& key)
     }
 }
 
-void CGisWidget::resetRteByKey(const IGisItem::key_t& key)
+void CGisWorkspace::resetRteByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -902,7 +1008,7 @@ void CGisWidget::resetRteByKey(const IGisItem::key_t& key)
 }
 
 
-void CGisWidget::editAreaByKey(const IGisItem::key_t& key)
+void CGisWorkspace::editAreaByKey(const IGisItem::key_t& key)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -922,7 +1028,7 @@ void CGisWidget::editAreaByKey(const IGisItem::key_t& key)
     }
 }
 
-void CGisWidget::makeRteFromWpt(const QList<IGisItem::key_t>& keys)
+void CGisWorkspace::makeRteFromWpt(const QList<IGisItem::key_t>& keys)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
@@ -931,7 +1037,7 @@ void CGisWidget::makeRteFromWpt(const QList<IGisItem::key_t>& keys)
 }
 
 
-void CGisWidget::draw(QPainter& p, const QPolygonF& viewport, CGisDraw * gis)
+void CGisWorkspace::draw(QPainter& p, const QPolygonF& viewport, CGisDraw * gis)
 {
     QFontMetricsF fm(CMainWindow::self().getMapFont());
     QList<QRectF> blockedAreas;
@@ -986,7 +1092,7 @@ void CGisWidget::draw(QPainter& p, const QPolygonF& viewport, CGisDraw * gis)
     }
 }
 
-void CGisWidget::fastDraw(QPainter& p, const QRectF& viewport, CGisDraw *gis)
+void CGisWorkspace::fastDraw(QPainter& p, const QRectF& viewport, CGisDraw *gis)
 {
     /*
         Mutex locking will make map moving very slow if there are many GIS items
@@ -1010,6 +1116,13 @@ void CGisWidget::fastDraw(QPainter& p, const QRectF& viewport, CGisDraw *gis)
             continue;
         }
     }
+
+
+    IGisItem * item = getItemByKey(keyWksSelection);
+    if(item != nullptr)
+    {
+        item->drawHighlight(p);
+    }
 }
 
 
diff --git a/src/gis/CGisWidget.h b/src/gis/CGisWorkspace.h
similarity index 91%
rename from src/gis/CGisWidget.h
rename to src/gis/CGisWorkspace.h
index 154f3b3..9931a42 100644
--- a/src/gis/CGisWidget.h
+++ b/src/gis/CGisWorkspace.h
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -16,16 +17,17 @@
 
 **********************************************************************************************/
 
-#ifndef CGISWIDGET_H
-#define CGISWIDGET_H
+#ifndef CGISWORKSPACE_H
+#define CGISWORKSPACE_H
 
-#include "ui_IGisWidget.h"
+#include "ui_IGisWorkspace.h"
 #include <QEvent>
 #include <QSqlDatabase>
 #include <QWidget>
 
 #include "db/IDBFolder.h"
 #include "gis/IGisItem.h"
+#include "gis/rte/router/IRouter.h"
 
 class CGisDraw;
 class IGisProject;
@@ -219,15 +221,15 @@ public:
 };
 
 
-class CGisWidget : public QWidget, private Ui::IGisWidget
+class CGisWorkspace : public QWidget, private Ui::IGisWorkspace
 {
     Q_OBJECT
 public:
-    static CGisWidget& self()
+    static CGisWorkspace& self()
     {
         return *pSelf;
     }
-    virtual ~CGisWidget();
+    virtual ~CGisWorkspace();
 
     void loadGisProject(const QString& filename);
     /**
@@ -289,6 +291,8 @@ public:
     IGisItem * getItemByKey(const IGisItem::key_t &key);
 
     void getItemsByKeys(const QList<IGisItem::key_t>& keys, QList<IGisItem*>& items);
+
+    void getNogoAreas(QVector<IRouter::circle_t> &areas);
     /**
        @brief Delete all items with matching key from workspace
 
@@ -336,6 +340,12 @@ public:
 
     void toggleWptBubble(const IGisItem::key_t &key);
 
+    void deleteWptRadius(const IGisItem::key_t &key);
+
+    void toggleWptNogoArea(const IGisItem::key_t &key);
+
+    void editWptRadius(const IGisItem::key_t &key);
+
     /**
        @brief Set user focus to track
        @param yes       true if focus is set
@@ -399,7 +409,6 @@ public:
     IGisProject * selectProject();
 
     void postEventForWks(QEvent * event);
-    void postEventForDb(QEvent * event);
 
     void setOpacity(qreal val);
 
@@ -410,20 +419,30 @@ signals:
 
 public slots:
     void slotSaveAll();
+    void slotWksItemSelectionReset();
 
 private slots:
-    void slotHelpText();
     void slotSetGisLayerOpacity(int val);
     void slotFilter(const QString& str);
     void slotSetupFilter();
 
+    void slotWksItemSelectionChanged();
+    void slotWksItemPressed(QTreeWidgetItem * item);
+
 
 private:
     friend class CMainWindow;
-    CGisWidget(QMenu * menuProject, QWidget * parent);
+    CGisWorkspace(QMenu * menuProject, QWidget * parent);
+
+    static CGisWorkspace * pSelf;
 
-    static CGisWidget * pSelf;
+    /**
+        The item key of last item pressed in the workspace list.
+        The key will be reset by getItemsByPos() which is used by
+        the mouse object to find items close by for highlight.
+     */
+    IGisItem::key_t keyWksSelection;
 };
 
-#endif //CGISWIDGET_H
+#endif //CGISWORKSPACE_H
 
diff --git a/src/gis/CSetupFilter.cpp b/src/gis/CSetupFilter.cpp
index 9cdaa3d..6a05d26 100644
--- a/src/gis/CSetupFilter.cpp
+++ b/src/gis/CSetupFilter.cpp
@@ -16,13 +16,13 @@
 
 **********************************************************************************************/
 
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/CSetupFilter.h"
 #include "gis/prj/IGisProject.h"
 
-CSetupFilter::CSetupFilter(CGisWidget *parent)
+CSetupFilter::CSetupFilter(CGisWorkspace *parent)
     : QWidget(parent)
-    , gisWidget(parent)
+    , widgetGisWorkspace(parent)
 {
     setupUi(this);
 
@@ -45,7 +45,7 @@ CSetupFilter::CSetupFilter(CGisWidget *parent)
 void CSetupFilter::slotSelect()
 {
     IGisProject::filterMode = radioName->isChecked() ? IGisProject::eFilterModeName : IGisProject::eFilterModeText;
-    gisWidget->applyFilter();
+    widgetGisWorkspace->applyFilter();
     deleteLater();
 }
 
diff --git a/src/gis/CSetupFilter.h b/src/gis/CSetupFilter.h
index 5f07bb1..e6bbec3 100644
--- a/src/gis/CSetupFilter.h
+++ b/src/gis/CSetupFilter.h
@@ -22,20 +22,20 @@
 #include "ui_ISetupFilter.h"
 #include <QWidget>
 
-class CGisWidget;
+class CGisWorkspace;
 
 class CSetupFilter : public QWidget, private Ui::ISetupFilter
 {
     Q_OBJECT
 public:
-    CSetupFilter(CGisWidget *parent);
+    CSetupFilter(CGisWorkspace *parent);
     virtual ~CSetupFilter() = default;
 
 private slots:
     void slotSelect();
 
 private:
-    CGisWidget * gisWidget;
+    CGisWorkspace * widgetGisWorkspace;
 };
 
 #endif //CSETUPFILTER_H
diff --git a/src/gis/IGisDatabase.ui b/src/gis/IGisDatabase.ui
new file mode 100644
index 0000000..85af5ab
--- /dev/null
+++ b/src/gis/IGisDatabase.ui
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>IGisDatabase</class>
+ <widget class="QWidget" name="IGisDatabase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>345</width>
+    <height>297</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="CGisListDB" name="treeDB">
+     <property name="contextMenuPolicy">
+      <enum>Qt::CustomContextMenu</enum>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+     <property name="indentation">
+      <number>10</number>
+     </property>
+     <column>
+      <property name="text">
+       <string notr="true">-</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Name</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Age</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="frameHelp">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QLabel" name="labelHelp1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="pixmap">
+         <pixmap resource="../resources.qrc">:/icons/48x48/Help.png</pixmap>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="labelHelp2">
+        <property name="text">
+         <string>To add a database do a right click on the database list above.</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CGisListDB</class>
+   <extends>QTreeWidget</extends>
+   <header>gis/CGisListDB.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/gis/IGisItem.cpp b/src/gis/IGisItem.cpp
index 737e910..ec1748c 100644
--- a/src/gis/IGisItem.cpp
+++ b/src/gis/IGisItem.cpp
@@ -22,7 +22,7 @@
 #include "device/IDevice.h"
 #include "gis/CGisDraw.h"
 #include "gis/CGisListWks.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/IGisItem.h"
 #include "gis/db/macros.h"
 #include "gis/ovl/CGisItemOvlArea.h"
@@ -31,6 +31,7 @@
 #include "gis/trk/CGisItemTrk.h"
 #include "gis/wpt/CGisItemWpt.h"
 #include "helpers/CDraw.h"
+#include "helpers/CSettings.h"
 #include "units/IUnit.h"
 
 #include <QtSql>
@@ -523,16 +524,28 @@ bool IGisItem::setReadOnlyMode(bool readOnly)
     // warn if item is external and read only
     if(!(flags & (eFlagCreatedInQms|eFlagTainted)))
     {
-        if(isReadOnly() && !readOnly)
+        SETTINGS;
+        bool doNotAsk = cfg.value("Dialog/Items/ReadOnly/doNotAsk", false).toBool();
+
+        if(isReadOnly() && !readOnly && !doNotAsk)
         {
             CCanvas::setOverrideCursor(Qt::ArrowCursor, "setReadOnlyMode");
-            QString str = tr("<h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.").arg(getName());
-            int res = QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("Read Only Mode..."), str, QMessageBox::Ok|QMessageBox::Abort, QMessageBox::Ok);
+
+            QCheckBox * checkBox = new QCheckBox(tr("Never ask again."), 0);
+            QString msg = tr("<h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.").arg(getName());
+            QMessageBox box(QMessageBox::Warning, tr("Read Only Mode..."), msg, QMessageBox::Ok|QMessageBox::Abort, CMainWindow::getBestWidgetForParent());
+            box.setDefaultButton(QMessageBox::Ok);
+            box.setCheckBox(checkBox);
+            int res = box.exec();
+
             CCanvas::restoreOverrideCursor("setReadOnlyMode");
+
             if(res != QMessageBox::Ok)
             {
                 return false;
             }
+
+            cfg.setValue("Dialog/Items/ReadOnly/doNotAsk", checkBox->isChecked());
         }
     }
 
@@ -794,7 +807,7 @@ bool IGisItem::isVisible(const QRectF &rect, const QPolygonF& viewport, CGisDraw
     QPolygonF tmp2 = viewport;
     gis->convertRad2Px(tmp2);
 
-    return tmp2.boundingRect().intersects(tmp2.boundingRect());
+    return tmp2.boundingRect().intersects(tmp1.boundingRect());
 }
 
 bool IGisItem::isVisible(const QPointF& point, const QPolygonF& viewport, CGisDraw * gis)
@@ -815,6 +828,11 @@ bool IGisItem::isChanged() const
 
 bool IGisItem::isWithin(const QRectF& area, selflags_t flags, const QPolygonF& points)
 {
+    if(points.isEmpty())
+    {
+        return false;
+    }
+
     if(flags & eSelectionExact)
     {
         for(const QPointF &point : points)
@@ -849,7 +867,7 @@ bool IGisItem::getNameAndProject(QString &name, IGisProject *&project, const QSt
         return false;
     }
 
-    project = CGisWidget::self().selectProject();
+    project = CGisWorkspace::self().selectProject();
     return nullptr != project;
 }
 
diff --git a/src/gis/IGisItem.h b/src/gis/IGisItem.h
index 6e109af..0d8c797 100644
--- a/src/gis/IGisItem.h
+++ b/src/gis/IGisItem.h
@@ -261,7 +261,7 @@ public:
        @brief Get a short string with the items properties to be displayed in tool tips or similar
 
        @param showName          set true if the first line should be the item's name
-       @apram showFullText      set false to get a 200 characters limited info text
+       @param features          a combination of features_e types
 
        @return A string object.
      */
@@ -480,7 +480,7 @@ public:
        @param desc          the description string
        @param links         a list of links
        @param key           some key to be sent with the header links
-       @return The formated text ready to be used.
+       @return The formatted text ready to be used.
      */
     static QString createText(bool isReadOnly, const QString& cmt, const QString& desc, const QList<link_t>& links, const QString& key = "");
     /**
@@ -595,6 +595,7 @@ protected:
         ,eFlagWriteAllowed  = 0x00000002
         ,eFlagTainted       = 0x00000004
         ,eFlagWptBubble     = 0x00000100
+        ,eFlagWptNogo      = 0x00000200
     };
 
     static inline bool isBlocked(const QRectF& rect, const QList<QRectF> &blockedAreas)
diff --git a/src/gis/IGisWidget.ui b/src/gis/IGisWorkspace.ui
similarity index 63%
rename from src/gis/IGisWidget.ui
rename to src/gis/IGisWorkspace.ui
index be88215..2de5785 100644
--- a/src/gis/IGisWidget.ui
+++ b/src/gis/IGisWorkspace.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>IGisWidget</class>
- <widget class="QWidget" name="IGisWidget">
+ <class>IGisWorkspace</class>
+ <widget class="QWidget" name="IGisWorkspace">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -117,89 +117,13 @@
        </property>
       </column>
      </widget>
-     <widget class="CGisListDB" name="treeDB">
-      <property name="contextMenuPolicy">
-       <enum>Qt::CustomContextMenu</enum>
-      </property>
-      <property name="selectionMode">
-       <enum>QAbstractItemView::ExtendedSelection</enum>
-      </property>
-      <property name="selectionBehavior">
-       <enum>QAbstractItemView::SelectRows</enum>
-      </property>
-      <property name="iconSize">
-       <size>
-        <width>20</width>
-        <height>20</height>
-       </size>
-      </property>
-      <property name="indentation">
-       <number>10</number>
-      </property>
-      <column>
-       <property name="text">
-        <string notr="true">-</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Name</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string>Age</string>
-       </property>
-      </column>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="frameHelp">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <widget class="QLabel" name="label_2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="../resources.qrc">:/icons/48x48/Help.png</pixmap>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>To add a database do a right click on the database list above.</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
   </layout>
   <action name="actionClearFilter">
    <property name="icon">
     <iconset resource="../resources.qrc">
-     <normaloff>:/icons/32x32/Zoom.png</normaloff>:/icons/32x32/Zoom.png</iconset>
+     <normaloff>:/icons/32x32/Filter.png</normaloff>:/icons/32x32/Filter.png</iconset>
    </property>
    <property name="text">
     <string>Clear Filter</string>
@@ -221,11 +145,6 @@
    <extends>QTreeWidget</extends>
    <header>gis/CGisListWks.h</header>
   </customwidget>
-  <customwidget>
-   <class>CGisListDB</class>
-   <extends>QTreeWidget</extends>
-   <header>gis/CGisListDB.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../resources.qrc"/>
diff --git a/src/gis/db/CDBFolderLostFound.cpp b/src/gis/db/CDBFolderLostFound.cpp
index cac8c2a..0bb6e1b 100644
--- a/src/gis/db/CDBFolderLostFound.cpp
+++ b/src/gis/db/CDBFolderLostFound.cpp
@@ -17,7 +17,7 @@
 **********************************************************************************************/
 
 #include "gis/CGisListDB.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/db/CDBFolderLostFound.h"
 #include "gis/db/CDBItem.h"
 #include "gis/db/macros.h"
@@ -32,7 +32,7 @@ CDBFolderLostFound::CDBFolderLostFound(QSqlDatabase& db, QTreeWidgetItem *parent
 
     setCheckState(CGisListDB::eColumnCheckbox, Qt::Unchecked);
     CEvtD2WReqInfo * evt = new CEvtD2WReqInfo(getId(), getDBName());
-    CGisWidget::self().postEventForWks(evt);
+    CGisWorkspace::self().postEventForWks(evt);
 }
 
 CDBFolderLostFound::~CDBFolderLostFound()
@@ -66,7 +66,7 @@ void CDBFolderLostFound::setupFromDB()
     }
 
     CEvtD2WUpdateLnF * evt = new CEvtD2WUpdateLnF(getId(), getDBName());
-    CGisWidget::self().postEventForWks(evt);
+    CGisWorkspace::self().postEventForWks(evt);
 }
 
 void CDBFolderLostFound::update(CEvtW2DAckInfo * info)
@@ -114,7 +114,7 @@ bool CDBFolderLostFound::delItem(CDBItem * item)
     {
         CEvtD2WHideItems * evt = new CEvtD2WHideItems(getId(), getDBName());
         evt->keys << item->getKey();
-        CGisWidget::self().postEventForWks(evt);
+        CGisWorkspace::self().postEventForWks(evt);
     }
 
     query.prepare("DELETE FROM items WHERE id=:id AND id NOT IN (SELECT child from folder2item)");
diff --git a/src/gis/db/CDBItem.cpp b/src/gis/db/CDBItem.cpp
index 47f34f1..6c130c2 100644
--- a/src/gis/db/CDBItem.cpp
+++ b/src/gis/db/CDBItem.cpp
@@ -17,7 +17,7 @@
 **********************************************************************************************/
 
 #include "gis/CGisListDB.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/db/CDBItem.h"
 #include "gis/db/IDBFolder.h"
 #include "gis/db/macros.h"
@@ -114,19 +114,19 @@ void CDBItem::toggle()
     {
         // make sure the project is shown on the workspace
         CEvtD2WShowFolder * evt1 = new CEvtD2WShowFolder(folder->getId(), folder->getDBName());
-        CGisWidget::self().postEventForWks(evt1);
+        CGisWorkspace::self().postEventForWks(evt1);
 
         // tell the project to load the item from the database
         CEvtD2WShowItems * evt2 = new CEvtD2WShowItems(folder->getId(), folder->getDBName());
         evt2->items << evt_item_t(id, type);
-        CGisWidget::self().postEventForWks(evt2);
+        CGisWorkspace::self().postEventForWks(evt2);
     }
     else
     {
         // tell the project to remove the item
         CEvtD2WHideItems * evt2 = new CEvtD2WHideItems(folder->getId(), folder->getDBName());
         evt2->keys << key;
-        CGisWidget::self().postEventForWks(evt2);
+        CGisWorkspace::self().postEventForWks(evt2);
     }
 }
 
@@ -142,7 +142,7 @@ void CDBItem::remove()
     {
         CEvtD2WHideItems * evt = new CEvtD2WHideItems(folder->getId(), folder->getDBName());
         evt->keys << key;
-        CGisWidget::self().postEventForWks(evt);
+        CGisWorkspace::self().postEventForWks(evt);
     }
 
     QSqlQuery query(db);
diff --git a/src/gis/db/CDBProject.cpp b/src/gis/db/CDBProject.cpp
index 108d154..0262b34 100644
--- a/src/gis/db/CDBProject.cpp
+++ b/src/gis/db/CDBProject.cpp
@@ -17,7 +17,8 @@
 **********************************************************************************************/
 
 #include "CMainWindow.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisDatabase.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/db/CDBProject.h"
 #include "gis/db/CSelectSaveAction.h"
 #include "gis/db/IDB.h"
@@ -161,7 +162,7 @@ CDBProject::CDBProject(const QString& filename, IDBFolder * parentFolder, CGisLi
 CDBProject::~CDBProject()
 {
     CEvtW2DAckInfo * info = new CEvtW2DAckInfo(Qt::Unchecked, getId(), getDBName(), getDBHost());
-    CGisWidget::self().postEventForDb(info);
+    CGisDatabase::self().postEventForDb(info);
 }
 
 void CDBProject::restoreDBLink()
@@ -250,7 +251,7 @@ void CDBProject::postStatus(bool updateLostFound)
         setText(CGisListWks::eColumnDecoration,autoSave ? "A" : "");
     }
 
-    CGisWidget::self().postEventForDb(info);
+    CGisDatabase::self().postEventForDb(info);
 }
 
 
@@ -816,7 +817,7 @@ void CDBProject::update()
             evt->items << evt_item_t(query.value(0).toULongLong(), query.value(1).toUInt());
         }
 
-        CGisWidget::self().postEventForWks(evt);
+        CGisWorkspace::self().postEventForWks(evt);
     }
     else
     {
diff --git a/src/gis/db/CExportDatabaseThread.cpp b/src/gis/db/CExportDatabaseThread.cpp
index e36cda7..64b78fc 100644
--- a/src/gis/db/CExportDatabaseThread.cpp
+++ b/src/gis/db/CExportDatabaseThread.cpp
@@ -17,7 +17,7 @@
 **********************************************************************************************/
 
 #include "CMainWindow.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/db/CDBProject.h"
 #include "gis/db/CExportDatabaseThread.h"
 #include "gis/db/IDBFolder.h"
diff --git a/src/gis/db/CSearchDatabase.cpp b/src/gis/db/CSearchDatabase.cpp
index 15c374c..5815019 100644
--- a/src/gis/db/CSearchDatabase.cpp
+++ b/src/gis/db/CSearchDatabase.cpp
@@ -17,7 +17,7 @@
 **********************************************************************************************/
 
 #include "gis/CGisListDB.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/db/CDBFolderGroup.h"
 #include "gis/db/CDBFolderOther.h"
 #include "gis/db/CDBFolderProject.h"
diff --git a/src/gis/db/IDBFolder.cpp b/src/gis/db/IDBFolder.cpp
index 5b2a83d..7cc8bce 100644
--- a/src/gis/db/IDBFolder.cpp
+++ b/src/gis/db/IDBFolder.cpp
@@ -18,7 +18,7 @@
 
 #include "CMainWindow.h"
 #include "gis/CGisListDB.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/IGisItem.h"
 #include "gis/db/CDBFolderGroup.h"
 #include "gis/db/CDBFolderOther.h"
@@ -189,7 +189,7 @@ void IDBFolder::expanding()
     addChildren(QSet<QString>(), false);
 
     CEvtD2WReqInfo * evt = new CEvtD2WReqInfo(getId(), getDBName());
-    CGisWidget::self().postEventForWks(evt);
+    CGisWorkspace::self().postEventForWks(evt);
 }
 
 void IDBFolder::update(CEvtW2DAckInfo * info)
@@ -354,7 +354,7 @@ void IDBFolder::toggle()
     if(checkState(CGisListDB::eColumnCheckbox) == Qt::Checked)
     {
         CEvtD2WShowFolder * evt1 = new CEvtD2WShowFolder(getId(), getDBName());
-        CGisWidget::self().postEventForWks(evt1);
+        CGisWorkspace::self().postEventForWks(evt1);
 
         QSqlQuery query(db);
         if(getId() == 0)
@@ -375,12 +375,12 @@ void IDBFolder::toggle()
         {
             evt2->items << evt_item_t(query.value(0).toULongLong(), query.value(1).toUInt());
         }
-        CGisWidget::self().postEventForWks(evt2);
+        CGisWorkspace::self().postEventForWks(evt2);
     }
     else
     {
         CEvtD2WHideFolder * evt1 = new CEvtD2WHideFolder(getId(), getDBName());
-        CGisWidget::self().postEventForWks(evt1);
+        CGisWorkspace::self().postEventForWks(evt1);
     }
 }
 
@@ -394,7 +394,7 @@ void IDBFolder::remove()
     remove(folder->getId(), getId());
 
     CEvtD2WHideFolder * evt1 = new CEvtD2WHideFolder(getId(), getDBName());
-    CGisWidget::self().postEventForWks(evt1);
+    CGisWorkspace::self().postEventForWks(evt1);
 }
 
 
@@ -427,7 +427,7 @@ void IDBFolder::setupFromDB()
     {
         setCheckState(CGisListDB::eColumnCheckbox, Qt::Unchecked);
         CEvtD2WReqInfo * evt = new CEvtD2WReqInfo(getId(), getDBName());
-        CGisWidget::self().postEventForWks(evt);
+        CGisWorkspace::self().postEventForWks(evt);
     }
 }
 
@@ -547,7 +547,7 @@ void IDBFolder::remove(quint64 idParent, quint64 idFolder)
 void IDBFolder::updateItemsOnWks()
 {
     CEvtD2WUpdateItems * evt = new CEvtD2WUpdateItems(getId(), getDBName());
-    CGisWidget::self().postEventForWks(evt);
+    CGisWorkspace::self().postEventForWks(evt);
 }
 
 void IDBFolder::setChildIndicator()
diff --git a/src/gis/gpx/serialization.cpp b/src/gis/gpx/serialization.cpp
index 92d54af..bdcb754 100644
--- a/src/gis/gpx/serialization.cpp
+++ b/src/gis/gpx/serialization.cpp
@@ -246,7 +246,7 @@ static void writeXml(QDomNode& xml, const QString& tag, const QDateTime& time)
     {
         QDomElement elem = xml.ownerDocument().createElement(tag);
         xml.appendChild(elem);
-        QDomText text = xml.ownerDocument().createTextNode(time.toString("yyyy-MM-dd'T'hh:mm:ss'Z'"));
+        QDomText text = xml.ownerDocument().createTextNode(time.toString("yyyy-MM-dd'T'hh:mm:ss.zzz'Z'"));
         elem.appendChild(text);
     }
 }
diff --git a/src/gis/ovl/CGisItemOvlArea.h b/src/gis/ovl/CGisItemOvlArea.h
index f8b1d39..3a5d8d8 100644
--- a/src/gis/ovl/CGisItemOvlArea.h
+++ b/src/gis/ovl/CGisItemOvlArea.h
@@ -41,7 +41,7 @@ public:
     CGisItemOvlArea(const QDomNode &xml, IGisProject *project);
     CGisItemOvlArea(const history_t& hist, const QString& dbHash, IGisProject * project);
     CGisItemOvlArea(quint64 id, QSqlDatabase& db, IGisProject * project);
-    CGisItemOvlArea(const IQlgtOverlay& ovl);
+    CGisItemOvlArea(const IQlgtOverlay& ovl, IGisProject *project = nullptr);
     virtual ~CGisItemOvlArea();
 
     IGisItem * createClone() override;
diff --git a/src/gis/ovl/CScrOptOvlArea.cpp b/src/gis/ovl/CScrOptOvlArea.cpp
index c9d7e8c..4fd44ec 100644
--- a/src/gis/ovl/CScrOptOvlArea.cpp
+++ b/src/gis/ovl/CScrOptOvlArea.cpp
@@ -17,7 +17,7 @@
 **********************************************************************************************/
 
 #include "CMainWindow.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/ovl/CGisItemOvlArea.h"
 #include "gis/ovl/CScrOptOvlArea.h"
 #include "helpers/CDraw.h"
@@ -58,31 +58,31 @@ CScrOptOvlArea::~CScrOptOvlArea()
 
 void CScrOptOvlArea::slotEditDetails()
 {
-    CGisWidget::self().editItemByKey(key);
+    CGisWorkspace::self().editItemByKey(key);
     deleteLater();
 }
 
 void CScrOptOvlArea::slotCopy()
 {
-    CGisWidget::self().copyItemByKey(key);
+    CGisWorkspace::self().copyItemByKey(key);
     deleteLater();
 }
 
 void CScrOptOvlArea::slotDelete()
 {
-    CGisWidget::self().delItemByKey(key);
+    CGisWorkspace::self().delItemByKey(key);
     deleteLater();
 }
 
 void CScrOptOvlArea::slotEdit()
 {
-    CGisWidget::self().editAreaByKey(key);
+    CGisWorkspace::self().editAreaByKey(key);
     deleteLater();
 }
 
 void CScrOptOvlArea::draw(QPainter& p)
 {
-    IGisItem * item = CGisWidget::self().getItemByKey(key);
+    IGisItem * item = CGisWorkspace::self().getItemByKey(key);
     if(nullptr == item)
     {
         QWidget::deleteLater();
diff --git a/src/gis/prj/CDetailsPrj.cpp b/src/gis/prj/CDetailsPrj.cpp
index 73cc756..888d09d 100644
--- a/src/gis/prj/CDetailsPrj.cpp
+++ b/src/gis/prj/CDetailsPrj.cpp
@@ -592,7 +592,7 @@ void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, Q
                 text += "<tr><td></td><td><nobr> " + tr("From Start") + " </nobr></td><td><nobr> " + tr("To Next") + " </nobr></td><td><nobr> " + tr("To End")  + " </nobr></td></tr>";
 
                 text += "<tr>";
-                text += "<td>" + tr("distance: ") + "</td>";
+                text += "<td>" + tr("Distance: ") + "</td>";
                 IUnit::self().meter2distance(info.distance1, val, unit);
                 text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
                 IUnit::self().meter2distance(info.distance2, val, unit);
@@ -602,7 +602,7 @@ void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, Q
                 text += "</tr>";
 
                 text += "<tr>";
-                text += "<td>" + tr("ascent: ") + "</td>";
+                text += "<td>" + tr("Ascent: ") + "</td>";
                 IUnit::self().meter2elevation(info.ascent1, val, unit);
                 text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
                 IUnit::self().meter2elevation(info.ascent2, val, unit);
@@ -612,7 +612,7 @@ void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, Q
                 text += "</tr>";
 
                 text += "<tr>";
-                text += "<td>" + tr("descent: ") + "</td>";
+                text += "<td>" + tr("Descent: ") + "</td>";
                 IUnit::self().meter2elevation(info.descent1, val, unit);
                 text += "<td>"+ QString("%1%2").arg(val).arg(unit) + "</td>";
                 IUnit::self().meter2elevation(info.descent2, val, unit);
diff --git a/src/gis/prj/IGisProject.cpp b/src/gis/prj/IGisProject.cpp
index e244e7e..234793f 100644
--- a/src/gis/prj/IGisProject.cpp
+++ b/src/gis/prj/IGisProject.cpp
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -20,16 +21,20 @@
 #include "device/IDevice.h"
 #include "gis/CGisDraw.h"
 #include "gis/CGisListWks.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/IGisItem.h"
 #include "gis/fit/CFitProject.h"
 #include "gis/gpx/CGpxProject.h"
 #include "gis/ovl/CGisItemOvlArea.h"
 #include "gis/prj/CDetailsPrj.h"
 #include "gis/prj/IGisProject.h"
+#include "gis/qlb/CQlbProject.h"
 #include "gis/qms/CQmsProject.h"
 #include "gis/rte/CGisItemRte.h"
+#include "gis/rte/router/IRouter.h"
 #include "gis/slf/CSlfProject.h"
+#include "gis/suunto/CLogProject.h"
+#include "gis/suunto/CSmlProject.h"
 #include "gis/tcx/CTcxProject.h"
 #include "gis/tcx/CTcxProject.h"
 #include "gis/trk/CGisItemTrk.h"
@@ -41,14 +46,17 @@
 #include <QtWidgets>
 
 
-const QString IGisProject::filedialogAllSupported = "All Supported (*.gpx *.GPX *.tcx *.TCX *.qms *.slf *.fit)";
+const QString IGisProject::filedialogAllSupported = "All Supported (*.gpx *.GPX *.tcx *.TCX *.sml *.log *.qms *.qlb *.slf *.fit)";
 const QString IGisProject::filedialogFilterGPX    = "GPS Exchange Format (*.gpx *.GPX)";
 const QString IGisProject::filedialogFilterTCX    = "TCX Garmin Proprietary (*.tcx *.TCX)";
+const QString IGisProject::filedialogFilterSML    = "Suunto XML format (*.sml)";
+const QString IGisProject::filedialogFilterLOG    = "Openambit XML format (*.log)";
+const QString IGisProject::filedialogFilterQLB    = "QLandkarte Binary (*.qlb)";
 const QString IGisProject::filedialogFilterQMS    = "QMapShack Binary (*.qms)";
 const QString IGisProject::filedialogFilterSLF    = "Sigma Log Format (*.slf)";
 const QString IGisProject::filedialogFilterFIT    = "Garmin FIT Format (*.fit)";
-const QString IGisProject::filedialogSaveFilters = filedialogFilterGPX + ";; " + filedialogFilterQMS + ";; " + filedialogFilterTCX;
-const QString IGisProject::filedialogLoadFilters = filedialogAllSupported + ";; " + filedialogFilterGPX + ";; " + filedialogFilterTCX + ";; " + filedialogFilterQMS + ";; " + filedialogFilterSLF + ";;" + filedialogFilterFIT;
+const QString IGisProject::filedialogSaveFilters = filedialogFilterGPX + ";; " + filedialogFilterQLB + ";; " + filedialogFilterQMS + ";; " + filedialogFilterTCX;
+const QString IGisProject::filedialogLoadFilters = filedialogAllSupported + ";; " + filedialogFilterGPX + ";; " + filedialogFilterTCX + ";; " + filedialogFilterSML + ";; " + filedialogFilterLOG + ";; " + filedialogFilterQLB + ";; " + filedialogFilterQMS + ";; " + filedialogFilterSLF + ";; " + filedialogFilterFIT;
 
 IGisProject::filter_mode_e IGisProject::filterMode = IGisProject::eFilterModeName;
 
@@ -130,7 +138,18 @@ IGisProject * IGisProject::create(const QString filename, CGisListWks * parent)
     {
         item = new CTcxProject(filename, parent);
     }
-
+    else if (suffix == "sml")
+    {
+        item = new CSmlProject(filename, parent);
+    }
+    else if (suffix == "log")
+    {
+        item = new CLogProject(filename, parent);
+    }
+    else if (suffix == "qlb")
+    {
+        item = new CQlbProject(filename, parent);
+    }
 
     if(item && !item->isValid())
     {
@@ -295,7 +314,7 @@ void IGisProject::setChanged()
         if(!autoSavePending)
         {
             autoSavePending = true;
-            CGisWidget::self().postEventForWks(new CEvtA2WSave(getKey()));
+            CGisWorkspace::self().postEventForWks(new CEvtA2WSave(getKey()));
         }
     }
     else
@@ -310,7 +329,7 @@ void IGisProject::setAutoSave(bool on)
     // make sure project is saved one more time to remove autoSave flag in storage
     if(!on && autoSave)
     {
-        CGisWidget::self().postEventForWks(new CEvtA2WSave(getKey()));
+        CGisWorkspace::self().postEventForWks(new CEvtA2WSave(getKey()));
     }
 
     autoSave = on;
@@ -654,6 +673,29 @@ void IGisProject::getItemsByArea(const QRectF& area, IGisItem::selflags_t flags,
     }
 }
 
+void IGisProject::getNogoAreas(QVector<IRouter::circle_t> &areas) const
+{
+    if(!isVisible())
+    {
+        return;
+    }
+
+    for(int i = 0; i < childCount(); i++)
+    {
+        CGisItemWpt * item = dynamic_cast<CGisItemWpt*>(child(i));
+        if(nullptr != item && !item->isHidden() && item->isNogoArea())
+        {
+            const qreal& rad = item->getProximity();
+            if (rad != NOFLOAT && rad > 0.)
+            {
+                const QPointF& pos = item->getPosition();
+                areas << IRouter::circle_t(pos.y(),pos.x(),rad);
+            }
+        }
+    }
+}
+
+
 void IGisProject::mouseMove(const QPointF& pos)
 {
     if(!isVisible())
@@ -1101,12 +1143,15 @@ void IGisProject::sortItems()
     addChildren(items);
 }
 
-bool sortByName(IGisItem * item1, IGisItem * item2)
+static bool sortByName(IGisItem * item1, IGisItem * item2)
 {
-    return item1->getName() < item2->getName();
+    static QCollator collator;
+    // this will set collator to natural sorting mode (instead of lexical)
+    collator.setNumericMode(true);
+    return collator.compare(item1->getName(), item2->getName()) < 0;
 }
 
-bool sortByTime(IGisItem * item1, IGisItem * item2)
+static bool sortByTime(IGisItem * item1, IGisItem * item2)
 {
     const QDateTime& t1 = item1->getTimestamp();
     const QDateTime& t2 = item2->getTimestamp();
diff --git a/src/gis/prj/IGisProject.h b/src/gis/prj/IGisProject.h
index e9ea820..fbc5b8b 100644
--- a/src/gis/prj/IGisProject.h
+++ b/src/gis/prj/IGisProject.h
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -20,6 +21,7 @@
 #define IGISPROJECT_H
 
 #include "gis/IGisItem.h"
+#include "gis/rte/router/IRouter.h"
 #include <QDebug>
 #include <QMessageBox>
 #include <QPointer>
@@ -27,6 +29,7 @@
 
 class CGisListWks;
 class CGisDraw;
+class CGisItemWpt;
 class QDataStream;
 class CDetailsPrj;
 class IDevice;
@@ -46,6 +49,9 @@ public:
         , eTypeSlf       // the Sigma Log Format
         , eTypeFit
         , eTypeTcx
+        , eTypeSml
+        , eTypeLog
+        , eTypeQlb
     };
 
     /// flags used to serialize trivial flags in qms file
@@ -110,6 +116,9 @@ public:
     static const QString filedialogAllSupported;
     static const QString filedialogFilterGPX;
     static const QString filedialogFilterTCX;
+    static const QString filedialogFilterSML;
+    static const QString filedialogFilterLOG;
+    static const QString filedialogFilterQLB;
     static const QString filedialogFilterQMS;
     static const QString filedialogFilterSLF;
     static const QString filedialogFilterFIT;
@@ -320,6 +329,7 @@ public:
 
     void getItemsByArea(const QRectF& area, IGisItem::selflags_t flags, QList<IGisItem *> &items);
 
+    void getNogoAreas(QVector<IRouter::circle_t> &areas) const;
 
     int getItemCountByType(IGisItem::type_e type) const
     {
diff --git a/src/gis/qlb/CQlbProject.cpp b/src/gis/qlb/CQlbProject.cpp
new file mode 100644
index 0000000..a377955
--- /dev/null
+++ b/src/gis/qlb/CQlbProject.cpp
@@ -0,0 +1,145 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Oliver Eichler oliver.eichler at gmx.de
+
+    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 Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "CMainWindow.h"
+#include "gis/CGisListWks.h"
+#include "gis/ovl/CGisItemOvlArea.h"
+#include "gis/qlb/CQlbProject.h"
+#include "gis/rte/CGisItemRte.h"
+#include "gis/trk/CGisItemTrk.h"
+#include "gis/wpt/CGisItemWpt.h"
+#include "qlgt/CQlb.h"
+#include "qlgt/CQlgtDiary.h"
+#include "qlgt/CQlgtRoute.h"
+#include "qlgt/CQlgtTrack.h"
+#include "qlgt/CQlgtWpt.h"
+#include "qlgt/IQlgtOverlay.h"
+
+#include <QtWidgets>
+
+CQlbProject::CQlbProject(const QString &filename, CGisListWks *parent)
+    : IGisProject(eTypeQlb, filename, parent)
+{
+    setIcon(CGisListWks::eColumnIcon,QIcon("://icons/32x32/QlbProject.png"));
+
+    // create file instance
+    QFile file(filename);
+
+    // if the file does not exist, the filename is assumed to be a name for a new project
+    if(!file.exists() || QFileInfo(filename).suffix().toLower() != "qlb")
+    {
+        IGisProject::filename.clear();
+        setupName(filename);
+        setToolTip(CGisListWks::eColumnName, getInfo());
+        valid = true;
+        return;
+    }
+
+    if(!file.open(QIODevice::ReadOnly))
+    {
+        QMessageBox::critical(CMainWindow::getBestWidgetForParent(), tr("Failed to open..."), tr("Failed to open %1").arg(filename), QMessageBox::Abort);
+        return;
+    }
+
+    load(filename);
+
+    markAsSaved();
+    setupName(QFileInfo(filename).completeBaseName().replace("_", " "));
+    setToolTip(CGisListWks::eColumnName, getInfo());
+    updateItems();
+    valid = true;
+}
+
+void CQlbProject::load(const QString& filename)
+{
+    CQlb qlb(nullptr);
+    qlb.load(filename);
+
+    loadWpts(qlb.waypoints());
+    loadTrks(qlb.tracks());
+    loadRtes(qlb.routes());
+    loadOvls(qlb.overlays());
+}
+
+void CQlbProject::loadWpts(QByteArray& array)
+{
+    QDataStream stream(&array, QIODevice::ReadOnly);
+    stream.setVersion(QDataStream::Qt_4_5);
+
+    while(!stream.atEnd())
+    {
+        CQlgtWpt wpt(0, nullptr);
+        stream >> wpt;
+        new CGisItemWpt(wpt, this);
+    }
+}
+
+void CQlbProject::loadTrks(QByteArray &array)
+{
+    QDataStream stream(&array, QIODevice::ReadOnly);
+    stream.setVersion(QDataStream::Qt_4_5);
+
+    while(!stream.atEnd())
+    {
+        CQlgtTrack trk(0, nullptr);
+        stream >> trk;
+        new CGisItemTrk(trk, this);
+    }
+}
+
+void CQlbProject::loadRtes(QByteArray &array)
+{
+    QDataStream stream(&array, QIODevice::ReadOnly);
+    stream.setVersion(QDataStream::Qt_4_5);
+
+    while(!stream.atEnd())
+    {
+        CQlgtRoute rte(0, nullptr);
+        stream >> rte;
+        new CGisItemRte(rte, this);
+    }
+}
+
+void CQlbProject::loadOvls(QByteArray &array)
+{
+    QDataStream stream(&array, QIODevice::ReadOnly);
+    stream.setVersion(QDataStream::Qt_4_5);
+
+    bool warningDone = false;
+    while(!stream.atEnd())
+    {
+        IQlgtOverlay ovl(0,nullptr);
+        stream >> ovl;
+        if(ovl.type == "Area")
+        {
+            new CGisItemOvlArea(ovl, this);
+        }
+        else if(ovl.type == "Distance")
+        {
+            new CGisItemTrk(ovl, this);
+        }
+        else if(!warningDone)
+        {
+            QMessageBox::warning(CMainWindow::self().getBestWidgetForParent(), tr("Could not convert...")
+                                 , tr("The file contains overlays that can not be converted. This is because "
+                                      "QMapShack does not support all overlay types of QLandkarte."), QMessageBox::Ok);
+            warningDone = true;
+        }
+    }
+}
+
diff --git a/src/gis/CSetupFilter.h b/src/gis/qlb/CQlbProject.h
similarity index 58%
copy from src/gis/CSetupFilter.h
copy to src/gis/qlb/CQlbProject.h
index 5f07bb1..e085cdf 100644
--- a/src/gis/CSetupFilter.h
+++ b/src/gis/qlb/CQlbProject.h
@@ -16,27 +16,35 @@
 
 **********************************************************************************************/
 
-#ifndef CSETUPFILTER_H
-#define CSETUPFILTER_H
+#ifndef CQLBPROJECT_H
+#define CQLBPROJECT_H
 
-#include "ui_ISetupFilter.h"
-#include <QWidget>
+#include "gis/prj/IGisProject.h"
 
-class CGisWidget;
-
-class CSetupFilter : public QWidget, private Ui::ISetupFilter
+class CQlbProject : public IGisProject
 {
-    Q_OBJECT
+    Q_DECLARE_TR_FUNCTIONS(CQlbProject)
 public:
-    CSetupFilter(CGisWidget *parent);
-    virtual ~CSetupFilter() = default;
+    CQlbProject(const QString& filename, CGisListWks * parent);
+    virtual ~CQlbProject() = default;
+
+    const QString getFileDialogFilter() const override
+    {
+        return IGisProject::filedialogFilterQLB;
+    }
 
-private slots:
-    void slotSelect();
+    const QString getFileExtension() const override
+    {
+        return "qlb";
+    }
 
 private:
-    CGisWidget * gisWidget;
+    void load(const QString& filename);
+    void loadWpts(QByteArray &array);
+    void loadTrks(QByteArray &array);
+    void loadRtes(QByteArray &array);
+    void loadOvls(QByteArray &array);
 };
 
-#endif //CSETUPFILTER_H
+#endif //CQLBPROJECT_H
 
diff --git a/src/gis/qms/serialization.cpp b/src/gis/qms/serialization.cpp
index 9112813..f413a28 100644
--- a/src/gis/qms/serialization.cpp
+++ b/src/gis/qms/serialization.cpp
@@ -648,6 +648,9 @@ QDataStream& CGisItemWpt::operator<<(QDataStream& stream)
     setText   (CGisListWks::eColumnName, getName());
     setToolTip(CGisListWks::eColumnName, getInfo(IGisItem::eFeatureShowName));
 
+    detBoundingRect();
+    radius = NOFLOAT;
+
     return stream;
 }
 
diff --git a/src/gis/rte/CCreateRouteFromWpt.cpp b/src/gis/rte/CCreateRouteFromWpt.cpp
index 5efe178..534dea4 100644
--- a/src/gis/rte/CCreateRouteFromWpt.cpp
+++ b/src/gis/rte/CCreateRouteFromWpt.cpp
@@ -17,8 +17,8 @@
 **********************************************************************************************/
 
 #include "CMainWindow.h"
-#include "gis/CGisWidget.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/IGisLine.h"
 #include "gis/prj/IGisProject.h"
 #include "gis/rte/CCreateRouteFromWpt.h"
@@ -36,7 +36,7 @@ CCreateRouteFromWpt::CCreateRouteFromWpt(const QList<IGisItem::key_t> &keys, QWi
 
     for(const IGisItem::key_t& key : keys)
     {
-        CGisItemWpt *wpt = dynamic_cast<CGisItemWpt*>(CGisWidget::self().getItemByKey(key));
+        CGisItemWpt *wpt = dynamic_cast<CGisItemWpt*>(CGisWorkspace::self().getItemByKey(key));
         if(nullptr == wpt)
         {
             continue;
diff --git a/src/gis/rte/CGisItemRte.cpp b/src/gis/rte/CGisItemRte.cpp
index fd3917b..8f03284 100644
--- a/src/gis/rte/CGisItemRte.cpp
+++ b/src/gis/rte/CGisItemRte.cpp
@@ -344,7 +344,7 @@ QString CGisItemRte::getInfo(quint32 feature) const
     if(rte.totalDistance != NOFLOAT)
     {
         IUnit::self().meter2distance(rte.totalDistance, val1, unit1);
-        str += tr("Length: %1 %2").arg(val1).arg(unit1);
+        str += tr("Length: %1%2").arg(val1).arg(unit1);
     }
     else
     {
@@ -355,7 +355,7 @@ QString CGisItemRte::getInfo(quint32 feature) const
     if(rte.totalTime != 0)
     {
         IUnit::self().seconds2time(rte.totalTime, val1, unit1);
-        str += tr("Time: %1 %2").arg(val1).arg(unit1);
+        str += tr("Time: %1%2").arg(val1).arg(unit1);
     }
     else
     {
@@ -597,9 +597,9 @@ void CGisItemRte::drawItem(QPainter& p, const QRectF& viewport, CGisDraw * gis)
 
         QString str, val, unit;
         IUnit::self().seconds2time((mouseMoveFocus->time.toTime_t() - startTime.toTime_t()), val, unit);
-        str += tr("Time: %1 %2").arg(val).arg(unit) + " ";
+        str += tr("Time: %1%2").arg(val).arg(unit) + " ";
         IUnit::self().meter2distance(mouseMoveFocus->distance, val, unit);
-        str += tr("Distance: %1 %2").arg(val).arg(unit);
+        str += tr("Distance: %1%2").arg(val).arg(unit);
         str += "\n" + mouseMoveFocus->instruction;
 
         // calculate bounding box of text
diff --git a/src/gis/rte/CGisItemRte.h b/src/gis/rte/CGisItemRte.h
index 12d3a31..b322d56 100644
--- a/src/gis/rte/CGisItemRte.h
+++ b/src/gis/rte/CGisItemRte.h
@@ -110,7 +110,7 @@ public:
     CGisItemRte(const CGisItemRte& parentRte, IGisProject *project, int idx, bool clone);
     CGisItemRte(const history_t& hist, const QString& dbHash, IGisProject * project);
     CGisItemRte(quint64 id, QSqlDatabase& db, IGisProject * project);
-    CGisItemRte(const CQlgtRoute& rte1);
+    CGisItemRte(const CQlgtRoute& rte1, IGisProject *project = nullptr);
     CGisItemRte(const SGisLine& l, const QString &name, IGisProject *project, int idx);
     CGisItemRte(CFitStream& stream, IGisProject * project);
     virtual ~CGisItemRte();
diff --git a/src/gis/rte/CScrOptRte.cpp b/src/gis/rte/CScrOptRte.cpp
index a805ea6..0fe9e4c 100644
--- a/src/gis/rte/CScrOptRte.cpp
+++ b/src/gis/rte/CScrOptRte.cpp
@@ -18,7 +18,7 @@
 
 #include "CMainWindow.h"
 #include "canvas/CCanvas.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/rte/CGisItemRte.h"
 #include "gis/rte/CScrOptRte.h"
 #include "helpers/CDraw.h"
@@ -73,55 +73,55 @@ CScrOptRte::~CScrOptRte()
 
 void CScrOptRte::slotEditDetails()
 {
-    CGisWidget::self().editItemByKey(key);
+    CGisWorkspace::self().editItemByKey(key);
     deleteLater();
 }
 
 void CScrOptRte::slotDelete()
 {
-    CGisWidget::self().delItemByKey(key);
+    CGisWorkspace::self().delItemByKey(key);
     deleteLater();
 }
 
 void CScrOptRte::slotCopy()
 {
-    CGisWidget::self().copyItemByKey(key);
+    CGisWorkspace::self().copyItemByKey(key);
     deleteLater();
 }
 
 void CScrOptRte::slotCalc()
 {
-    CGisWidget::self().calcRteByKey(key);
+    CGisWorkspace::self().calcRteByKey(key);
     deleteLater();
 }
 
 void CScrOptRte::slotReset()
 {
-    CGisWidget::self().resetRteByKey(key);
+    CGisWorkspace::self().resetRteByKey(key);
     deleteLater();
 }
 
 void CScrOptRte::slotEdit()
 {
-    CGisWidget::self().editRteByKey(key);
+    CGisWorkspace::self().editRteByKey(key);
     deleteLater();
 }
 
 void CScrOptRte::slotInstruction(bool on)
 {
-    CGisWidget::self().focusRteByKey(on, key);
+    CGisWorkspace::self().focusRteByKey(on, key);
     deleteLater();
 }
 
 void CScrOptRte::slotToTrack()
 {
-    CGisWidget::self().convertRouteToTrack(key);
+    CGisWorkspace::self().convertRouteToTrack(key);
     deleteLater();
 }
 
 void CScrOptRte::draw(QPainter& p)
 {
-    IGisItem *item = CGisWidget::self().getItemByKey(key);
+    IGisItem *item = CGisWorkspace::self().getItemByKey(key);
     if(nullptr == item)
     {
         QWidget::deleteLater();
diff --git a/src/gis/rte/router/CRouterBRouter.cpp b/src/gis/rte/router/CRouterBRouter.cpp
index 1fad1f2..5b25fe4 100644
--- a/src/gis/rte/router/CRouterBRouter.cpp
+++ b/src/gis/rte/router/CRouterBRouter.cpp
@@ -19,13 +19,14 @@
 
 #include "CMainWindow.h"
 #include "canvas/CCanvas.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/rte/CGisItemRte.h"
 #include "gis/rte/router/CRouterBRouter.h"
 #include "gis/rte/router/brouter/CRouterBRouterInfo.h"
 #include "gis/rte/router/brouter/CRouterBRouterSetup.h"
 #include "gis/rte/router/brouter/CRouterBRouterSetupWizard.h"
 #include "gis/rte/router/brouter/CRouterBRouterToolShell.h"
+#include "gis/wpt/CGisItemWpt.h"
 #include "helpers/CProgressDialog.h"
 #include "helpers/CSettings.h"
 #include <QtNetwork>
@@ -145,11 +146,15 @@ void CRouterBRouter::updateDialog() const
     if (setup->installMode == CRouterBRouterSetup::eModeLocal)
     {
         routerSetup->setRouterTitle(CRouterSetup::RouterBRouter,tr("BRouter (offline)"));
+        labelCopyrightBRouter->setVisible(true);
+        labelCopyrightBRouterWeb->setVisible(false);
     }
     else
     {
         Q_ASSERT(setup->installMode == CRouterBRouterSetup::eModeOnline);
         routerSetup->setRouterTitle(CRouterSetup::RouterBRouter,tr("BRouter (online)"));
+        labelCopyrightBRouter->setVisible(false);
+        labelCopyrightBRouterWeb->setVisible(true);
     }
     comboProfile->clear();
     bool hasItems = false;
@@ -187,7 +192,7 @@ bool CRouterBRouter::hasFastRouting()
     return setup->installMode == CRouterBRouterSetup::eModeLocal && checkFastRecalc->isChecked();
 }
 
-QNetworkRequest CRouterBRouter::getRequest(const QVector<wpt_t>& routePoints) const
+QNetworkRequest CRouterBRouter::getRequest(const QVector<wpt_t>& routePoints, const QVector<IRouter::circle_t>& areas) const
 {
     QString lonLats;
     bool isNext = false;
@@ -205,9 +210,25 @@ QNetworkRequest CRouterBRouter::getRequest(const QVector<wpt_t>& routePoints) co
         }
     }
 
+    QString nogos;
+    isNext = false;
+
+    for(const IRouter::circle_t &pt : areas)
+    {
+        if (isNext)
+        {
+            nogos.append(QString("|%1,%2,%3").arg(pt.lon).arg(pt.lat).arg(pt.rad));
+        }
+        else
+        {
+            nogos = QString("%1,%2,%3").arg(pt.lon).arg(pt.lat).arg(pt.rad);
+            isNext = true;
+        }
+    }
+
     QUrlQuery urlQuery;
     urlQuery.addQueryItem("lonlats",lonLats.toLatin1());
-    urlQuery.addQueryItem("nogos", "");
+    urlQuery.addQueryItem("nogos", nogos.toLatin1());
     urlQuery.addQueryItem("profile", comboProfile->currentData().toString());
     urlQuery.addQueryItem("alternativeidx", comboAlternative->currentData().toString());
     urlQuery.addQueryItem("format", "gpx");
@@ -234,9 +255,12 @@ int CRouterBRouter::calcRoute(const QPointF& p1, const QPointF& p2, QPolygonF& c
     points << wpt_t(p1.y()*RAD_TO_DEG,p1.x()*RAD_TO_DEG);
     points << wpt_t(p2.y()*RAD_TO_DEG,p2.x()*RAD_TO_DEG);
 
+    QVector<IRouter::circle_t> areas;
+    CGisWorkspace::self().getNogoAreas(areas);
+
     synchronous = true;
 
-    QNetworkReply * reply = networkAccessManager->get(getRequest(points));
+    QNetworkReply * reply = networkAccessManager->get(getRequest(points,areas));
 
     try
     {
@@ -248,11 +272,17 @@ int CRouterBRouter::calcRoute(const QPointF& p1, const QPointF& p2, QPolygonF& c
         QEventLoop eventLoop;
         connect(progress, &CProgressDialog::rejected, reply, &QNetworkReply::abort);
         connect(reply, &QNetworkReply::finished, &eventLoop, &QEventLoop::quit);
-        eventLoop.exec();
+        //Processing userinputevents in local eventloop would cause a SEGV when clicking 'abort' of calling LineOp
+        eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
 
         delete progress;
 
-        if (reply->error() != QNetworkReply::NoError)
+        const QNetworkReply::NetworkError& netErr = reply->error();
+        if (netErr == QNetworkReply::RemoteHostClosedError && areas.size() > 1)
+        {
+            throw tr("BRouter does not support more then 1 nogo-area in this version, consider to upgrade");
+        }
+        else if(netErr != QNetworkReply::NoError)
         {
             throw reply->errorString();
         }
@@ -318,13 +348,16 @@ void CRouterBRouter::calcRoute(const IGisItem::key_t& key)
     {
         startBRouter();
     }
-    CGisItemRte *rte = dynamic_cast<CGisItemRte*>(CGisWidget::self().getItemByKey(key));
+    CGisItemRte *rte = dynamic_cast<CGisItemRte*>(CGisWorkspace::self().getItemByKey(key));
     if(nullptr == rte)
     {
         mutex.unlock();
         return;
     }
 
+    QVector<IRouter::circle_t> areas;
+    CGisWorkspace::self().getNogoAreas(areas);
+
     rte->reset();
 
     slotCloseStatusMsg();
@@ -337,13 +370,14 @@ void CRouterBRouter::calcRoute(const IGisItem::key_t& key)
 
     synchronous = false;
 
-    QNetworkReply * reply = networkAccessManager->get(getRequest(points));
+    QNetworkReply * reply = networkAccessManager->get(getRequest(points,areas));
 
     reply->setProperty("key.item", key.item);
     reply->setProperty("key.project", key.project);
     reply->setProperty("key.device", key.device);
     reply->setProperty("options", getOptions());
     reply->setProperty("time", QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
+    reply->setProperty("nogos", areas.size());
 
     CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
     if(canvas)
@@ -368,7 +402,12 @@ void CRouterBRouter::slotRequestFinished(QNetworkReply* reply)
 
     try
     {
-        if(reply->error() != QNetworkReply::NoError)
+        const QNetworkReply::NetworkError& netErr = reply->error();
+        if (netErr == QNetworkReply::RemoteHostClosedError && reply->property("nogos").toInt() > 1)
+        {
+            throw tr("BRouter does not support more then 1 nogo-area in this version, consider to upgrade");
+        }
+        else if(netErr != QNetworkReply::NoError)
         {
             throw reply->errorString();
         }
@@ -399,7 +438,7 @@ void CRouterBRouter::slotRequestFinished(QNetworkReply* reply)
         qint64 time = reply->property("time").toLongLong();
         time = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch() - time;
 
-        CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWidget::self().getItemByKey(key));
+        CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWorkspace::self().getItemByKey(key));
         if(rte != nullptr)
         {
             rte->setResultFromBRouter(xml, reply->property("options").toString() + tr("<br/>Calculation time: %1s").arg(time/1000.0, 0,'f',2));
diff --git a/src/gis/rte/router/CRouterBRouter.h b/src/gis/rte/router/CRouterBRouter.h
index 6bee80d..ac567fd 100644
--- a/src/gis/rte/router/CRouterBRouter.h
+++ b/src/gis/rte/router/CRouterBRouter.h
@@ -68,7 +68,7 @@ private:
         {
         }
 
-        wpt_t(qreal lat, qreal lon) :
+        wpt_t(const qreal& lat, const qreal& lon) :
             lat(lat),
             lon(lon)
         {
@@ -81,7 +81,7 @@ private:
     void startBRouter() const;
     void stopBRouter() const;
     void updateLocalBRouterStatus() const;
-    QNetworkRequest getRequest(const QVector<wpt_t>& routePoints) const;
+    QNetworkRequest getRequest(const QVector<wpt_t>& routePoints, const QVector<circle_t> &areas) const;
     QUrl getServiceUrl() const;
     void clearError();
 
diff --git a/src/gis/rte/router/CRouterMapQuest.cpp b/src/gis/rte/router/CRouterMapQuest.cpp
index af1fb7b..f9277f8 100644
--- a/src/gis/rte/router/CRouterMapQuest.cpp
+++ b/src/gis/rte/router/CRouterMapQuest.cpp
@@ -18,7 +18,7 @@
 
 #include "CMainWindow.h"
 #include "canvas/CCanvas.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/rte/CGisItemRte.h"
 #include "gis/rte/router/CRouterMapQuest.h"
 #include "helpers/CSettings.h"
@@ -187,7 +187,7 @@ void CRouterMapQuest::addMapQuestLocations(QDomDocument& xml, QDomElement& locat
 
 void CRouterMapQuest::calcRoute(const IGisItem::key_t& key)
 {
-    CGisItemRte *rte = dynamic_cast<CGisItemRte*>(CGisWidget::self().getItemByKey(key));
+    CGisItemRte *rte = dynamic_cast<CGisItemRte*>(CGisWorkspace::self().getItemByKey(key));
     if(nullptr == rte)
     {
         return;
@@ -357,7 +357,7 @@ void CRouterMapQuest::slotRequestFinished(QNetworkReply* reply)
 
     time = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch() - time;
 
-    CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWidget::self().getItemByKey(key));
+    CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWorkspace::self().getItemByKey(key));
     if(rte != nullptr)
     {
         rte->setResult(xml, reply->property("options").toString() + tr("<br/>Calculation time: %1s").arg(time/1000.0, 0,'f',2));
diff --git a/src/gis/rte/router/CRouterRoutino.cpp b/src/gis/rte/router/CRouterRoutino.cpp
index ee04ec4..b35ccca 100644
--- a/src/gis/rte/router/CRouterRoutino.cpp
+++ b/src/gis/rte/router/CRouterRoutino.cpp
@@ -18,7 +18,7 @@
 
 #include "CMainWindow.h"
 #include "canvas/CCanvas.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/rte/CGisItemRte.h"
 #include "gis/rte/router/CRouterRoutino.h"
 #include "gis/rte/router/routino/CRouterRoutinoPathSetup.h"
@@ -278,7 +278,7 @@ void CRouterRoutino::calcRoute(const IGisItem::key_t& key)
         QTime time;
         time.start();
 
-        CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWidget::self().getItemByKey(key));
+        CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWorkspace::self().getItemByKey(key));
         if(nullptr == rte)
         {
             throw QString();
diff --git a/src/gis/rte/router/CRouterSetup.cpp b/src/gis/rte/router/CRouterSetup.cpp
index ec2a06d..4789ce3 100644
--- a/src/gis/rte/router/CRouterSetup.cpp
+++ b/src/gis/rte/router/CRouterSetup.cpp
@@ -17,7 +17,7 @@
 
 **********************************************************************************************/
 
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/rte/CGisItemRte.h"
 #include "gis/rte/router/CRouterBRouter.h"
 #include "gis/rte/router/CRouterMapQuest.h"
diff --git a/src/gis/rte/router/IRouter.h b/src/gis/rte/router/IRouter.h
index 6f1cf8b..afec86d 100644
--- a/src/gis/rte/router/IRouter.h
+++ b/src/gis/rte/router/IRouter.h
@@ -26,6 +26,25 @@ class IRouter : public QWidget
 {
     Q_OBJECT
 public:
+
+    struct circle_t
+    {
+        circle_t() : lon(NOFLOAT), lat(NOFLOAT), rad(NOINT)
+        {
+        }
+
+        circle_t(const qreal& lat, const qreal& lon, const qreal& rad) :
+            lon(lon),
+            lat(lat),
+            rad(rad)
+        {
+        }
+
+        qreal lon;
+        qreal lat;
+        quint32 rad;
+    };
+
     IRouter(bool fastRouting, QWidget * parent);
     virtual ~IRouter();
 
diff --git a/src/gis/rte/router/IRouterBRouter.ui b/src/gis/rte/router/IRouterBRouter.ui
index 7514a2a..c34480c 100644
--- a/src/gis/rte/router/IRouterBRouter.ui
+++ b/src/gis/rte/router/IRouterBRouter.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>327</height>
+    <height>388</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -206,11 +206,50 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>0</height>
+       <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item>
+    <widget class="QLabel" name="labelCopyrightBRouter">
+     <property name="text">
+      <string><p><a href="http://brouter.de/brouter/" target="_blank">BRouter</a> © <a href="https://github.com/abrensch/brouter/blob/master/LICENSE" target="_blank">ABrensch, Licence GPLv3</a></p></string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="labelCopyrightBRouterWeb">
+     <property name="text">
+      <string><p>Directions Courtesy of <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="labelCopyrightOSM">
+     <property name="text">
+      <string><p>Routing data <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a> contributors</p></string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>
diff --git a/src/gis/rte/router/IRouterRoutino.ui b/src/gis/rte/router/IRouterRoutino.ui
index d9a325f..9173cc3 100644
--- a/src/gis/rte/router/IRouterRoutino.ui
+++ b/src/gis/rte/router/IRouterRoutino.ui
@@ -88,19 +88,6 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
       <widget class="QFrame" name="frameHelp">
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
@@ -112,7 +99,7 @@
         <item>
          <widget class="QLabel" name="label_3">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+           <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
diff --git a/src/gis/suunto/CLogProject.cpp b/src/gis/suunto/CLogProject.cpp
new file mode 100644
index 0000000..7c7679f
--- /dev/null
+++ b/src/gis/suunto/CLogProject.cpp
@@ -0,0 +1,259 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Michel Durand zero at cms123.fr
+
+    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 Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "CMainWindow.h"
+#include "gis/CGisListWks.h"
+#include "gis/suunto/CLogProject.h"
+#include "gis/suunto/ISuuntoProject.h"
+#include "gis/trk/CGisItemTrk.h"
+#include <QtWidgets>
+
+
+static const QList<extension_t> extensions =
+{
+    {"Latitude",           0.0000001,      0.0,        ASSIGN_VALUE(lat,NIL)}   // unit [°]
+    ,{"Longitude",          0.0000001,      0.0,        ASSIGN_VALUE(lon,NIL)}  // unit [°]
+    ,{"Altitude",           1.0,            0.0,        ASSIGN_VALUE(ele,NIL)}  // unit [m]
+    ,{"VerticalSpeed",      0.01,           0.0,        ASSIGN_VALUE(extensions["gpxdata:verticalSpeed"],NIL)}                  // unit [m/h]
+    ,{"HR",                 1.0,            0.0,        ASSIGN_VALUE(extensions["gpxtpx:TrackPointExtension|gpxtpx:hr"],qRound)}   // unit [bpm]
+    ,{"Cadence",            1.0,            0.0,        ASSIGN_VALUE(extensions["gpxdata:cadence"],NIL)}                        // unit [bpm]
+    ,{"Temperature",        0.1,            0.0,        ASSIGN_VALUE(extensions["gpxdata:temp"],NIL)}                           // unit [°C]
+    ,{"SeaLevelPressure",   0.1,            0.0,        ASSIGN_VALUE(extensions["gpxdata:seaLevelPressure"],NIL)}               // unit [hPa]
+    ,{"Speed",              0.01,           0.0,        ASSIGN_VALUE(extensions["gpxdata:speed"],NIL)}                          // unit [m/s]
+    ,{"EnergyConsumption",  0.1,            0.0,        ASSIGN_VALUE(extensions["gpxdata:energy"],NIL)}                         // unit [kCal/min]
+};
+
+
+CLogProject::CLogProject(const QString &filename, CGisListWks * parent)
+    : ISuuntoProject(eTypeLog, filename, parent)
+{
+    setIcon(CGisListWks::eColumnIcon, QIcon("://icons/32x32/LogProject.png"));
+    blockUpdateItems(true);
+    loadLog(filename);
+    blockUpdateItems(false);
+    setupName(QFileInfo(filename).completeBaseName().replace("_", " "));
+}
+
+
+void CLogProject::loadLog(const QString& filename)
+{
+    try
+    {
+        loadLog(filename, this);
+    }
+    catch(QString &errormsg)
+    {
+        QMessageBox::critical(CMainWindow::getBestWidgetForParent(),
+                              tr("Failed to load file %1...").arg(filename), errormsg, QMessageBox::Abort);
+        valid = false;
+    }
+}
+
+
+void CLogProject::loadLog(const QString &filename, CLogProject *project)
+{
+    QFile file(filename);
+
+    // if the file does not exist, the filename is assumed to be a name for a new project
+    if (!file.exists() || QFileInfo(filename).suffix().toLower() != "log")
+    {
+        project->filename.clear();
+        project->setupName(filename);
+        project->setToolTip(CGisListWks::eColumnName, project->getInfo());
+        project->valid = true;
+        return;
+    }
+
+    if (!file.open(QIODevice::ReadOnly))
+    {
+        throw tr("Failed to open %1").arg(filename);
+    }
+
+    // load file content to xml document
+    QDomDocument xml;
+    QString msg;
+    int line;
+    int column;
+    if (!xml.setContent(&file, false, &msg, &line, &column))
+    {
+        file.close();
+        throw tr("Failed to read: %1\nline %2, column %3:\n %4").arg(filename).arg(line).arg(column).arg(msg);
+    }
+    file.close();
+
+    QDomElement xmlOpenambitlog = xml.documentElement();
+    if (xmlOpenambitlog.tagName() != "openambitlog")
+    {
+        throw tr("Not an Openambit log file: %1").arg(filename);
+    }
+
+    CTrackData trk;
+
+
+    if(xmlOpenambitlog.namedItem("DeviceInfo").isElement())
+    {
+        const QDomNode& xmlDeviceInfo = xmlOpenambitlog.namedItem("DeviceInfo");
+        if(xmlDeviceInfo.namedItem("Name").isElement())
+        {
+            trk.cmt =  tr("Device: %1<br/>").arg(xmlDeviceInfo.namedItem("Name").toElement().text());
+        }
+    }
+
+    if(xmlOpenambitlog.namedItem("Log").isElement())
+    {
+        QDateTime time0; // start time of the track
+
+        const QDomNode& xmlLog = xmlOpenambitlog.namedItem("Log");
+        if(xmlLog.namedItem("Header").isElement())
+        {
+            const QDomNode& xmlHeader = xmlLog.namedItem("Header");
+
+            if(xmlHeader.namedItem("DateTime").isElement())
+            {
+                QString dateTimeStr = xmlHeader.namedItem("DateTime").toElement().text();
+                trk.name = dateTimeStr; // date of beginning of recording is chosen as track name
+                IUnit::parseTimestamp(dateTimeStr, time0); // as local time
+            }
+
+            if(xmlHeader.namedItem("Activity").isElement())
+            {
+                trk.desc = xmlHeader.namedItem("Activity").toElement().text();
+            }
+
+            if(xmlHeader.namedItem("RecoveryTime").isElement())
+            {
+                trk.cmt += tr("Recovery time: %1 h<br/>").arg(xmlHeader.namedItem("RecoveryTime").toElement().text().toInt() / 3600000);
+            }
+
+            if(xmlHeader.namedItem("PeakTrainingEffect").isElement())
+            {
+                trk.cmt += tr("Peak Training Effect: %1<br/>").arg(xmlHeader.namedItem("PeakTrainingEffect").toElement().text().toDouble()/10.0);
+            }
+
+            if(xmlHeader.namedItem("Energy").isElement())
+            {
+                trk.cmt += tr("Energy: %1 kCal<br/>").arg((int)xmlHeader.namedItem("Energy").toElement().text().toDouble() );
+            }
+        }
+
+        if(xmlLog.namedItem("Samples").isElement())
+        {
+            const QDomNode& xmlSamples = xmlLog.namedItem("Samples");
+            const QDomNodeList& xmlSampleList = xmlSamples.toElement().elementsByTagName("Sample");
+
+            if (xmlSampleList.count() > 0)
+            {
+                bool UTCtimeFound = false;
+                for (int i = 0; i < xmlSampleList.count(); i++) // browse XML samples
+                { //look for samples with UTC timestamp
+                    const QDomNode& xmlSample = xmlSampleList.item(i);
+
+                    if (xmlSample.namedItem("UTCReference").isElement())
+                    {
+                        QString timeStr = xmlSample.namedItem("UTCReference").toElement().text();
+
+                        if(xmlSample.namedItem("Time").isElement())
+                        {
+                            IUnit::parseTimestamp(timeStr, time0);
+                            time0 = time0.addMSecs(-xmlSample.namedItem("Time").toElement().text().toDouble() );  // substract current sample time to get start time
+                            UTCtimeFound = true;
+                            break;
+                        }
+                    }
+                }
+
+                if ( !UTCtimeFound)
+                {
+                    QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("Use of local time...")
+                                         , tr("No UTC time has been found in file %1. "
+                                              "Local computer time will be used. "
+                                              "You can adjust time using a time filter if needed.").arg(filename)
+                                         , QMessageBox::Ok);
+                }
+
+                bool sampleWithPositionFound = false;
+                QList<sample_t> samplesList;
+                QList<QDateTime> lapsList;
+
+                for (int i = 0; i < xmlSampleList.count(); i++) // browse XML samples
+                {
+                    sample_t sample;
+                    const QDomNode& xmlSample = xmlSampleList.item(i);
+
+                    if(xmlSample.namedItem("Latitude").isElement())
+                    {
+                        sampleWithPositionFound = true;
+                    }
+
+                    if(xmlSample.namedItem("Time").isElement())
+                    {
+                        sample.time = time0.addMSecs(xmlSample.namedItem("Time").toElement().text().toDouble() );
+                    }
+
+                    if(xmlSample.namedItem("Type").isElement())
+                    {
+                        if ( xmlSample.namedItem("Type").toElement().text() == "lap-info" )
+                        {
+                            if ( xmlSample.namedItem("Lap").isElement() )
+                            {
+                                const QDomNode& xmlLap = xmlSample.namedItem("Lap");
+                                if(xmlLap.namedItem("Type").isElement())
+                                {
+                                    if (xmlLap.namedItem("Type").toElement().text() == "Manual")
+                                    {
+                                        lapsList << sample.time; // stores timestamps of the samples where the the "Lap" button has been pressed
+                                    }
+                                }
+                            }
+                        }
+                        else if (xmlSample.namedItem("Type").toElement().text() == "gps-small"
+                                 || xmlSample.namedItem("Type").toElement().text() == "gps-base"
+                                 || xmlSample.namedItem("Type").toElement().text() == "gps-tiny"
+                                 || xmlSample.namedItem("Type").toElement().text() == "position"
+                                 || xmlSample.namedItem("Type").toElement().text() == "periodic")
+                        {
+                            for (const extension_t& ext  : extensions)
+                            {
+                                if (xmlSample.namedItem(ext.tag).isElement())
+                                {
+                                    const QDomNode& xmlSampleData = xmlSample.namedItem(ext.tag);
+                                    sample[ext.tag] = xmlSampleData.toElement().text().toDouble() * ext.scale + ext.offset;
+                                }
+                            }
+                            samplesList << sample;
+                        }
+                    }
+                }
+
+                if (!sampleWithPositionFound)
+                {
+                    throw tr("This LOG file does not contain any position data and can not be displayed by QMapShack: %1").arg(filename);
+                }
+
+                fillTrackPointsFromSamples(samplesList, lapsList, trk, extensions);
+
+                new CGisItemTrk(trk, project);
+
+                project->sortItems();
+                project->setupName(QFileInfo(filename).completeBaseName().replace("_", " "));
+                project->setToolTip(CGisListWks::eColumnName, project->getInfo());
+                project->valid = true;
+            }
+        }
+    }
+}
diff --git a/src/mouse/CMouseDummy.h b/src/gis/suunto/CLogProject.h
similarity index 56%
copy from src/mouse/CMouseDummy.h
copy to src/gis/suunto/CLogProject.h
index 9058a0a..c9e5cf8 100644
--- a/src/mouse/CMouseDummy.h
+++ b/src/gis/suunto/CLogProject.h
@@ -1,5 +1,5 @@
 /**********************************************************************************************
-    Copyright (C) 2014-2015 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Michel Durand zero at cms123.fr
 
     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
@@ -16,34 +16,33 @@
 
 **********************************************************************************************/
 
-#ifndef CMOUSEDUMMY_H
-#define CMOUSEDUMMY_H
+#ifndef CLOGPROJECT_H
+#define CLOGPROJECT_H
 
-#include "mouse/IMouse.h"
+#include "gis/prj/IGisProject.h"
+#include "gis/suunto/ISuuntoProject.h"
 
-
-class CMouseDummy : public IMouse
+class CLogProject : public ISuuntoProject
 {
+    Q_DECLARE_TR_FUNCTIONS(CLogProject)
 public:
-    CMouseDummy();
-    virtual ~CMouseDummy();
+    CLogProject(const QString &filename, CGisListWks * parent);
+    virtual ~CLogProject() = default;
 
-    void draw(QPainter& p, CCanvas::redraw_e needsRedraw, const QRect &rect) override
-    {
-    }
-    void mousePressEvent(QMouseEvent * e) override
+    const QString getFileDialogFilter() const override
     {
+        return IGisProject::filedialogFilterLOG;
     }
-    void mouseMoveEvent(QMouseEvent * e) override
-    {
-    }
-    void mouseReleaseEvent(QMouseEvent *e) override
-    {
-    }
-    void wheelEvent(QWheelEvent * e) override
+
+    const QString getFileExtension() const override
     {
+        return "log";
     }
-};
 
-#endif //CMOUSEDUMMY_H
+    static void loadLog(const QString &filename, CLogProject *project);
+
+private:
+    void loadLog(const QString& filename);
+};
+#endif //CLOGPROJECT_H
 
diff --git a/src/gis/suunto/CSmlProject.cpp b/src/gis/suunto/CSmlProject.cpp
new file mode 100644
index 0000000..f3d3e02
--- /dev/null
+++ b/src/gis/suunto/CSmlProject.cpp
@@ -0,0 +1,260 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Michel Durand zero at cms123.fr
+
+    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 Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "CMainWindow.h"
+#include "gis/CGisListWks.h"
+#include "gis/suunto/CSmlProject.h"
+#include "gis/suunto/ISuuntoProject.h"
+#include "gis/trk/CGisItemTrk.h"
+#include <QtWidgets>
+
+
+static const QList<extension_t> extensions =
+{
+    {"Latitude",           RAD_TO_DEG,     0.0,        ASSIGN_VALUE(lat,NIL)}   // unit [°]
+    ,{"Longitude",          RAD_TO_DEG,     0.0,        ASSIGN_VALUE(lon,NIL)}  // unit [°]
+    ,{"Altitude",           1.0,            0.0,        ASSIGN_VALUE(ele,NIL)}  // unit [m]
+    ,{"VerticalSpeed",      1.0,            0.0,        ASSIGN_VALUE(extensions["gpxdata:verticalSpeed"],NIL)}                  // unit [m/h]
+    ,{"HR",                 60.0,           0.0,        ASSIGN_VALUE(extensions["gpxtpx:TrackPointExtension|gpxtpx:hr"],qRound)}   // unit [bpm]
+    ,{"Cadence",            60.0,           0.0,        ASSIGN_VALUE(extensions["gpxdata:cadence"],NIL)}                        // unit [bpm]
+    ,{"Temperature",        1.0,            -273.15,    ASSIGN_VALUE(extensions["gpxdata:temp"],NIL)}                           // unit [°C]
+    ,{"SeaLevelPressure",   0.01,           0.0,        ASSIGN_VALUE(extensions["gpxdata:seaLevelPressure"],NIL)}               // unit [hPa]
+    ,{"Speed",              1.0,            0.0,        ASSIGN_VALUE(extensions["gpxdata:speed"],NIL)}                          // unit [m/s]
+    ,{"EnergyConsumption",  60.0 / 4184.0,  0.0,        ASSIGN_VALUE(extensions["gpxdata:energy"],NIL)}                         // unit [kCal/min]
+};
+
+
+
+CSmlProject::CSmlProject(const QString &filename, CGisListWks * parent)
+    : ISuuntoProject(eTypeSml, filename, parent)
+{
+    setIcon(CGisListWks::eColumnIcon, QIcon("://icons/32x32/SmlProject.png"));
+    blockUpdateItems(true);
+    loadSml(filename);
+    blockUpdateItems(false);
+    setupName(QFileInfo(filename).completeBaseName().replace("_", " "));
+}
+
+
+void CSmlProject::loadSml(const QString& filename)
+{
+    try
+    {
+        loadSml(filename, this);
+    }
+    catch(QString &errormsg)
+    {
+        QMessageBox::critical(CMainWindow::getBestWidgetForParent(),
+                              tr("Failed to load file %1...").arg(filename), errormsg, QMessageBox::Abort);
+        valid = false;
+    }
+}
+
+
+void CSmlProject::loadSml(const QString &filename, CSmlProject *project)
+{
+    QFile file(filename);
+
+    // if the file does not exist, the filename is assumed to be a name for a new project
+    if (!file.exists() || QFileInfo(filename).suffix().toLower() != "sml")
+    {
+        project->filename.clear();
+        project->setupName(filename);
+        project->setToolTip(CGisListWks::eColumnName, project->getInfo());
+        project->valid = true;
+        return;
+    }
+
+    if (!file.open(QIODevice::ReadOnly))
+    {
+        throw tr("Failed to open %1").arg(filename);
+    }
+
+    // load file content to xml document
+    QDomDocument xml;
+    QString msg;
+    int line;
+    int column;
+    if (!xml.setContent(&file, false, &msg, &line, &column))
+    {
+        file.close();
+        throw tr("Failed to read: %1\nline %2, column %3:\n %4").arg(filename).arg(line).arg(column).arg(msg);
+    }
+    file.close();
+
+    QDomElement xmlSml = xml.documentElement();
+    if (xmlSml.tagName() != "sml")
+    {
+        throw tr("Not an sml file: %1").arg(filename);
+    }
+
+    if(xmlSml.namedItem("DeviceLog").isElement())
+    {
+        CTrackData trk;
+        QDateTime time0; // start time of the track
+
+        const QDomNode& xmlDeviceLog = xmlSml.namedItem("DeviceLog");
+        if(xmlDeviceLog.namedItem("Header").isElement())
+        {
+            const QDomNode& xmlHeader = xmlDeviceLog.namedItem("Header");
+            if(xmlHeader.namedItem("DateTime").isElement())
+            {
+                QString dateTimeStr = xmlHeader.namedItem("DateTime").toElement().text();
+                trk.name = dateTimeStr; // date (in local time) of beginning of recording is chosen as track name
+                IUnit::parseTimestamp(dateTimeStr, time0); // as local time
+            }
+
+            if(xmlHeader.namedItem("Activity").isElement())
+            {
+                trk.desc = xmlHeader.namedItem("Activity").toElement().text();
+            }
+
+            if(xmlHeader.namedItem("RecoveryTime").isElement())
+            {
+                trk.cmt = tr("Recovery time: %1 h<br/>").arg(xmlHeader.namedItem("RecoveryTime").toElement().text().toInt() / 3600);
+            }
+
+            if(xmlHeader.namedItem("PeakTrainingEffect").isElement())
+            {
+                trk.cmt += tr("Peak Training Effect: %1<br/>").arg(xmlHeader.namedItem("PeakTrainingEffect").toElement().text().toDouble());
+            }
+
+            if(xmlHeader.namedItem("Energy").isElement())
+            {
+                trk.cmt += tr("Energy: %1 kCal<br/>").arg((int)xmlHeader.namedItem("Energy").toElement().text().toDouble() / 4184);
+            }
+
+
+            if(xmlHeader.namedItem("BatteryChargeAtStart").isElement() &&
+               xmlHeader.namedItem("BatteryCharge").isElement() &&
+               xmlHeader.namedItem("Duration").isElement() )
+
+            {
+                trk.cmt += tr("Battery usage: %1 %/hour")
+                           .arg( 100*(xmlHeader.namedItem("BatteryChargeAtStart").toElement().text().toDouble()
+                                      - xmlHeader.namedItem("BatteryCharge").toElement().text().toDouble())
+                                 / (xmlHeader.namedItem("Duration").toElement().text().toDouble() / 3600), 0, 'f', 1);
+            }
+        }
+
+        if(xmlDeviceLog.namedItem("Device").isElement())
+        {
+            const QDomNode& xmlDevice = xmlDeviceLog.namedItem("Device");
+            if(xmlDevice.namedItem("Name").isElement())
+            {
+                trk.cmt =  tr("Device: %1<br/>").arg(xmlDevice.namedItem("Name").toElement().text()) + trk.cmt;
+            }
+        }
+
+        if(xmlDeviceLog.namedItem("Samples").isElement())
+        {
+            const QDomNode& xmlSamples = xmlDeviceLog.namedItem("Samples");
+            const QDomNodeList& xmlSampleList = xmlSamples.toElement().elementsByTagName("Sample");
+
+            if (xmlSampleList.count() > 0)
+            {
+                bool UTCtimeFound = false;
+                for (int i = 0; i < xmlSampleList.count(); i++) // browse XML samples
+                { //look for samples with UTC timestamp
+                    const QDomNode& xmlSample = xmlSampleList.item(i);
+
+                    if (xmlSample.namedItem("UTC").isElement())
+                    {
+                        QString timeStr = xmlSample.namedItem("UTC").toElement().text();
+
+                        if (timeStr.indexOf("Z") != NOIDX) // "Z" means "UTC timestamp" ; note the even this element is <UTC>, this does not mean that time is expressed as UTC
+                        {
+                            if(xmlSample.namedItem("Time").isElement())
+                            {
+                                IUnit::parseTimestamp(timeStr, time0);
+                                time0 = time0.addMSecs(-xmlSample.namedItem("Time").toElement().text().toDouble() * 1000.0 );  // substract current sample time to get start time
+                                UTCtimeFound = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if ( !UTCtimeFound)
+                {
+                    QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("Use of local time...")
+                                         , tr("No UTC time has been found in file %1. "
+                                              "Local computer time will be used. "
+                                              "You can adjust time using a time filter if needed.").arg(filename)
+                                         , QMessageBox::Ok);
+                }
+
+                bool sampleWithPositionFound = false;
+                QList<sample_t> samplesList;
+                QList<QDateTime> lapsList;
+
+                for (int i = 0; i < xmlSampleList.count(); i++) // browse XML samples
+                {
+                    sample_t sample;
+                    const QDomNode& xmlSample = xmlSampleList.item(i);
+
+                    if(xmlSample.namedItem("Latitude").isElement())
+                    {
+                        sampleWithPositionFound = true;
+                    }
+
+                    if(xmlSample.namedItem("Time").isElement())
+                    {
+                        sample.time = time0.addMSecs(xmlSample.namedItem("Time").toElement().text().toDouble() * 1000.0);
+                    }
+
+                    if(xmlSample.namedItem("Events").isElement())
+                    {
+                        const QDomNode& xmlEvents = xmlSample.namedItem("Events");
+                        if(xmlEvents.namedItem("Lap").isElement())
+                        {
+                            lapsList << sample.time; // stores timestamps of the samples where the the "Lap" button has been pressed
+                        }
+                    }
+                    else // samples without "Events" are the ones containing position, heart rate, etc... that we want to store
+                    {
+                        for (const extension_t& ext : extensions)
+                        {
+                            if (xmlSample.namedItem(ext.tag).isElement())
+                            {
+                                const QDomNode& xmlSampleData = xmlSample.namedItem(ext.tag);
+                                sample[ext.tag] = xmlSampleData.toElement().text().toDouble() * ext.scale + ext.offset;
+                            }
+                        }
+                        samplesList << sample;
+                    }
+                }
+
+                if (!sampleWithPositionFound)
+                {
+                    throw tr("This SML file does not contain any position data and can not be displayed by QMapShack: %1").arg(filename);
+                }
+
+                fillTrackPointsFromSamples(samplesList, lapsList, trk, extensions);
+
+
+                new CGisItemTrk(trk, project);
+
+                project->sortItems();
+                project->setupName(QFileInfo(filename).completeBaseName().replace("_", " "));
+                project->setToolTip(CGisListWks::eColumnName, project->getInfo());
+                project->valid = true;
+            }
+        }
+    }
+}
diff --git a/src/mouse/CMouseDummy.h b/src/gis/suunto/CSmlProject.h
similarity index 56%
copy from src/mouse/CMouseDummy.h
copy to src/gis/suunto/CSmlProject.h
index 9058a0a..cb20e8a 100644
--- a/src/mouse/CMouseDummy.h
+++ b/src/gis/suunto/CSmlProject.h
@@ -1,5 +1,5 @@
 /**********************************************************************************************
-    Copyright (C) 2014-2015 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Michel Durand zero at cms123.fr
 
     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
@@ -16,34 +16,33 @@
 
 **********************************************************************************************/
 
-#ifndef CMOUSEDUMMY_H
-#define CMOUSEDUMMY_H
+#ifndef CSMLPROJECT_H
+#define CSMLPROJECT_H
 
-#include "mouse/IMouse.h"
+#include "gis/prj/IGisProject.h"
+#include "gis/suunto/ISuuntoProject.h"
 
-
-class CMouseDummy : public IMouse
+class CSmlProject : public ISuuntoProject
 {
+    Q_DECLARE_TR_FUNCTIONS(CSmlProject)
 public:
-    CMouseDummy();
-    virtual ~CMouseDummy();
+    CSmlProject(const QString &filename, CGisListWks * parent);
+    virtual ~CSmlProject() = default;
 
-    void draw(QPainter& p, CCanvas::redraw_e needsRedraw, const QRect &rect) override
-    {
-    }
-    void mousePressEvent(QMouseEvent * e) override
+    const QString getFileDialogFilter() const override
     {
+        return IGisProject::filedialogFilterSML;
     }
-    void mouseMoveEvent(QMouseEvent * e) override
-    {
-    }
-    void mouseReleaseEvent(QMouseEvent *e) override
-    {
-    }
-    void wheelEvent(QWheelEvent * e) override
+
+    const QString getFileExtension() const override
     {
+        return "sml";
     }
-};
 
-#endif //CMOUSEDUMMY_H
+    static void loadSml(const QString &filename, CSmlProject *project);
+
+private:
+    void loadSml(const QString& filename);
+};
+#endif //CSMLPROJECT_H
 
diff --git a/src/gis/suunto/ISuuntoProject.cpp b/src/gis/suunto/ISuuntoProject.cpp
new file mode 100644
index 0000000..2369f21
--- /dev/null
+++ b/src/gis/suunto/ISuuntoProject.cpp
@@ -0,0 +1,182 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Michel Durand zero at cms123.fr
+
+    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 Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "CMainWindow.h"
+#include "gis/CGisListWks.h"
+#include "gis/suunto/ISuuntoProject.h"
+#include "gis/trk/CGisItemTrk.h"
+
+
+ISuuntoProject::ISuuntoProject(type_e type, const QString &filename, CGisListWks *parent)
+    : IGisProject(type, filename, parent)
+{
+}
+
+
+void ISuuntoProject::fillTrackPointsFromSamples(QList<sample_t> &samplesList, QList<QDateTime> &lapsList, CTrackData &trk, QList<extension_t> extensions)
+{
+    for (const extension_t& ext  : extensions)
+    {
+        fillMissingData(ext.tag, samplesList);
+    }
+
+    deleteSamplesWithDuplicateTimestamps(samplesList, extensions);
+
+    lapsList << samplesList.last().time.addSecs(1); // a last dummy lap button push is added with timestamp = 1 s later than the last sample timestamp
+
+    trk.segs.resize(lapsList.size() ); // segments are created and each of them contains 1 lap
+
+    int lap = 0;
+    CTrackData::trkseg_t *seg = &(trk.segs[lap]);
+
+    for(const sample_t& sample : samplesList)
+    {
+        if (sample.time > lapsList[lap])
+        {
+            lap++;
+            seg = &(trk.segs[lap]);
+        }
+
+        CTrackData::trkpt_t trkpt;
+        trkpt.time = sample.time;
+
+        for(const extension_t& ext : extensions)
+        {
+            if(sample.data.contains(ext.tag))
+            {
+                ext.func(trkpt, sample[ext.tag]);
+            }
+        }
+
+        seg->pts.append(trkpt);
+    }
+}
+
+
+void ISuuntoProject::fillMissingData(const QString &dataField, QList<sample_t> &samplesList)
+{   // Suunto samples contain lat/lon OR heart rate, elevation, etc.., each one with its own timestamp.
+    // The purpose of the code below is to "spread" data among samples.
+    // At the end each sample contains data, linearly interpolated from its neighbors according to timestamps.
+    QList<sample_t> collect;
+    QList<sample_t> result;
+    sample_t previousSampleWithData;
+
+    for(sample_t& sample : samplesList)
+    {
+        collect << sample;
+
+        if (sample.data.contains(dataField))
+        {
+            if (!previousSampleWithData.data.contains(dataField))
+            {   // case where, at the beginning, first samples have no data
+                for(sample_t& collectedSample : collect)
+                {
+                    collectedSample[dataField] = sample[dataField];
+                }
+            }
+            else
+            {   // case where linear interpolation can be applied
+                qreal dT = ((qreal)(collect.last().time.toMSecsSinceEpoch() - previousSampleWithData.time.toMSecsSinceEpoch())) / 1000.0;
+                if (dT != 0) // dT == 0 when samples have the same timestamps ; this is managed later in deleteSamplesWithDuplicateTimestamps function
+                {
+                    qreal dY = collect.last().data[dataField] - previousSampleWithData.data[dataField];
+                    qreal slope = dY / dT;
+
+                    for(sample_t& collectedSample : collect)
+                    {   // apply interpolation to collected samples
+                        collectedSample[dataField] = previousSampleWithData.data[dataField] + slope * ( (qreal)(collectedSample.time.toMSecsSinceEpoch() - previousSampleWithData.time.toMSecsSinceEpoch()) / 1000.0 );
+                    }
+                }
+            }
+
+            previousSampleWithData = sample;
+            result << collect;
+            collect.clear();
+        }
+    }
+
+    if (previousSampleWithData.data.contains(dataField))
+    {
+        for(sample_t& collectedSample : collect)
+        {   // processing last remaining collected samples without data
+            collectedSample[dataField] = previousSampleWithData[dataField];
+        }
+    }
+
+    result << collect;
+    samplesList = result;
+}
+
+
+void ISuuntoProject::deleteSamplesWithDuplicateTimestamps(QList<sample_t> &samples, QList<extension_t> extensions)
+{
+    QList<sample_t> result;
+    QList<sample_t> collect;
+
+
+    for(sample_t& sample : samples)
+    {
+        if(!collect.isEmpty())
+        {
+            if(sample.time != collect.first().time)
+            {
+                result << mergeSamples(collect, extensions);
+                collect.clear();
+            }
+        }
+        collect << sample;
+    }
+
+    result << mergeSamples(collect, extensions);
+    samples = result;
+}
+
+
+ISuuntoProject::sample_t ISuuntoProject::mergeSamples(QList<sample_t> samples, QList<extension_t> extensions)
+{
+    if(samples.count() == 1)
+    {
+        return samples.first();
+    }
+
+    sample_t result;
+
+    result.time = samples.first().time;
+
+    for (const extension_t& ext  : extensions)
+    {
+        qreal sum = 0;
+        qint32 cnt = 0;
+
+        for(const sample_t& sample : samples)
+        {
+            if(sample.data.contains(ext.tag))
+            {
+                sum += sample[ext.tag];
+                cnt++;
+            }
+        }
+
+        if(cnt != 0)
+        {
+            result[ext.tag] = sum/cnt; // averaged value is assigned to the merged sample
+        }
+    }
+
+    return result;
+}
diff --git a/src/gis/suunto/ISuuntoProject.h b/src/gis/suunto/ISuuntoProject.h
new file mode 100644
index 0000000..5bfe67f
--- /dev/null
+++ b/src/gis/suunto/ISuuntoProject.h
@@ -0,0 +1,81 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Michel Durand zero at cms123.fr
+
+    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 Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#ifndef ISUUNTOPROJECT_H
+#define ISUUNTOPROJECT_H
+
+#include "gis/prj/IGisProject.h"
+#include "gis/trk/CGisItemTrk.h"
+#include <functional>
+
+using fTrkPtSetVal = std::function<void(CTrackData::trkpt_t&, qreal)>;
+
+#define NIL ///< this is to silence the MSVC compiler
+#define ASSIGN_VALUE(var, op) \
+    [](CTrackData::trkpt_t &pt, qreal val) \
+    { \
+        if(val != NOFLOAT) \
+        { \
+            pt.var = op(val); \
+        } \
+    } \
+
+struct extension_t
+{
+    /// the tag as used in the xml file
+    QString tag;
+    /// a scale factor to be applied to the value stored in the xml file
+    qreal scale;
+    /// an offset to be applied to the value stored in the xml file
+    qreal offset;
+    /// an assignment function that assigns a value to a member of a trkpt_t object
+    fTrkPtSetVal func;
+};
+
+class ISuuntoProject : public IGisProject
+{
+public:
+    ISuuntoProject(type_e type, const QString &filename, CGisListWks *parent);
+
+    struct sample_t
+    {
+        QDateTime time; // as UTC timestamp
+        QMap<QString, qreal> data;
+
+        qreal& operator[](const QString& key)
+        {
+            return data[key];
+        }
+
+        qreal operator[](const QString& key) const
+        {
+            return data[key];
+        }
+    };
+
+    static void fillMissingData(const QString &dataField, QList<sample_t> &samplesList);
+
+    static sample_t mergeSamples(QList<sample_t> samples, QList<extension_t> extensions);
+    static void deleteSamplesWithDuplicateTimestamps(QList<sample_t> &samples, QList<extension_t> extensions);
+
+    static void fillTrackPointsFromSamples(QList<sample_t> &samplesList, QList<QDateTime> &lapsList, CTrackData &trk, QList<extension_t> extensions);
+};
+
+
+#endif //CSUUNTOPROJECT_H
+
diff --git a/src/gis/trk/CActivityTrk.cpp b/src/gis/trk/CActivityTrk.cpp
index 407a071..c0af970 100644
--- a/src/gis/trk/CActivityTrk.cpp
+++ b/src/gis/trk/CActivityTrk.cpp
@@ -351,19 +351,19 @@ void CActivityTrk::printSummary(const QMap<quint32, activity_summary_t>& summary
     {
         const activity_summary_t& s = summary[desc->flag];
         IUnit::self().meter2elevation(s.ascent, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += s.ascent;
     }
     if(printNoAct)
     {
         IUnit::self().meter2elevation(sumActNone.ascent, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += sumActNone.ascent;
     }
     if(printTotal)
     {
         IUnit::self().meter2elevation(total, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
@@ -375,19 +375,19 @@ void CActivityTrk::printSummary(const QMap<quint32, activity_summary_t>& summary
     {
         const activity_summary_t& s = summary[desc->flag];
         IUnit::self().meter2elevation(s.descent, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += s.descent;
     }
     if(printNoAct)
     {
         IUnit::self().meter2elevation(sumActNone.descent, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += sumActNone.descent;
     }
     if(printTotal)
     {
         IUnit::self().meter2elevation(total, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
@@ -399,19 +399,19 @@ void CActivityTrk::printSummary(const QMap<quint32, activity_summary_t>& summary
     {
         const activity_summary_t& s = summary[desc->flag];
         IUnit::self().meter2speed(s.distance/s.ellapsedSecondsMoving, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += s.ellapsedSecondsMoving;
     }
     if(printNoAct)
     {
         IUnit::self().meter2speed(sumActNone.distance/sumActNone.ellapsedSecondsMoving, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += sumActNone.ellapsedSecondsMoving;
     }
     if(printTotal)
     {
         IUnit::self().meter2speed(distance/total, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
@@ -423,19 +423,19 @@ void CActivityTrk::printSummary(const QMap<quint32, activity_summary_t>& summary
     {
         const activity_summary_t& s = summary[desc->flag];
         IUnit::self().meter2speed(s.distance/s.ellapsedSeconds, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += s.ellapsedSeconds;
     }
     if(printNoAct)
     {
         IUnit::self().meter2speed(sumActNone.distance/sumActNone.ellapsedSeconds, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += sumActNone.ellapsedSeconds;
     }
     if(printTotal)
     {
         IUnit::self().meter2speed(distance/total, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
@@ -447,19 +447,19 @@ void CActivityTrk::printSummary(const QMap<quint32, activity_summary_t>& summary
     {
         const activity_summary_t& s = summary[desc->flag];
         IUnit::self().seconds2time(s.ellapsedSecondsMoving, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += s.ellapsedSecondsMoving;
     }
     if(printNoAct)
     {
         IUnit::self().seconds2time(sumActNone.ellapsedSecondsMoving, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += sumActNone.ellapsedSecondsMoving;
     }
     if(printTotal)
     {
         IUnit::self().seconds2time(total, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
@@ -471,19 +471,19 @@ void CActivityTrk::printSummary(const QMap<quint32, activity_summary_t>& summary
     {
         const activity_summary_t& s = summary[desc->flag];
         IUnit::self().seconds2time(s.ellapsedSeconds, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += s.ellapsedSeconds;
     }
     if(printNoAct)
     {
         IUnit::self().seconds2time(sumActNone.ellapsedSeconds, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
         total += sumActNone.ellapsedSeconds;
     }
     if(printTotal)
     {
         IUnit::self().seconds2time(total, val, unit);
-        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
+        str += QString("<td align='right'>  %1%2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
diff --git a/src/gis/trk/CCombineTrk.cpp b/src/gis/trk/CCombineTrk.cpp
index 9ea318a..8fe4140 100644
--- a/src/gis/trk/CCombineTrk.cpp
+++ b/src/gis/trk/CCombineTrk.cpp
@@ -17,7 +17,7 @@
 **********************************************************************************************/
 
 
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/trk/CCombineTrk.h"
 #include "gis/trk/CGisItemTrk.h"
 #include "plot/CPlotTrack.h"
@@ -29,7 +29,7 @@ CCombineTrk::CCombineTrk(const QList<IGisItem::key_t> &keys, const QList<IGisIte
 {
     setupUi(this);
 
-    CGisWidget& gis = CGisWidget::self();
+    CGisWorkspace& gis = CGisWorkspace::self();
     for(const IGisItem::key_t& key : keys)
     {
         CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(gis.getItemByKey(key));
@@ -66,7 +66,7 @@ CCombineTrk::~CCombineTrk()
 
 void CCombineTrk::accept()
 {
-    CGisWidget& gis = CGisWidget::self();
+    CGisWorkspace& gis = CGisWorkspace::self();
 
     // get name of first track in list
     IGisItem::key_t key;
@@ -199,7 +199,7 @@ void CCombineTrk::slotDown()
 
 void CCombineTrk::updatePreview()
 {
-    CGisWidget& gis = CGisWidget::self();
+    CGisWorkspace& gis = CGisWorkspace::self();
 
     QPolygonF line;
     for(int i = 0; i < listSelected->count(); i++)
diff --git a/src/gis/trk/CDetailsTrk.cpp b/src/gis/trk/CDetailsTrk.cpp
index d35a85c..56ac8c0 100644
--- a/src/gis/trk/CDetailsTrk.cpp
+++ b/src/gis/trk/CDetailsTrk.cpp
@@ -161,7 +161,7 @@ CDetailsTrk::CDetailsTrk(CGisItemTrk& trk, QWidget *parent)
     // setting up the graph properties will trigger the signals
     // this is good because the signals are connected at this point
     // invoking the slots
-    loadGraphSource(comboGraph2, 2, CKnownExtension::internalSpeed);
+    loadGraphSource(comboGraph2, 2, CKnownExtension::internalSpeedDist);
     loadGraphSource(comboGraph3, 3, CKnownExtension::internalProgress);
 
     addFilterGroup<CFilterDouglasPeuker, CFilterInvalid, CFilterReset, CFilterDelete>
@@ -350,7 +350,6 @@ void CDetailsTrk::updateData()
     bool isReadOnly = trk.isReadOnly();
 
     tabWidget->widget(eTabFilter)->setEnabled(!isReadOnly);
-    tabWidget->widget(eTabActivity)->setEnabled(!isReadOnly);
 
     labelTainted->setVisible(trk.isTainted());
 
@@ -374,6 +373,7 @@ void CDetailsTrk::updateData()
     bool hasActivity = 0 != (flags & CTrackData::trkpt_t::eActMask);
     labelActivityHelp->setVisible(!hasActivity);
     labelActivityInfo->setVisible(hasActivity);
+    pushSetActivities->setEnabled(!isReadOnly);
 
     plotTrack->setTrack(&trk);
     listHistory->setupHistory(trk);
@@ -405,7 +405,7 @@ void CDetailsTrk::updateData()
     {
         const CKnownExtension &ext = CKnownExtension::get(key);
         QIcon icon(ext.icon);
-        comboColorSource->addItem(icon, ext.known ? ext.name : key, key);
+        comboColorSource->addItem(icon, ext.known ? ext.nameLongText : key, key);
     }
     int currentIdx = comboColorSource->findData(trk.getColorizeSource());
     if(-1 == currentIdx)
@@ -452,7 +452,7 @@ void CDetailsTrk::updateData()
     X_____________UnBlockAllSignals_____________X(this);
 
     // refill comboboxes to select track property to be displayed by graphs
-    loadGraphSource(comboGraph2, 2, CKnownExtension::internalSpeed);
+    loadGraphSource(comboGraph2, 2, CKnownExtension::internalSpeedDist);
     loadGraphSource(comboGraph3, 3, CKnownExtension::internalProgress);
 
     CFilterDeleteExtension *filter = treeFilter->findChild<CFilterDeleteExtension*>();
diff --git a/src/gis/trk/CGisItemTrk.cpp b/src/gis/trk/CGisItemTrk.cpp
index a3b563d..1e13a1e 100644
--- a/src/gis/trk/CGisItemTrk.cpp
+++ b/src/gis/trk/CGisItemTrk.cpp
@@ -19,7 +19,7 @@
 #include "CMainWindow.h"
 #include "GeoMath.h"
 #include "gis/CGisDraw.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/prj/IGisProject.h"
 #include "gis/trk/CCutTrk.h"
 #include "gis/trk/CDetailsTrk.h"
@@ -36,8 +36,6 @@
 #include <QtXml>
 #include <proj_api.h>
 
-using std::numeric_limits;
-
 #define DEFAULT_COLOR       4
 #define MIN_DIST_CLOSE_TO   10
 #define MIN_DIST_FOCUS      200
@@ -120,6 +118,18 @@ CGisItemTrk::CGisItemTrk(const QDomNode& xml, IGisProject *project)
 
     setupHistory();
     updateDecoration(eMarkNone, eMarkNone);
+
+    if((cntInvalidPoints != 0) && (cntInvalidPoints < cntVisiblePoints))
+    {
+        int res = QMessageBox::question(CMainWindow::self().getBestWidgetForParent(), tr("Invalid points...."),
+                                        tr("The track '%1' has %2 invalid points out of %3 visible points. "
+                                           "Do you want to hide invalid points now?").arg(getName()).arg(cntInvalidPoints).arg(cntVisiblePoints),
+                                        QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
+        if(res == QMessageBox::Yes)
+        {
+            filterRemoveInvalidPoints();
+        }
+    }
 }
 
 CGisItemTrk::CGisItemTrk(const QString& filename, IGisProject * project)
@@ -281,6 +291,51 @@ void CGisItemTrk::unregisterVisual(INotifyTrk * visual)
     registeredVisuals.remove(visual);
 }
 
+static void addRowLimit(QString& str, const QString& name, const QString& min, const QString& max)
+{
+    str += "<tr>";
+    str += "<td align='left'>" + name + "</td>";
+    str += "<td align='right'>" + min + "</td>";
+    str += "<td align='right'>" + max + "</td>";
+    str += "</tr>";
+}
+
+static bool sortByName(const QString& item1, const QString& item2)
+{
+    static QCollator collator;
+    // this will set collator to natural sorting mode (instead of lexical)
+    collator.setNumericMode(true);
+    return collator.compare(item1, item2) < 0;
+}
+
+
+QString CGisItemTrk::getInfoLimits() const
+{
+    QString str = "<table width='100%'>";
+
+    str += "<tr><th align='left'></th><th align='right'>" + tr("min.") + "</th><th align='right'>" + tr("max.") + "</th></tr>";
+
+    QStringList keys = extrema.keys();
+    qSort(keys.begin(), keys.end(), sortByName);
+
+    for(const QString& key : keys)
+    {
+        const CKnownExtension& ext = CKnownExtension::get(key);
+        const limits_t& limit = extrema[key];
+
+        const QString& labelMin = ext.toString(limit.min, false, key);
+        const QString& labelMax = ext.toString(limit.max, false, key);
+
+        if(!labelMin.isEmpty() && !labelMax.isEmpty())
+        {
+            addRowLimit(str, ext.getName(key), labelMin, labelMax);
+        }
+    }
+
+    str += "</table>";
+    return str;
+}
+
 QString CGisItemTrk::getInfo(quint32 feature) const
 {
     QString val1, unit1, val2, unit2;
@@ -319,14 +374,14 @@ QString CGisItemTrk::getInfo(quint32 feature) const
     {
         str += "<br/>";
         IUnit::self().meter2distance(totalDistance, val1, unit1);
-        str += tr("Length: %1 %2").arg(val1).arg(unit1);
+        str += tr("Length: %1%2").arg(val1).arg(unit1);
 
         if(eleIsValid && totalAscent != NOFLOAT && totalDescent != NOFLOAT)
         {
             IUnit::self().meter2elevation(totalAscent,  val1, unit1);
             IUnit::self().meter2elevation(totalDescent, val2, unit2);
 
-            str += tr(", %1%2 %3, %4%5 %6").arg(QChar(0x2197)).arg(val1).arg(unit1).arg(QChar(0x2198)).arg(val2).arg(unit2);
+            str += tr(", %1%2%3, %4%5%6").arg(QChar(0x2197)).arg(val1).arg(unit1).arg(QChar(0x2198)).arg(val2).arg(unit2);
         }
         else
         {
@@ -338,7 +393,7 @@ QString CGisItemTrk::getInfo(quint32 feature) const
         {
             IUnit::self().seconds2time(totalElapsedSeconds, val1, unit1);
             IUnit::self().meter2speed(totalDistance / totalElapsedSeconds, val2, unit2);
-            str += tr("Time: %1, Speed: %2 %3").arg(val1).arg(val2).arg(unit2);
+            str += tr("Time: %1%2, Speed: %3%4").arg(val1).arg(unit1).arg(val2).arg(unit2);
         }
         else
         {
@@ -350,7 +405,7 @@ QString CGisItemTrk::getInfo(quint32 feature) const
         {
             IUnit::self().seconds2time(totalElapsedSecondsMoving, val1, unit1);
             IUnit::self().meter2speed(totalDistance / totalElapsedSecondsMoving, val2, unit2);
-            str += tr("Moving: %1, Speed: %2 %3").arg(val1).arg(val2).arg(unit2);
+            str += tr("Moving: %1%2, Speed: %3%4").arg(val1).arg(unit1).arg(val2).arg(unit2);
         }
         else
         {
@@ -434,7 +489,7 @@ QString CGisItemTrk::getInfo(quint32 feature) const
 
 QString CGisItemTrk::getInfoRange() const
 {
-    qreal tmp, slope1, slope2;
+    qreal tmp, slope1;
     QString str, val, unit;
     if((mouseRange1 == nullptr) || (mouseRange2 == nullptr) || (mouseRange1 == mouseRange2))
     {
@@ -482,10 +537,12 @@ QString CGisItemTrk::getInfoRange() const
 
     tmp    = qAtan(deltaAscent / distance);
     slope1 = qAbs(tmp * 360.0 / (2 * M_PI));
-    slope2 = qTan(slope1 * DEG_TO_RAD) * 100;
+    QString val2, unit2;
+    IUnit::self().slope2string(slope1, val2, unit2);
+
 
     IUnit::self().meter2elevation(deltaAscent, val, unit);
-    str += QString("%3 %1%2 (%4%5, %6%)").arg(val).arg(unit).arg(QChar(0x2197)).arg(qRound(slope1)).arg(QChar(0260)).arg(qRound(slope2));
+    str += QString("%3 %1%2 (%4%5)").arg(val).arg(unit).arg(QChar(0x2197)).arg(val2).arg(unit2);
     if(timeIsValid)
     {
         IUnit::self().meter2speed(deltaAscent/deltaTime, val, unit);
@@ -495,10 +552,10 @@ QString CGisItemTrk::getInfoRange() const
 
     tmp    = qAtan(deltaDescent/distance);
     slope1 = qAbs(tmp * 360.0/(2 * M_PI));
-    slope2 = qTan(slope1 * DEG_TO_RAD) * 100;
+    IUnit::self().slope2string(slope1, val2, unit2);
 
     IUnit::self().meter2elevation(deltaDescent, val, unit);
-    str += QString("%3 %1%2 (%4%5, %6%)").arg(val).arg(unit).arg(QChar(0x2198)).arg(qRound(slope1)).arg(QChar(0260)).arg(qRound(slope2));
+    str += QString("%3 %1%2 (%4%5)").arg(val).arg(unit).arg(QChar(0x2198)).arg(val2).arg(unit2);
     if(timeIsValid)
     {
         IUnit::self().meter2speed(deltaDescent/deltaTime, val, unit);
@@ -529,15 +586,16 @@ QString CGisItemTrk::getInfoTrkPt(const CTrackData::trkpt_t& pt) const
     }
 
     IUnit::self().meter2elevation(pt.ele, val1, unit1);
-    str += tr("Ele.: %1 %2").arg(val1).arg(unit1);
+    str += tr("Ele.: %1%2").arg(val1).arg(unit1);
     if(pt.slope1 != NOFLOAT)
     {
-        str += tr(" slope: %1%3 (%2%)").arg(pt.slope1, 2, 'f', 0).arg(pt.slope2, 2, 'f', 0).arg(QChar(0260));
+        IUnit::self().slope2string(pt.slope1, val1, unit1);
+        str += tr(", Slope: %1%2").arg(val1).arg(unit1);
     }
     if(pt.speed != NOFLOAT)
     {
         IUnit::self().meter2speed(pt.speed, val1, unit1);
-        str += tr(" speed: %1%2").arg(val1).arg(unit1);
+        str += tr(", Speed: %1%2").arg(val1).arg(unit1);
     }
 
     QStringList keys = pt.extensions.keys();
@@ -554,7 +612,7 @@ QString CGisItemTrk::getInfoTrkPt(const CTrackData::trkpt_t& pt) const
         const CKnownExtension &ext = CKnownExtension::get(key);
         if(ext.known)
         {
-            str += "\n" + ext.name + ": " + QString("%1%2").arg(ext.valueFunc(pt)*ext.factor, 0, 'f', 1).arg(ext.unit);
+            str += "\n" + ext.nameLongText + ": " + QString("%1%2").arg(ext.valueFunc(pt)*ext.factor, 0, 'f', 1).arg(ext.unit);
         }
         else
         {
@@ -589,7 +647,7 @@ QString CGisItemTrk::getInfoProgress(const CTrackData::trkpt_t& pt) const
     if(pt.descent != NOFLOAT)
     {
         IUnit::self().meter2elevation(pt.descent, val, unit);
-        dsc = tr(" Descent: %1%2 (%3%)").arg(val).arg(unit).arg(pt.descent * 100/totalDescent, 2, 'f', 0);
+        dsc = tr(", Descent: %1%2 (%3%)").arg(val).arg(unit).arg(pt.descent * 100/totalDescent, 2, 'f', 0);
     }
 
     if(pt.distance != NOFLOAT)
@@ -601,10 +659,10 @@ QString CGisItemTrk::getInfoProgress(const CTrackData::trkpt_t& pt) const
     if(pt.elapsedSeconds != NOFLOAT)
     {
         IUnit::self().seconds2time(pt.elapsedSecondsMoving, val, unit);
-        mov = tr(" Moving: %1%2 (%3%)").arg(val).arg(unit).arg(pt.elapsedSecondsMoving * 100/totalElapsedSecondsMoving, 2, 'f', 0);
+        mov = tr(", Moving: %1%2 (%3%)").arg(val).arg(unit).arg(pt.elapsedSecondsMoving * 100/totalElapsedSecondsMoving, 2, 'f', 0);
     }
 
-    return QString("%1 %2\n%3 %4").arg(asc).arg(dsc).arg(dst).arg(mov);
+    return QString("%1%2\n%3%4").arg(asc).arg(dsc).arg(dst).arg(mov);
 }
 
 QString CGisItemTrk::getInfoRange(const CTrackData::trkpt_t& pt1, const CTrackData::trkpt_t& pt2) const
@@ -635,7 +693,7 @@ QString CGisItemTrk::getInfoRange(const CTrackData::trkpt_t& pt1, const CTrackDa
     if((pt1.descent != NOFLOAT) && (pt2.descent != NOFLOAT))
     {
         IUnit::self().meter2elevation(pt2.descent - pt1.descent, val, unit);
-        dsc = tr(" Descent: %1%2").arg(val).arg(unit);
+        dsc = tr(", Descent: %1%2").arg(val).arg(unit);
 
         if(dt != NOFLOAT)
         {
@@ -650,10 +708,10 @@ QString CGisItemTrk::getInfoRange(const CTrackData::trkpt_t& pt1, const CTrackDa
     if(dt != NOFLOAT)
     {
         IUnit::self().seconds2time(dt, val, unit);
-        dsttme += tr(" Time: %1%2").arg(val).arg(unit);
+        dsttme += tr(", Time: %1%2").arg(val).arg(unit);
     }
 
-    return QString("%1 %2\n%3").arg(asc).arg(dsc).arg(dsttme);
+    return QString("%1%2\n%3").arg(asc).arg(dsc).arg(dsttme);
 }
 
 qint32 CGisItemTrk::getElevation(qint32 idx) const
@@ -706,21 +764,23 @@ bool CGisItemTrk::isRangeSelected() const
     return mouseRange1 != mouseRange2;
 }
 
-static inline void updateExtrema(CGisItemTrk::limits_t &extrema, qreal val)
+static inline void updateExtrema(CGisItemTrk::limits_t &extrema, qreal val, const QPointF& pos)
 {
     if(NOFLOAT != val)
     {
-        extrema = { qMin(extrema.min, val), qMax(extrema.max, val) };
+        extrema.setMin(val, pos);
+        extrema.setMax(val, pos);
     }
 }
 
 void CGisItemTrk::updateExtremaAndExtensions()
 {
     extrema = QHash<QString, limits_t>();
-    limits_t extremaSpeed    = { numeric_limits<qreal>::max(), numeric_limits<qreal>::lowest() };
-    limits_t extremaSlope    = { numeric_limits<qreal>::max(), numeric_limits<qreal>::lowest() };
-    limits_t extremaEle      = { numeric_limits<qreal>::max(), numeric_limits<qreal>::lowest() };
-    limits_t extremaProgress = { numeric_limits<qreal>::max(), numeric_limits<qreal>::lowest() };
+    limits_t extremaSpeed;
+    limits_t extremaSlope;
+    limits_t extremaEle;
+    limits_t extremaProgress;
+
 
     existingExtensions = QSet<QString>();
     QSet<QString> nonRealExtensions;
@@ -734,15 +794,20 @@ void CGisItemTrk::updateExtremaAndExtensions()
 
         existingExtensions.unite(pt.extensions.keys().toSet());
 
+        const QPointF& pos = {pt.lon, pt.lat};
         for(const QString &key : pt.extensions.keys())
         {
             bool isReal = false;
             qreal val = pt.extensions.value(key).toReal(&isReal);
 
+
             if(isReal)
             {
-                const limits_t &current = extrema.value(key, { numeric_limits<qreal>::max(), numeric_limits<qreal>::lowest() });
-                extrema[key] = { qMin(current.min, val), qMax(current.max, val) };
+                if(!extrema.contains(key))
+                {
+                    extrema[key] = limits_t();
+                }
+                updateExtrema(extrema[key], val, pos);
             }
             else
             {
@@ -750,10 +815,10 @@ void CGisItemTrk::updateExtremaAndExtensions()
             }
         }
 
-        updateExtrema(extremaSpeed,    pt.speed);
-        updateExtrema(extremaEle,      pt.ele);
-        updateExtrema(extremaSlope,    pt.slope1);
-        updateExtrema(extremaProgress, pt.distance);
+        updateExtrema(extremaSpeed,    pt.speed, pos);
+        updateExtrema(extremaEle,      pt.ele, pos);
+        updateExtrema(extremaSlope,    pt.slope1, pos);
+        updateExtrema(extremaProgress, pt.distance, pos);
     }
 
     if(extremaEle.min < extremaEle.max)
@@ -770,8 +835,9 @@ void CGisItemTrk::updateExtremaAndExtensions()
 
     if(numeric_limits<qreal>::max() != extremaSpeed.min)
     {
-        existingExtensions << CKnownExtension::internalSpeed;
-        extrema[CKnownExtension::internalSpeed] = extremaSpeed;
+        existingExtensions << CKnownExtension::internalSpeedDist;
+        existingExtensions << CKnownExtension::internalSpeedTime;
+        extrema[CKnownExtension::internalSpeedDist] = extremaSpeed;
     }
 
     if(numeric_limits<qreal>::max() != extremaProgress.min)
@@ -841,6 +907,7 @@ void CGisItemTrk::deriveSecondaryData()
 
     // reset all secondary data
     allValidFlags             = 0;
+    cntInvalidPoints          = 0;
     cntTotalPoints            = 0;
     cntVisiblePoints          = 0;
     timeStart                 = QDateTime();
@@ -882,6 +949,10 @@ void CGisItemTrk::deriveSecondaryData()
 
         // count only visible points to allValidFlags
         allValidFlags |= trkpt.valid;
+        if((trkpt.valid & 0xFFFF0000) != 0)
+        {
+            cntInvalidPoints++;
+        }
 
         trkpt.idxVisible = cntVisiblePoints++;
         lintrk << &trkpt;
@@ -905,17 +976,19 @@ void CGisItemTrk::deriveSecondaryData()
                 trkpt.ascent  = lastTrkpt->ascent;
                 trkpt.descent = lastTrkpt->descent;
 
-                if(qAbs(delta) > ASCENT_THRESHOLD)
+                if(qAbs(delta) >= ASCENT_THRESHOLD)
                 {
+                    const qint32 step = (delta/ASCENT_THRESHOLD)*ASCENT_THRESHOLD;
+
                     if(delta > 0)
                     {
-                        trkpt.ascent  += delta;
+                        trkpt.ascent  += step;
                     }
                     else
                     {
-                        trkpt.descent -= delta;
+                        trkpt.descent -= step;
                     }
-                    lastEle = trkpt.ele;
+                    lastEle += step;
                 }
             }
 
@@ -1375,7 +1448,7 @@ void CGisItemTrk::combine(const QList<IGisItem::key_t>& keys)
     trk1->history.events.clear();
 
     // copy the segments of all tracks to new track
-    CGisWidget& gis = CGisWidget::self();
+    CGisWorkspace& gis = CGisWorkspace::self();
     for(const IGisItem::key_t &key : keys)
     {
         CGisItemTrk * trk2 = dynamic_cast<CGisItemTrk*>(gis.getItemByKey(key));
@@ -1633,6 +1706,87 @@ void CGisItemTrk::drawItem(QPainter& p, const QPolygonF& viewport, QList<QRectF>
         drawColorized(p);
     }
     // -------------------------
+
+    // draw min/max labels
+    if(CMainWindow::self().isMinMaxTrackValues())
+    {
+        if(!keyUserFocus.item.isEmpty() && (key != keyUserFocus))
+        {
+            return;
+        }
+
+        for(const QString& key : extrema.keys())
+        {
+            if(key == CKnownExtension::internalProgress)
+            {
+                continue;
+            }
+
+            const limits_t& limit = extrema[key];
+            QPointF posMin = limit.posMin * DEG_TO_RAD;
+            QPointF posMax = limit.posMax * DEG_TO_RAD;
+
+            gis->convertRad2Px(posMin);
+            gis->convertRad2Px(posMax);
+
+            p.setPen(Qt::white);
+            p.setBrush(Qt::darkGreen);
+            p.drawEllipse(posMin, 5, 5);
+            p.setBrush(Qt::darkRed);
+            p.drawEllipse(posMax, 5, 5);
+        }
+    }
+}
+
+static bool doesOverlap(const QList<QRectF>& blockedAreas, const QRectF& rect)
+{
+    for(const QRectF& r : blockedAreas)
+    {
+        if(r.intersects(rect))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+void CGisItemTrk::drawLimitLabels(limit_type_e type, const QString& label, const QPointF& pos, QPainter& p, const QFontMetricsF& fm, QList<QRectF>& blockedAreas)
+{
+    const QString& fullLabel = (type == eLimitTypeMin ? tr("min.") : tr("max.")) + " " + label;
+    QRectF rect = fm.boundingRect(fullLabel);
+    rect.moveBottomLeft(pos.toPoint() + QPoint(10,-10));
+    rect.adjust(-4,-2,4,2);
+
+    qint32 baseWidth    = 10;
+    qint32 basePos      = 10;
+
+
+    if(doesOverlap(blockedAreas, rect))
+    {
+        rect.moveBottomRight(pos.toPoint() + QPoint(-10,-10));
+        basePos = rect.width() - 10;
+
+        if(doesOverlap(blockedAreas, rect))
+        {
+            rect.moveTopLeft(pos.toPoint() + QPoint(10,10));
+            basePos = 10;
+
+            if(doesOverlap(blockedAreas, rect))
+            {
+                rect.moveTopRight(pos.toPoint() + QPoint(-10,10));
+                basePos = rect.width() - 10;
+
+                if(doesOverlap(blockedAreas, rect))
+                {
+                    return;
+                }
+            }
+        }
+    }
+
+    CDraw::bubble(p, rect.toRect(), pos.toPoint(), baseWidth, basePos, (key == keyUserFocus) ? CDraw::penBorderRed : CDraw::penBorderGray);
+    CDraw::text(fullLabel, p, rect.toRect(), type == eLimitTypeMin ? Qt::darkGreen : Qt::darkRed);
+    blockedAreas << rect;
 }
 
 void CGisItemTrk::setPen(QPainter& p, QPen& pen, quint32 flag) const
@@ -1936,9 +2090,39 @@ void CGisItemTrk::drawItem(QPainter& p, const QRectF& viewport, CGisDraw * gis)
     drawRange(p);
 }
 
-void CGisItemTrk::drawLabel(QPainter&, const QPolygonF&, QList<QRectF>&, const QFontMetricsF&, CGisDraw*)
+void CGisItemTrk::drawLabel(QPainter& p, const QPolygonF&, QList<QRectF>& blockedAreas, const QFontMetricsF& fm, CGisDraw* gis)
 {
-    // tracks don't have labels
+    if(!keyUserFocus.item.isEmpty() && (key != keyUserFocus))
+    {
+        return;
+    }
+
+    if(CMainWindow::self().isMinMaxTrackValues())
+    {
+        for(const QString& key : extrema.keys())
+        {
+            const CKnownExtension& ext = CKnownExtension::get(key);
+            const limits_t& limit = extrema[key];
+            QPointF posMin = limit.posMin * DEG_TO_RAD;
+            QPointF posMax = limit.posMax * DEG_TO_RAD;
+
+            gis->convertRad2Px(posMin);
+            gis->convertRad2Px(posMax);
+
+            QString labelMin = ext.toString(limit.min, true, key);
+            QString labelMax = ext.toString(limit.max, true, key);
+
+            if(!labelMin.isEmpty())
+            {
+                drawLimitLabels(eLimitTypeMin, labelMin, posMin, p, fm, blockedAreas);
+            }
+
+            if(!labelMax.isEmpty())
+            {
+                drawLimitLabels(eLimitTypeMax, labelMax, posMax, p, fm, blockedAreas);
+            }
+        }
+    }
 }
 
 
diff --git a/src/gis/trk/CGisItemTrk.h b/src/gis/trk/CGisItemTrk.h
index 5a1a27a..7ae6d17 100644
--- a/src/gis/trk/CGisItemTrk.h
+++ b/src/gis/trk/CGisItemTrk.h
@@ -32,6 +32,7 @@
 #include <functional>
 #include <interpolation.h>
 
+using std::numeric_limits;
 
 class QDomNode;
 class IGisProject;
@@ -96,12 +97,12 @@ public:
     CGisItemTrk(quint64 id, QSqlDatabase& db, IGisProject * project);
 
     /** @brief Clone QLandkarte GT track */
-    CGisItemTrk(const CQlgtTrack& trk1);
+    CGisItemTrk(const CQlgtTrack& trk1, IGisProject *project = nullptr);
 
     /** @brief Load track from file (e.g. TwoNav *trk) */
     CGisItemTrk(const QString& filename, IGisProject * project);
 
-    CGisItemTrk(const IQlgtOverlay& ovl);
+    CGisItemTrk(const IQlgtOverlay& ovl, IGisProject *project = nullptr);
 
     /**
        @brief Creates a new track via provided trkdata
@@ -206,6 +207,8 @@ public:
     /// get a progress summary for a selected track point
     QString getInfoProgress(const CTrackData::trkpt_t& pt) const;
 
+    QString getInfoLimits() const;
+
     quint32 getTotalElapsedSeconds()       const { return totalElapsedSeconds;       }
     quint32 getTotalElapsedSecondsMoving() const { return totalElapsedSecondsMoving; }
 
@@ -289,7 +292,6 @@ private:
     /**@}*/
 
 
-
 public:
     bool isRangeSelected() const;
 
@@ -338,7 +340,7 @@ public:
 
     void drawItem(QPainter& p, const QPolygonF& viewport, QList<QRectF>& blockedAreas, CGisDraw * gis) override;
     void drawItem(QPainter& p, const QRectF& viewport, CGisDraw * gis) override;
-    void drawLabel(QPainter&, const QPolygonF&, QList<QRectF>&, const QFontMetricsF&, CGisDraw*) override;
+    void drawLabel(QPainter&p, const QPolygonF&, QList<QRectF>&blockedAreas, const QFontMetricsF&fm, CGisDraw*gis) override;
     void drawHighlight(QPainter& p) override;
     void drawRange(QPainter& p);
 
@@ -597,8 +599,29 @@ private:
 public:
     struct limits_t
     {
-        qreal min;
-        qreal max;
+        void setMin(qreal val, const QPointF& pos)
+        {
+            if(min > val)
+            {
+                min     = val;
+                posMin  = pos;
+            }
+        }
+
+        void setMax(qreal val, const QPointF& pos)
+        {
+            if(max < val)
+            {
+                max     = val;
+                posMax  = pos;
+            }
+        }
+
+        qreal min     = numeric_limits<qreal>::max();
+        QPointF posMin  = NOPOINTF;
+
+        qreal max     = numeric_limits<qreal>::lowest();
+        QPointF posMax  = NOPOINTF;
     };
     /**@}*/
 
@@ -607,6 +630,13 @@ private:
     QHash<QString, limits_t> extrema;
     void updateExtremaAndExtensions();
 
+    enum limit_type_e
+    {
+        eLimitTypeMin
+        , eLimitTypeMax
+    };
+    void drawLimitLabels(limit_type_e type, const QString &label, const QPointF& pos, QPainter& p, const QFontMetricsF &fm, QList<QRectF> &blockedAreas);
+
     /**
        @brief Tell the point of focus to all plots and the detail dialog
 
@@ -717,7 +747,8 @@ private:
        \defgroup TrackStatistics Some statistical values over the complete track
      */
     /**@{*/
-    quint32 allValidFlags = 0;
+    quint32 allValidFlags   = 0;
+    qint32 cntInvalidPoints = 0;
     qint32 cntTotalPoints   = 0;
     qint32 cntVisiblePoints = 0;
     QDateTime timeStart;
diff --git a/src/gis/trk/CKnownExtension.cpp b/src/gis/trk/CKnownExtension.cpp
index d6c6ffc..270eb92 100644
--- a/src/gis/trk/CKnownExtension.cpp
+++ b/src/gis/trk/CKnownExtension.cpp
@@ -16,12 +16,14 @@
 
 **********************************************************************************************/
 
+
 #include "gis/trk/CKnownExtension.h"
 #include "units/IUnit.h"
 #include <QStringBuilder>
 
 const QString CKnownExtension::internalSlope    = "::ql:slope";
-const QString CKnownExtension::internalSpeed    = "::ql:speed";
+const QString CKnownExtension::internalSpeedDist    = "::ql:speeddist";
+const QString CKnownExtension::internalSpeedTime    = "::ql:speedtime";
 const QString CKnownExtension::internalEle      = "::ql:ele";
 const QString CKnownExtension::internalProgress = "::ql:progress";
 const QString CKnownExtension::internalTerrainSlope = "::ql:terrainslope";
@@ -52,6 +54,7 @@ bool CKnownExtension::registerNS(const QString &ns)
     return false;
 }
 
+
 void CKnownExtension::initGarminTPXv1(const IUnit &units, const QString &ns)
 {
     if(!registerNS(ns))
@@ -62,23 +65,23 @@ void CKnownExtension::initGarminTPXv1(const IUnit &units, const QString &ns)
     // support for the Garmin TrackPointExtension v1
     //  https://www8.garmin.com/xmlschemas/TrackPointExtensionv1.xsd
     knownExtensions.insert(ns % ":TrackPointExtension|" % ns % ":atemp",
-                           { tr("Air Temperature"), 0, -100., 100., 1., "°C", "://icons/32x32/CSrcATemp.png", true, false,
+                           { tr("Air Temp.", "extShortName"), tr("Air Temperature", "extLongName"), 0, -100., 100., 1., "°C", "://icons/32x32/CSrcATemp.png", true, false,
                              getExtensionValueFunc(ns % ":TrackPointExtension|" % ns % ":atemp")});
 
     knownExtensions.insert(ns % ":TrackPointExtension|" % ns % ":wtemp",
-                           { tr("Water Temperature"), 1, -100., 100., 1., "°C", "://icons/32x32/CSrcWTemp.png", true, false,
+                           { tr("Water Temp.", "extShortName"), tr("Water Temperature", "extLongName"), 1, -100., 100., 1., "°C", "://icons/32x32/CSrcWTemp.png", true, false,
                              getExtensionValueFunc(ns % ":TrackPointExtension|" % ns % ":wtemp")});
 
     knownExtensions.insert(ns % ":TrackPointExtension|" % ns % ":depth",
-                           { tr("Depth"), 2, 0., 12000., units.basefactor, units.baseunit, "://icons/32x32/CSrcDepth.png", true, false,
+                           { tr("Depth", "extShortName"), tr("Depth", "extLongName"), 2, 0., 12000., units.basefactor, units.baseunit, "://icons/32x32/CSrcDepth.png", true, false,
                              getExtensionValueFunc(ns % ":TrackPointExtension|" % ns % ":depth")});
 
     knownExtensions.insert(ns % ":TrackPointExtension|" % ns % ":hr",
-                           { tr("Heart Rate"), 3, 0., 300., 1., "bpm", "://icons/32x32/CSrcHR.png", true, false,
+                           { tr("Heart R.", "extShortName"), tr("Heart Rate", "extLongName"), 3, 0., 300., 1., "bpm", "://icons/32x32/CSrcHR.png", true, false,
                              getExtensionValueFunc(ns % ":TrackPointExtension|" % ns % ":hr")});
 
     knownExtensions.insert(ns % ":TrackPointExtension|" % ns % ":cad",
-                           { tr("Cadence"), 4, 0., 500., 1., "rpm", "://icons/32x32/CSrcCAD.png", true, false,
+                           { tr("Cadence", "extShortName"), tr("Cadence", "extLongName"), 4, 0., 500., 1., "rpm", "://icons/32x32/CSrcCAD.png", true, false,
                              getExtensionValueFunc(ns % ":TrackPointExtension|" % ns % ":cad")});
 }
 
@@ -86,59 +89,59 @@ void CKnownExtension::initMioTPX(const IUnit &units)
 {
     // support for extensions used by MIO Cyclo ver. 4.2 (who needs xml namespaces?!)
     knownExtensions.insert("heartrate",
-                           { tr("Heart Rate"), NOORDER, 0., 300., 1., "bpm", "://icons/32x32/CSrcHR.png", true, false,
+                           { tr("Heart R.", "extShortName"), tr("Heart Rate", "extLongName"), NOORDER, 0., 300., 1., "bpm", "://icons/32x32/CSrcHR.png", true, false,
                              getExtensionValueFunc("heartrate")});
 
     knownExtensions.insert("cadence",
-                           { tr("Cadence"), NOORDER, 0., 500., 1., "rpm", "://icons/32x32/CSrcCAD.png", true, false,
+                           { tr("Cadence", "extShortName"), tr("Cadence", "extLongName"), NOORDER, 0., 500., 1., "rpm", "://icons/32x32/CSrcCAD.png", true, false,
                              getExtensionValueFunc("cadence")});
 
     knownExtensions.insert("speed",
-                           { tr("Speed"), NOORDER, 0., 600., units.speedfactor, units.speedunit, "://icons/32x32/CSrcSpeed.png", true, false,
+                           { tr("Speed", "extShortName"), tr("Speed", "extLongName"), NOORDER, 0., 600., units.speedfactor, units.speedunit, "://icons/32x32/CSrcSpeed.png", true, false,
                              getExtensionValueFunc("speed")});
 
     knownExtensions.insert("acceleration",
-                           { tr("Acceleration"), NOORDER, std::numeric_limits<qreal>::lowest(), std::numeric_limits<qreal>::max(), units.basefactor, units.baseunit + "/s²", "://icons/32x32/CSrcAccel.png", true, false,
+                           { tr("Accel.", "extShortName"), tr("Acceleration", "extLongName"), NOORDER, std::numeric_limits<qreal>::lowest(), std::numeric_limits<qreal>::max(), units.basefactor, units.baseunit + "/s²", "://icons/32x32/CSrcAccel.png", true, false,
                              getExtensionValueFunc("acceleration")});
 
     knownExtensions.insert("course",
-                           { tr("Course"), NOORDER, -3.2, 3.2, 1., "rad", "://icons/32x32/CSrcCourse.png", true, false,
+                           { tr("Course", "extShortName"), tr("Course", "extLongName"), NOORDER, -3.2, 3.2, 1., "rad", "://icons/32x32/CSrcCourse.png", true, false,
                              getExtensionValueFunc("course")});
 }
 
 void CKnownExtension::initClueTrustTPXv1(const IUnit &units, const QString &ns)
 {
     knownExtensions.insert(ns % ":cadence",
-                           { tr("Cadence"), 0, 0., 500., 1., "rpm", "://icons/32x32/CSrcCAD.png", true, false,
+                           { tr("Cadence", "extShortName"), tr("Cadence", "extLongName"), 0, 0., 500., 1., "rpm", "://icons/32x32/CSrcCAD.png", true, false,
                              getExtensionValueFunc(ns % ":cadence")});
 
     knownExtensions.insert(ns % ":temp",
-                           { tr("Temperature"), 1, -100., 100., 1., "°C", "://icons/32x32/CSrcATemp.png", true, false,
+                           { tr("Temp.", "extShortName"), tr("Temperature", "extLongName"), 1, -100., 100., 1., "°C", "://icons/32x32/CSrcATemp.png", true, false,
                              getExtensionValueFunc(ns % ":temp")});
 
     knownExtensions.insert(ns % ":distance",
-                           { tr("Distance"), 2, 0., +100000000., units.basefactor, units.baseunit, "://icons/32x32/CSrcDistance.png", true, false,
+                           { tr("Dist.", "extShortName"), tr("Distance", "extLongName"), 2, 0., +100000000., units.basefactor, units.baseunit, "://icons/32x32/CSrcDistance.png", true, false,
                              getExtensionValueFunc(ns % ":distance") });
 
     knownExtensions.insert(ns % ":altitude",
-                           { tr("Elevation"), 3, -1000., +10000., units.basefactor, units.baseunit, "://icons/32x32/CSrcElevation.png", true, false,
+                           { tr("Ele.", "extShortName"), tr("Elevation", "extLongName"), 3, -1000., +10000., units.basefactor, units.baseunit, "://icons/32x32/CSrcElevation.png", true, false,
                              getExtensionValueFunc(ns % ":altitude") });
 
     knownExtensions.insert(ns % ":energy",
-                           { tr("Energy"), 4, 0., 10000., 1., "kcal/min", "://icons/32x32/CSrcEnergy.png", true, false,
+                           { tr("Energy", "extShortName"), tr("Energy", "extLongName"), 4, 0., 10000., 1., "kcal/min", "://icons/32x32/CSrcEnergy.png", true, false,
                              getExtensionValueFunc(ns % ":energy") });
 
 
     knownExtensions.insert(ns % ":seaLevelPressure",
-                           { tr("Sea Level Pressure"), 5, 0., 1500., 1., "hPa", "://icons/32x32/CSrcSeaLevelPressure.png", true, false,
+                           { tr("Sea Lev. Pres.", "extShortName"), tr("Sea Level Pressure", "extLongName"), 5, 0., 1500., 1., "hPa", "://icons/32x32/CSrcSeaLevelPressure.png", true, false,
                              getExtensionValueFunc(ns % ":seaLevelPressure") });
 
     knownExtensions.insert(ns % ":speed",
-                           { tr("Speed"), 6, 0., 600., units.speedfactor, units.speedunit, "://icons/32x32/CSrcSpeed.png", true, false,
+                           { tr("Speed", "extShortName"), tr("Speed", "extLongName"), 6, 0., 600., units.speedfactor, units.speedunit, "://icons/32x32/CSrcSpeed.png", true, false,
                              getExtensionValueFunc(ns % ":speed")});
 
     knownExtensions.insert(ns % ":verticalSpeed",
-                           { tr("Speed (vertical)"), 7, 0., 50., units.speedfactor, units.speedunit, "://icons/32x32/CSrcVertSpeed.png", true, false,
+                           { tr("v. Speed", "extShortName"), tr("Vertical Speed", "extLongName"), 7, 0., 50., units.speedfactor, units.speedunit, "://icons/32x32/CSrcVertSpeed.png", true, false,
                              getExtensionValueFunc(ns % ":verticalSpeed")});
 }
 
@@ -147,27 +150,32 @@ void CKnownExtension::init(const IUnit &units)
     knownExtensions =
     {
         {internalSlope,
-         { tr("Slope*"), -1, -90., 90., 1., "°", "://icons/32x32/CSrcSlope.png", true, true,
+         { tr("Slope", "extShortName"), tr("Slope*"), -1, -90., 90., 1., "°", "://icons/32x32/CSrcSlope.png", true, true,
            [](const CTrackData::trkpt_t &p) { return p.slope1; }}
         },
 
-        {internalSpeed,
-         { tr("Speed*"), -1, 0., 600., units.speedfactor, units.speedunit, "://icons/32x32/CSrcSpeed.png", true, true,
+        {internalSpeedDist,
+         { tr("Speed", "extShortName"), tr("Speed over Distance*", "extLongName"), -1, 0., 600., units.speedfactor, units.speedunit, "://icons/32x32/CSrcSpeed.png", true, true,
+           [](const CTrackData::trkpt_t &p) { return p.speed; }}
+        },
+
+        {internalSpeedTime,
+         { tr("Speed", "extShortName"), tr("Speed over Time*", "extLongName"), -1, 0., NOFLOAT, units.speedfactor, units.speedunit, "://icons/32x32/CSrcSpeed.png", true, true,
            [](const CTrackData::trkpt_t &p) { return p.speed; }}
         },
 
         {internalEle,
-         { tr("Elevation"), -1, 0., 100000., units.basefactor, units.baseunit, "://icons/32x32/CSrcElevation.png", true, true,
+         { tr("Ele.", "extShortName"), tr("Elevation*", "extLongName"), -1, 0., 100000., units.basefactor, units.baseunit, "://icons/32x32/CSrcElevation.png", true, true,
            [](const CTrackData::trkpt_t &p) { return (NOINT == p.ele) ? NOFLOAT : p.ele; }}
         },
 
         {internalProgress,
-         { tr("Progress"), -1, 0., NOFLOAT, units.basefactor, units.baseunit, "://icons/32x32/Progress.png", true, true,
+         { tr("Progress", "extShortName"), tr("Progress*", "extLongName"), -1, 0., NOFLOAT, units.basefactor, units.baseunit, "://icons/32x32/Progress.png", true, true,
            [](const CTrackData::trkpt_t &p) { return p.distance; }}
         },
 
         {internalTerrainSlope,
-         { tr("Terrain slope"), -1, 0, 90., 1., "°", "://icons/32x32/CSrcSlope.png", true, false,
+         { tr("Terr. Slope", "extShortName"), tr("Terrain Slope*", "extLongName"), -1, 0, 90., 1., "°", "://icons/32x32/CSrcSlope.png", true, false,
            getExtensionValueFunc(internalTerrainSlope)}
         }
     };
@@ -179,15 +187,66 @@ void CKnownExtension::init(const IUnit &units)
     initClueTrustTPXv1(units, "gpxdata");
 }
 
-const CKnownExtension CKnownExtension::get(const QString &name)
+const CKnownExtension CKnownExtension::get(const QString &key)
 {
-    CKnownExtension def("", NOORDER, -100000., 100000., 1., "", "://icons/32x32/CSrcUnknown.png", false, true,
-                        getExtensionValueFunc(name)
+    CKnownExtension def("", "", NOORDER, -100000., 100000., 1., "", "://icons/32x32/CSrcUnknown.png", false, true,
+                        getExtensionValueFunc(key)
                         );
-    return knownExtensions.value(name, def);
+    return knownExtensions.value(key, def);
+}
+
+bool CKnownExtension::isKnown(const QString &key)
+{
+    return knownExtensions.contains(key);
+}
+
+QString CKnownExtension::getName(const QString& altName) const
+{
+    bool hasNoName  = nameShortText.isEmpty();
+    QString name    = hasNoName ? altName : nameShortText;
+
+    if(derivedQMS && !hasNoName)
+    {
+        name += "*";
+    }
+
+    return name;
 }
 
-bool CKnownExtension::isKnown(const QString &name)
+QString CKnownExtension::toString(qreal value, bool withName, const QString &key) const
 {
-    return knownExtensions.contains(name);
+    QString str;
+    if(key == CKnownExtension::internalProgress)
+    {
+        return str;
+    }
+    else if(key.contains("speed"))
+    {
+        QString v, u;
+        IUnit::self().meter2speed(value, v, u);
+        str = v + u;
+    }
+    else if(key == CKnownExtension::internalEle)
+    {
+        QString v, u;
+        IUnit::self().meter2elevation(value, v, u);
+        str = v + u;
+    }
+    else if(key == CKnownExtension::internalSlope)
+    {
+        QString v, u;
+        IUnit::self().slope2string(value, v, u);
+        str = v + u;
+    }
+    else
+    {
+        str = QString("%1%2").arg(value * factor).arg(unit);
+    }
+
+    if(withName)
+    {
+        str = getName(key) + " " + str;
+    }
+
+    return str;
 }
diff --git a/src/gis/trk/CKnownExtension.h b/src/gis/trk/CKnownExtension.h
index 6fe5285..48600ae 100644
--- a/src/gis/trk/CKnownExtension.h
+++ b/src/gis/trk/CKnownExtension.h
@@ -43,7 +43,8 @@ public:
     static void initClueTrustTPXv1(const IUnit &units, const QString &ns);
 
     static const QString internalSlope;    //< name of internally derived slope
-    static const QString internalSpeed;    //< name of internally derived speed
+    static const QString internalSpeedDist;    //< name of internally derived speed over distance
+    static const QString internalSpeedTime;    //< name of internally derived speed over time
     static const QString internalEle;      //< name of internally derived elevation (DEM)
     static const QString internalProgress; //< name of internally derived progress
     static const QString internalTerrainSlope; //< name of internally derived terrain slope
@@ -60,10 +61,11 @@ public:
 
        @return a valid extension descriptor (for both known and unknown extensions)
      */
-    static const CKnownExtension get(const QString &name);
-    static bool isKnown(const QString &name);
+    static const CKnownExtension get(const QString &key);
+    static bool isKnown(const QString &key);
 
-    QString name;              //< userfriendly name ("Speed" "Heart Rate")
+    QString nameShortText;     //< short text name to display in GUI (ex. "Heart R." in y-axis)
+    QString nameLongText;      //< long text name to display in GUI (ex. Heart Rate" in ComboBox)
     int order;                 //< the order used for exporting ("relative position")
     qreal minimum;             //< hard (enforced) minimum, cannot go lower
     qreal maximum;             //< hard (enforced) maximum, cannot go higher
@@ -74,6 +76,27 @@ public:
     bool derivedQMS;           //< if set to true the value is derived by QMS (p.x. slope*)
     fTrkPtGetVal valueFunc;    //< the function used to retrieve the value
 
+    /**
+     * @brief Convert a value to a string
+
+       @param value         the value to convert
+       @param withName      set true to prepend the value with the extension's name
+       @param key           the key used to retrieve the extension via CKnownExtension::get()
+
+       @return A string.
+     */
+    QString toString(qreal value, bool withName, const QString& key) const;
+
+
+    /**
+       @brief Get the short name of the extension
+
+       @param altName alternative name if the extension does not have a short name
+
+       @return A string.
+     */
+    QString getName(const QString& altName) const;
+
 private:
 
     static bool registerNS(const QString &ns);
@@ -81,13 +104,13 @@ private:
     static QHash<QString, CKnownExtension> knownExtensions;
     static QSet<QString> registeredNS;
 
-    CKnownExtension(QString name,      int order,
+    CKnownExtension(QString nameShortText, QString nameLongText, int order,
                     qreal minimum,     qreal maximum,
                     qreal factor,      QString unit,
                     QString icon,      bool known,
                     bool derivedQMS,   fTrkPtGetVal valueFunc
                     )
-        : name(name), order(order), minimum(minimum), maximum(maximum), factor(factor),
+        : nameShortText(nameShortText), nameLongText(nameLongText), order(order), minimum(minimum), maximum(maximum), factor(factor),
         unit(unit), icon(icon), known(known), derivedQMS(derivedQMS), valueFunc(valueFunc)
     {
     }
diff --git a/src/gis/trk/CPropertyTrk.cpp b/src/gis/trk/CPropertyTrk.cpp
index 51471b1..6b6fd0b 100644
--- a/src/gis/trk/CPropertyTrk.cpp
+++ b/src/gis/trk/CPropertyTrk.cpp
@@ -38,6 +38,7 @@ void CPropertyTrk::setupData()
     {
         QString()
         , QString()
+        , QString()
         , QIcon()
         , property_t::eAxisDistance
         , nullptr
@@ -52,34 +53,46 @@ void CPropertyTrk::setupData()
     for(const QString &key : keys)
     {
         const CKnownExtension &ext = CKnownExtension::get(key);
-        QString name = (ext.known ? ext.name : key);
+        QString nameShortText = (ext.known ? ext.nameShortText : key);
+        QString nameLongText = (ext.known ? ext.nameLongText : key);
 
         property_t property
         {
             key
-            , name
+            , nameShortText
+            , nameLongText
             , QIcon(ext.icon)
             , property_t::eAxisDistance
             , [](const CTrackData::trkpt_t &p) { return p.distance; }
             , ext.unit
-            , ext.known ? QString("%1 [%2]").arg(name).arg(ext.unit) : name
+            , ext.known ? QString("%1 [%2]").arg(nameShortText).arg(ext.unit) : nameShortText
             , ext.factor
             , ext.valueFunc
         };
 
         // lame hack for properties off the usual scheme
-        if(key == CKnownExtension::internalProgress)
+        if((key == CKnownExtension::internalProgress) || (key == CKnownExtension::internalSpeedTime))
         {
             property.min        = 0;
             property.axisType   = property_t::eAxisTime;
             property.getX       = [](const CTrackData::trkpt_t &p) {return p.time.isValid() ? p.time.toTime_t() : NOFLOAT; };
         }
 
-        if(key == CKnownExtension::internalSpeed)
+        if(key == CKnownExtension::internalSpeedDist)
         {
             property.min        = 0;
         }
 
+        if(key == CKnownExtension::internalSlope)
+        {
+            qreal val;
+            QString unit;
+            IUnit::self().slope2unit(0, val, unit);
+            property.unit = unit;
+            property.yLabel = QString("%1 [%2]").arg(nameShortText).arg(unit);
+            property.getY = [](const CTrackData::trkpt_t &p) {qreal val; QString unit; IUnit::self().slope2unit(p.slope1, val, unit); return val; };
+        }
+
         properties << property;
     }
 }
@@ -108,14 +121,14 @@ void CPropertyTrk::fillComboBox(QComboBox * box) const
             // skip it as there is a dedicated profile plot
             continue;
         }
-        box->addItem(p.icon, p.name, p.key);
+        box->addItem(p.icon, p.nameLongText, p.key);
     }
 }
 
 void CPropertyTrk::setupPlot(CPlot * plot, const QString& source) const
 {
     const property_t& p = propBySource(source);
-    if(p.name.isEmpty())
+    if(p.nameLongText.isEmpty())
     {
         plot->clear();
         return;
diff --git a/src/gis/trk/CPropertyTrk.h b/src/gis/trk/CPropertyTrk.h
index d36f74e..ab666e2 100644
--- a/src/gis/trk/CPropertyTrk.h
+++ b/src/gis/trk/CPropertyTrk.h
@@ -44,7 +44,8 @@ public:
 
         property_t() = default;
         property_t(const QString& key,
-                   const QString& name,
+                   const QString& nameShortText,
+                   const QString& nameLongText,
                    const QIcon& icon,
                    axistype_e axisType,
                    fTrkPtGetVal getX,
@@ -53,7 +54,8 @@ public:
                    qreal factor,
                    fTrkPtGetVal getY)
             : key(key)
-            , name(name)
+            , nameShortText(nameShortText)
+            , nameLongText(nameLongText)
             , icon(icon)
             , axisType(axisType)
             , getX(getX)
@@ -66,8 +68,9 @@ public:
 
         // key/extension source of the property
         QString key;
-        // name of the property
-        QString name;
+        // long and short name of the property
+        QString nameShortText;
+        QString nameLongText;
         // symbol representing the property
         QIcon icon;
 
diff --git a/src/gis/trk/CScrOptTrk.cpp b/src/gis/trk/CScrOptTrk.cpp
index 5af35df..852364d 100644
--- a/src/gis/trk/CScrOptTrk.cpp
+++ b/src/gis/trk/CScrOptTrk.cpp
@@ -17,7 +17,7 @@
 **********************************************************************************************/
 
 #include "CMainWindow.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/prj/IGisProject.h"
 #include "gis/trk/CGisItemTrk.h"
 #include "gis/trk/CScrOptTrk.h"
@@ -92,55 +92,55 @@ CScrOptTrk::~CScrOptTrk()
 
 void CScrOptTrk::slotDelete()
 {
-    CGisWidget::self().delItemByKey(key);
+    CGisWorkspace::self().delItemByKey(key);
     deleteLater();
 }
 
 void CScrOptTrk::slotCopy()
 {
-    CGisWidget::self().copyItemByKey(key);
+    CGisWorkspace::self().copyItemByKey(key);
     deleteLater();
 }
 
 void CScrOptTrk::slotEditDetails()
 {
-    CGisWidget::self().editItemByKey(key);
+    CGisWorkspace::self().editItemByKey(key);
     deleteLater();
 }
 
 void CScrOptTrk::slotProfile(bool on)
 {
-    CGisWidget::self().focusTrkByKey(on, key);
+    CGisWorkspace::self().focusTrkByKey(on, key);
     deleteLater();
 }
 
 void CScrOptTrk::slotCut()
 {
-    CGisWidget::self().cutTrkByKey(key);
+    CGisWorkspace::self().cutTrkByKey(key);
     deleteLater();
 }
 
 void CScrOptTrk::slotEdit()
 {
-    CGisWidget::self().editTrkByKey(key);
+    CGisWorkspace::self().editTrkByKey(key);
     deleteLater();
 }
 
 void CScrOptTrk::slotReverse()
 {
-    CGisWidget::self().reverseTrkByKey(key);
+    CGisWorkspace::self().reverseTrkByKey(key);
     deleteLater();
 }
 
 void CScrOptTrk::slotCombine()
 {
-    CGisWidget::self().combineTrkByKey(key);
+    CGisWorkspace::self().combineTrkByKey(key);
     deleteLater();
 }
 
 void CScrOptTrk::slotRange()
 {
-    CGisWidget::self().rangeTrkByKey(key);
+    CGisWorkspace::self().rangeTrkByKey(key);
     deleteLater();
 }
 
@@ -148,19 +148,19 @@ void CScrOptTrk::slotActivity()
 {
     QList<IGisItem::key_t> keys;
     keys << key;
-    CGisWidget::self().activityTrkByKey(keys);
+    CGisWorkspace::self().activityTrkByKey(keys);
     deleteLater();
 }
 
 void CScrOptTrk::slotCopyWithWpt()
 {
-    CGisWidget::self().copyTrkWithWptByKey(key);
+    CGisWorkspace::self().copyTrkWithWptByKey(key);
     deleteLater();
 }
 
 void CScrOptTrk::draw(QPainter& p)
 {
-    IGisItem * item = CGisWidget::self().getItemByKey(key);
+    IGisItem * item = CGisWorkspace::self().getItemByKey(key);
     if(nullptr == item)
     {
         QWidget::deleteLater();
diff --git a/src/gis/trk/CTableTrk.cpp b/src/gis/trk/CTableTrk.cpp
index 6102ab1..b1e64fd 100644
--- a/src/gis/trk/CTableTrk.cpp
+++ b/src/gis/trk/CTableTrk.cpp
@@ -122,7 +122,7 @@ void CTableTrk::updateData()
         if(trkpt.ele != NOINT)
         {
             IUnit::self().meter2elevation(trkpt.ele, val, unit);
-            item->setText(eColEle, tr("%1 %2").arg(val).arg(unit));
+            item->setText(eColEle, tr("%1%2").arg(val).arg(unit));
         }
         else
         {
@@ -130,31 +130,31 @@ void CTableTrk::updateData()
         }
 
         IUnit::self().meter2distance(trkpt.deltaDistance, val, unit);
-        item->setText(eColDelta, tr("%1 %2").arg(val).arg(unit));
+        item->setText(eColDelta, tr("%1%2").arg(val).arg(unit));
 
         IUnit::self().meter2distance(trkpt.distance, val, unit);
-        item->setText(eColDist, tr("%1 %2").arg(val).arg(unit));
+        item->setText(eColDist, tr("%1%2").arg(val).arg(unit));
 
         if(trkpt.speed != NOFLOAT)
         {
             IUnit::self().meter2speed(trkpt.speed, val, unit);
-            item->setText(eColSpeed, tr("%1 %2").arg(val).arg(unit));
+            item->setText(eColSpeed, tr("%1%2").arg(val).arg(unit));
         }
         else
         {
             item->setText(eColSpeed, "-");
         }
 
-        item->setText(eColSlope,
-                      (trkpt.slope1 != NOFLOAT)
-                      ? QString("%1%3(%2%)").arg(trkpt.slope1, 2, 'f', 0).arg(trkpt.slope2, 2, 'f', 0).arg(QChar(0x00b0))
+        IUnit::self().slope2string(trkpt.slope1, val, unit);
+        item->setText(eColSlope, (trkpt.slope1 != NOFLOAT)
+                      ? QString("%1%2").arg(val).arg(unit)
                       : "-"
                       );
 
         IUnit::self().meter2elevation(trkpt.ascent, val, unit);
-        item->setText(eColAscent, tr("%1 %2").arg(val).arg(unit));
+        item->setText(eColAscent, tr("%1%2").arg(val).arg(unit));
         IUnit::self().meter2elevation(trkpt.descent, val, unit);
-        item->setText(eColDescent, tr("%1 %2").arg(val).arg(unit));
+        item->setText(eColDescent, tr("%1%2").arg(val).arg(unit));
 
         // position
         QString str;
diff --git a/src/gis/trk/filter/CFilterDeleteExtension.cpp b/src/gis/trk/filter/CFilterDeleteExtension.cpp
index c87a46a..1d08036 100644
--- a/src/gis/trk/filter/CFilterDeleteExtension.cpp
+++ b/src/gis/trk/filter/CFilterDeleteExtension.cpp
@@ -44,7 +44,7 @@ void CFilterDeleteExtension::update()
         if(!ext.derivedQMS)
         {
             QIcon icon(ext.icon);
-            comboExtensions->addItem(icon, ext.known ? ext.name : key, key);
+            comboExtensions->addItem(icon, ext.known ? ext.nameLongText : key, key);
         }
     }
 
diff --git a/src/gis/trk/filter/filter.cpp b/src/gis/trk/filter/filter.cpp
index c9c82b3..3878e4d 100644
--- a/src/gis/trk/filter/filter.cpp
+++ b/src/gis/trk/filter/filter.cpp
@@ -19,7 +19,7 @@
 
 #include "CMainWindow.h"
 #include "GeoMath.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/trk/CGisItemTrk.h"
 #include "gis/trk/CKnownExtension.h"
 #include "gis/trk/CPropertyTrk.h"
@@ -348,7 +348,7 @@ void CGisItemTrk::filterSpeed(qreal speed)
 
 void CGisItemTrk::filterSplitSegment()
 {
-    IGisProject * project = CGisWidget::self().selectProject();
+    IGisProject * project = CGisWorkspace::self().selectProject();
     if(nullptr == project)
     {
         return;
@@ -380,7 +380,7 @@ void CGisItemTrk::filterDeleteExtension(const QString &extStr)
     propHandler->setupData();
 
     const CKnownExtension &ext = CKnownExtension::get(extStr);
-    changed(tr("Removed extension %1 from all Track Points").arg(ext.name), "://icons/48x48/FilterModifyExtension.png");
+    changed(tr("Removed extension %1 from all Track Points").arg(ext.nameLongText), "://icons/48x48/FilterModifyExtension.png");
 }
 
 void CGisItemTrk::filterSubPt2Pt()
diff --git a/src/gis/wpt/CGisItemWpt.cpp b/src/gis/wpt/CGisItemWpt.cpp
index add2162..6361146 100644
--- a/src/gis/wpt/CGisItemWpt.cpp
+++ b/src/gis/wpt/CGisItemWpt.cpp
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -27,6 +28,7 @@
 #include "gis/wpt/CDetailsWpt.h"
 #include "gis/wpt/CGisItemWpt.h"
 #include "gis/wpt/CScrOptWpt.h"
+#include "gis/wpt/CScrOptWptRadius.h"
 #include "gis/wpt/CSetupNewWpt.h"
 #include "helpers/CDraw.h"
 #include "helpers/CSettings.h"
@@ -48,7 +50,7 @@ CGisItemWpt::CGisItemWpt(const QPointF &pos, qreal ele, const QDateTime &time, c
     wpt.ele     = (ele == NOFLOAT) ? NOINT : qRound(ele);
     wpt.time    = time;
 
-    boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
+    detBoundingRect();
 
     setupHistory();
     updateDecoration(eMarkNone, eMarkNone);
@@ -62,7 +64,7 @@ CGisItemWpt::CGisItemWpt(const QPointF& pos, const QString& name, const QString
     qreal ele = CMainWindow::self().getElevationAt(pos * DEG_TO_RAD);
     wpt.ele = (ele == NOFLOAT) ? NOINT : qRound(ele);
 
-    boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
+    detBoundingRect();
 
     setupHistory();
     updateDecoration(eMarkChanged, eMarkNone);
@@ -84,7 +86,7 @@ CGisItemWpt::CGisItemWpt(const QPointF& pos, const CGisItemWpt& parentWpt, IGisP
     qreal ele = CMainWindow::self().getElevationAt(pos * DEG_TO_RAD);
     wpt.ele = (ele == NOFLOAT) ? NOINT : qRound(ele);
 
-    boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
+    detBoundingRect();
 
     setupHistory();
     updateDecoration(eMarkChanged, eMarkNone);
@@ -114,7 +116,7 @@ CGisItemWpt::CGisItemWpt(const CGisItemWpt &parentWpt, IGisProject *project, int
         flags &= ~eFlagWriteAllowed;
     }
 
-    boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
+    detBoundingRect();
     updateDecoration(eMarkChanged, eMarkNone);
 }
 
@@ -123,7 +125,7 @@ CGisItemWpt::CGisItemWpt(const QDomNode &xml, IGisProject *project)
     : IGisItem(project, eTypeWpt, project->childCount())
 {
     readGpx(xml);
-    boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
+    detBoundingRect();
 
     genKey();
     setupHistory();
@@ -135,7 +137,7 @@ CGisItemWpt::CGisItemWpt(const history_t& hist, const QString &dbHash, IGisProje
 {
     history = hist;
     loadHistory(hist.histIdxCurrent);
-    boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
+    detBoundingRect();
     if(!dbHash.isEmpty())
     {
         lastDatabaseHash = dbHash;
@@ -146,14 +148,14 @@ CGisItemWpt::CGisItemWpt(quint64 id, QSqlDatabase& db, IGisProject * project)
     : IGisItem(project, eTypeWpt, NOIDX)
 {
     loadFromDb(id, db);
-    boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
+    detBoundingRect();
 }
 
 CGisItemWpt::CGisItemWpt(const CTwoNavProject::wpt_t &tnvWpt, IGisProject * project)
     : IGisItem(project, eTypeWpt, NOIDX)
 {
     readTwoNav(tnvWpt);
-    boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
+    detBoundingRect();
 
     genKey();
     setupHistory();
@@ -166,7 +168,7 @@ CGisItemWpt::CGisItemWpt(CFitStream& stream, IGisProject * project)
     , posScreen(NOPOINTF)
 {
     readWptFromFit(stream);
-    boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
+    detBoundingRect();
 
     genKey();
     setupHistory();
@@ -216,7 +218,7 @@ bool CGisItemWpt::getNewWptData(QPointF& pt, QString& icon, QString& name)
         {
             lastName = QString::number(lastName.toInt() + 1);
         }
-        else
+        else if(idx < s)
         {
             lastName = lastName.left(idx) + QString::number(lastName.mid(idx).toInt() + 1);
         }
@@ -272,7 +274,7 @@ QString CGisItemWpt::getInfo(quint32 feature) const
         }
         QString val, unit;
         IUnit::self().meter2elevation(wpt.ele, val, unit);
-        str += tr("Elevation: %1 %2").arg(val).arg(unit);
+        str += tr("Elevation: %1%2").arg(val).arg(unit); // KKA
     }
 
     if(proximity != NOFLOAT)
@@ -283,7 +285,7 @@ QString CGisItemWpt::getInfo(quint32 feature) const
         }
         QString val, unit;
         IUnit::self().meter2distance(proximity, val, unit);
-        str += tr("Proximity: %1 %2").arg(val).arg(unit);
+        str += tr("Proximity: %1%2").arg(val).arg(unit);
     }
 
     QString desc = removeHtml(wpt.desc).simplified();
@@ -326,11 +328,35 @@ QString CGisItemWpt::getInfo(quint32 feature) const
 
 IScrOpt * CGisItemWpt::getScreenOptions(const QPoint& origin, IMouse * mouse)
 {
-    if(scrOpt.isNull())
+    if (closeToRadius)
+    {
+        if(scrOptRadius.isNull())
+        {
+            scrOptRadius = new CScrOptWptRadius(this, origin, mouse);
+        }
+        return scrOptRadius;
+    }
+    else
     {
-        scrOpt = new CScrOptWpt(this, origin, mouse);
+        if(scrOptWpt.isNull())
+        {
+            scrOptWpt = new CScrOptWpt(this, origin, mouse);
+        }
+        return scrOptWpt;
+    }
+}
+
+QPointF CGisItemWpt::getPointCloseBy(const QPoint& point)
+{
+    if (closeToRadius)
+    {
+        QPointF l = (QPointF(point) - posScreen);
+        return posScreen + l * (radius / sqrt(QPointF::dotProduct(l,l)));
+    }
+    else
+    {
+        return posScreen;
     }
-    return scrOpt;
 }
 
 void CGisItemWpt::setIcon()
@@ -363,7 +389,7 @@ void CGisItemWpt::setPosition(const QPointF& pos)
     wpt.lon = pos.x();
     wpt.lat = pos.y();
 
-    boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
+    detBoundingRect();
 
     changed(tr("Changed position"),"://icons/48x48/WptMove.png");
 }
@@ -376,8 +402,20 @@ void CGisItemWpt::setElevation(qint32 val)
 
 void CGisItemWpt::setProximity(qreal val)
 {
-    proximity = val;
-    changed(tr("Changed proximity"),"://icons/48x48/WptProx.png");
+    proximity = val == NOFLOAT ? val : qRound(val);
+
+    detBoundingRect();
+
+    radius = NOFLOAT; //radius is proximity in set on redraw
+
+    if (proximity == NOFLOAT)
+    {
+        changed(tr("Removed proximity"),"://icons/48x48/WptDelProx.png");
+    }
+    else
+    {
+        changed(tr("Changed proximity"),"://icons/48x48/WptEditProx.png");
+    }
 }
 
 void CGisItemWpt::setIcon(const QString& name)
@@ -427,12 +465,25 @@ void CGisItemWpt::addImage(const image_t& img)
 
 bool CGisItemWpt::isCloseTo(const QPointF& pos)
 {
+    closeToRadius = false;
+
     if(posScreen == NOPOINTF)
     {
         return false;
     }
 
-    return (pos - posScreen).manhattanLength() < 22;
+    QPointF dist = (pos - posScreen);
+    if(dist.manhattanLength() < 22)
+    {
+        return true;
+    }
+    if (radius == NOFLOAT)
+    {
+        return false;
+    }
+
+    closeToRadius = abs(QPointF::dotProduct(dist,dist)/radius - radius) < 22;
+    return closeToRadius;
 }
 
 bool CGisItemWpt::isWithin(const QRectF& area, selflags_t flags)
@@ -463,35 +514,32 @@ void CGisItemWpt::edit()
 void CGisItemWpt::drawItem(QPainter& p, const QPolygonF& viewport, QList<QRectF> &blockedAreas, CGisDraw *gis)
 {
     posScreen = QPointF(wpt.lon * DEG_TO_RAD, wpt.lat * DEG_TO_RAD);
-    if(!isVisible(posScreen, viewport, gis))
+
+    if (proximity == NOFLOAT || proximity == 0. ? !isVisible(posScreen, viewport, gis) : !isVisible(boundingRect, viewport, gis))
     {
         rectBubble  = QRect();
         posScreen   = NOPOINTF;
         return;
     }
-    gis->convertRad2Px(posScreen);
 
-    drawBubble(p);
-
-    p.drawPixmap(posScreen - focus, icon);
+    gis->convertRad2Px(posScreen);
 
-    if(proximity != NOFLOAT)
+    if(proximity == NOFLOAT)
     {
-        QPointF pt1(wpt.lon * DEG_TO_RAD, wpt.lat * DEG_TO_RAD);
-        pt1 = GPS_Math_Wpt_Projection(pt1, proximity, 90 * DEG_TO_RAD);
-        gis->convertRad2Px(pt1);
-
-        qreal r = pt1.x() - posScreen.x();
+        radius = NOFLOAT;
+    }
+    else
+    {
+        //remember radius for isCloseTo-method
+        radius = calcRadius(QPointF(wpt.lon * DEG_TO_RAD, wpt.lat * DEG_TO_RAD),posScreen,proximity,gis);
 
-        p.save();
-        p.setBrush(Qt::NoBrush);
-        p.setPen(QPen(Qt::white,3));
-        p.drawEllipse(QRect(posScreen.x() - r - 1, posScreen.y() - r - 1, 2*r + 1, 2*r + 1));
-        p.setPen(QPen(Qt::red,1));
-        p.drawEllipse(QRect(posScreen.x() - r - 1, posScreen.y() - r - 1, 2*r + 1, 2*r + 1));
-        p.restore();
+        drawCircle(p, posScreen, radius, !hideArea && isNogoArea(), false);
     }
 
+    drawBubble(p);
+
+    p.drawPixmap(posScreen - focus, icon);
+
     blockedAreas << QRectF(posScreen - focus, icon.size());
 }
 
@@ -572,7 +620,14 @@ void CGisItemWpt::drawHighlight(QPainter& p)
         return;
     }
 
-    p.drawImage(posScreen - QPointF(31,31), QImage("://cursors/wptHighlightRed.png"));
+    if (closeToRadius)
+    {
+        drawCircle(p, posScreen, radius, isNogoArea(), true);
+    }
+    else
+    {
+        p.drawImage(posScreen - QPointF(31,31), QImage("://cursors/wptHighlightRed.png"));
+    }
 }
 
 void CGisItemWpt::drawBubble(QPainter& p)
@@ -620,6 +675,38 @@ void CGisItemWpt::drawBubble(QPainter& p)
     p.restore();
 }
 
+void CGisItemWpt::drawCircle(QPainter& p, const QPointF& pos, const qreal& r, const bool& filled, const bool& selected)
+{
+    QRect circle(pos.x() - r - 1, pos.y() - r - 1, 2*r + 1, 2*r + 1);
+    p.save();
+    p.setBrush(Qt::NoBrush);
+    if (selected)
+    {
+        p.setPen(QPen(Qt::red,3));
+    }
+    else
+    {
+        p.setPen(QPen(Qt::white,3));
+        p.drawEllipse(circle);
+        p.setPen(QPen(Qt::red,1));
+    }
+    if (filled)
+    {
+        p.setBrush(QBrush(Qt::red,Qt::DiagCrossPattern));
+    }
+    p.drawEllipse(circle);
+    p.restore();
+}
+
+qreal CGisItemWpt::calcRadius(const QPointF& posRad, const QPointF& posPx, const qreal& radiusRad, CGisDraw *gis)
+{
+    QPointF pt1 = posRad;
+    pt1 = GPS_Math_Wpt_Projection(pt1, radiusRad, 90 * DEG_TO_RAD);
+    gis->convertRad2Px(pt1);
+
+    return pt1.x() - posPx.x();
+}
+
 QPolygonF CGisItemWpt::makePolyline(const QPointF& anchor, const QRectF& r)
 {
     QPolygonF poly1, poly2;
@@ -782,6 +869,20 @@ void CGisItemWpt::toggleBubble()
     updateHistory();
 }
 
+void CGisItemWpt::toggleNogoArea()
+{
+    if(flags & eFlagWptNogo)
+    {
+        flags &= ~eFlagWptNogo;
+        changed(tr("Changed to proximity-radius"),"://icons/48x48/WptProx.png");
+    }
+    else
+    {
+        flags |= eFlagWptNogo;
+        changed(tr("Changed to nogo-area"),"://icons/48x48/WptAvoid.png");
+    }
+}
+
 bool CGisItemWpt::processMouseOverBubble(const QPoint &pos)
 {
     CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
@@ -827,3 +928,21 @@ bool CGisItemWpt::processMouseOverBubble(const QPoint &pos)
 
     return false;
 }
+
+void CGisItemWpt::detBoundingRect()
+{
+    if(proximity == NOFLOAT)
+    {
+        boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
+    }
+    else
+    {
+        qreal diag = proximity * 1.414213562;
+        QPointF cent(wpt.lon * DEG_TO_RAD, wpt.lat * DEG_TO_RAD);
+
+        QPointF pt1 = GPS_Math_Wpt_Projection(cent, diag, 225 * DEG_TO_RAD);
+        QPointF pt2 = GPS_Math_Wpt_Projection(cent, diag, 45 * DEG_TO_RAD);
+
+        boundingRect = QRectF(pt1,pt2);
+    }
+}
diff --git a/src/gis/wpt/CGisItemWpt.h b/src/gis/wpt/CGisItemWpt.h
index 62a4b82..59cbf7c 100644
--- a/src/gis/wpt/CGisItemWpt.h
+++ b/src/gis/wpt/CGisItemWpt.h
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -28,6 +29,7 @@
 class IGisProject;
 class QDomNode;
 class CScrOptWpt;
+class CScrOptWptRadius;
 class QSqlDatabase;
 class CQlgtWpt;
 class QTextEdit;
@@ -138,7 +140,7 @@ public:
      */
     CGisItemWpt(const CTwoNavProject::wpt_t& tnvWpt, IGisProject * project);
 
-    CGisItemWpt(const CQlgtWpt& wpt1);
+    CGisItemWpt(const CQlgtWpt& wpt1, IGisProject *project = nullptr);
 
     CGisItemWpt(CFitStream& stream, IGisProject * project);
 
@@ -276,10 +278,7 @@ public:
 
     IScrOpt* getScreenOptions(const QPoint &origin, IMouse * mouse) override;
 
-    QPointF getPointCloseBy(const QPoint& ) override
-    {
-        return posScreen;
-    }
+    QPointF getPointCloseBy(const QPoint& point) override;
 
     void drawItem(QPainter& p, const QPolygonF& viewport, QList<QRectF>& blockedAreas, CGisDraw * gis) override;
     void drawItem(QPainter& p, const QRectF& viewport, CGisDraw * gis) override;
@@ -294,6 +293,23 @@ public:
     {
         return geocache.hasData;
     }
+
+    void toggleNogoArea();
+    bool isNogoArea()
+    {
+        return bool(flags & eFlagWptNogo);
+    }
+
+    bool hasRadius()
+    {
+        return proximity < NOFLOAT;
+    }
+
+    qreal getRadius()
+    {
+        return radius;
+    }
+
     void gainUserFocus(bool yes) override;
 
     void edit() override;
@@ -315,9 +331,15 @@ public:
         return bool(flags & eFlagWptBubble);
     }
 
-    static bool getNewWptData(QPointF& pt, QString& icon, QString& name);
+    void setHideArea(bool hide)
+    {
+        hideArea = hide;
+    }
 
+    static bool getNewWptData(QPointF& pt, QString& icon, QString& name);
 
+    static void drawCircle(QPainter& p, const QPointF& pos, const qreal& r, const bool &avoid, const bool &selected);
+    static qreal calcRadius(const QPointF& posRad, const QPointF& posPx, const qreal& radiusRad, CGisDraw *gis);
 
 private:
     void setIcon();
@@ -330,12 +352,16 @@ private:
     void drawBubble(QPainter& p);
     QPolygonF makePolyline(const QPointF& anchor, const QRectF& r);
     bool processMouseOverBubble(const QPoint &pos);
+    void detBoundingRect();
 
     static key_t keyUserFocus;
 
     // --- start all waypoint data ----
     wpt_t wpt;
     qreal proximity = NOFLOAT;
+    qreal radius = NOFLOAT;
+    bool closeToRadius = false;
+    bool hideArea = false;
     geocache_t geocache;
     QList<image_t> images;
 
@@ -346,7 +372,8 @@ private:
 
     // --- stop all waypoint data ----
 
-    QPointer<CScrOptWpt> scrOpt;
+    QPointer<CScrOptWpt> scrOptWpt;
+    QPointer<CScrOptWptRadius> scrOptRadius;
 
     bool doBubble          = false;
     bool doSpecialCursor   = false;
diff --git a/src/gis/wpt/CScrOptWpt.cpp b/src/gis/wpt/CScrOptWpt.cpp
index 6f25385..0f04ef9 100644
--- a/src/gis/wpt/CScrOptWpt.cpp
+++ b/src/gis/wpt/CScrOptWpt.cpp
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -19,7 +20,7 @@
 
 #include "CMainWindow.h"
 #include "canvas/CCanvas.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/wpt/CGisItemWpt.h"
 #include "gis/wpt/CProjWpt.h"
 #include "gis/wpt/CScrOptWpt.h"
@@ -42,24 +43,31 @@ CScrOptWpt::CScrOptWpt(CGisItemWpt *wpt, const QPoint& point, IMouse *parent)
     toolMove->setDisabled(wpt->isGeocache() || wpt->isOnDevice());
     photoAlbum->reload(wpt->getImages());
     toolBubble->setChecked(wpt->hasBubble());
+    bool radius = wpt->hasRadius();
+    toolNogoArea->setEnabled(radius);
+    toolNogoArea->setChecked(radius && wpt->isNogoArea());
+    toolDelRadius->setEnabled(radius);
 
     anchor = wpt->getPointCloseBy(point);
     move(anchor.toPoint() + QPoint(-width()/2,SCR_OPT_OFFSET));
     show();
 
-    connect(toolDelete, &QToolButton::clicked, this, &CScrOptWpt::hide);
-    connect(toolEdit,   &QToolButton::clicked, this, &CScrOptWpt::hide);
-    connect(toolCopy,   &QToolButton::clicked, this, &CScrOptWpt::hide);
-    connect(toolMove,   &QToolButton::clicked, this, &CScrOptWpt::hide);
-    connect(toolProj,   &QToolButton::clicked, this, &CScrOptWpt::hide);
-    connect(toolBubble, &QToolButton::clicked, this, &CScrOptWpt::hide);
-
-    connect(toolDelete, &QToolButton::clicked, this, &CScrOptWpt::slotDelete);
-    connect(toolEdit,   &QToolButton::clicked, this, &CScrOptWpt::slotEdit);
-    connect(toolCopy,   &QToolButton::clicked, this, &CScrOptWpt::slotCopy);
-    connect(toolMove,   &QToolButton::clicked, this, &CScrOptWpt::slotMove);
-    connect(toolProj,   &QToolButton::clicked, this, &CScrOptWpt::slotProj);
-    connect(toolBubble, &QToolButton::clicked, this, &CScrOptWpt::slotBubble);
+    connect(toolDelete,     &QToolButton::clicked, this, &CScrOptWpt::hide);
+    connect(toolEdit,       &QToolButton::clicked, this, &CScrOptWpt::hide);
+    connect(toolCopy,       &QToolButton::clicked, this, &CScrOptWpt::hide);
+    connect(toolMove,       &QToolButton::clicked, this, &CScrOptWpt::hide);
+    connect(toolProj,       &QToolButton::clicked, this, &CScrOptWpt::hide);
+    connect(toolBubble,     &QToolButton::clicked, this, &CScrOptWpt::hide);
+
+    connect(toolDelete,     &QToolButton::clicked, this, &CScrOptWpt::slotDelete);
+    connect(toolEdit,       &QToolButton::clicked, this, &CScrOptWpt::slotEdit);
+    connect(toolCopy,       &QToolButton::clicked, this, &CScrOptWpt::slotCopy);
+    connect(toolMove,       &QToolButton::clicked, this, &CScrOptWpt::slotMove);
+    connect(toolProj,       &QToolButton::clicked, this, &CScrOptWpt::slotProj);
+    connect(toolBubble,     &QToolButton::clicked, this, &CScrOptWpt::slotBubble);
+    connect(toolDelRadius,  &QToolButton::clicked, this, &CScrOptWpt::slotDeleteRadius);
+    connect(toolNogoArea,   &QToolButton::clicked, this, &CScrOptWpt::slotNogoArea);
+    connect(toolEditRadius, &QToolButton::clicked, this, &CScrOptWpt::slotEditRadius);
 
     adjustSize();
 }
@@ -70,43 +78,61 @@ CScrOptWpt::~CScrOptWpt()
 
 void CScrOptWpt::slotDelete()
 {
-    CGisWidget::self().delItemByKey(key);
+    CGisWorkspace::self().delItemByKey(key);
     deleteLater();
 }
 
 void CScrOptWpt::slotEdit()
 {
-    CGisWidget::self().editItemByKey(key);
+    CGisWorkspace::self().editItemByKey(key);
     deleteLater();
 }
 
 void CScrOptWpt::slotCopy()
 {
-    CGisWidget::self().copyItemByKey(key);
+    CGisWorkspace::self().copyItemByKey(key);
     deleteLater();
 }
 
 void CScrOptWpt::slotMove()
 {
-    CGisWidget::self().moveWptByKey(key);
+    CGisWorkspace::self().moveWptByKey(key);
     deleteLater();
 }
 
 void CScrOptWpt::slotProj()
 {
-    CGisWidget::self().projWptByKey(key);
+    CGisWorkspace::self().projWptByKey(key);
     deleteLater();
 }
 
 void CScrOptWpt::slotBubble()
 {
-    CGisWidget::self().toggleWptBubble(key);
+    CGisWorkspace::self().toggleWptBubble(key);
+    deleteLater();
+}
+
+void CScrOptWpt::slotDeleteRadius()
+{
+    CGisWorkspace::self().deleteWptRadius(key);
+    deleteLater();
+}
+
+void CScrOptWpt::slotNogoArea()
+{
+    CGisWorkspace::self().toggleWptNogoArea(key);
+    deleteLater();
+}
+
+void CScrOptWpt::slotEditRadius()
+{
+    CGisWorkspace::self().editWptRadius(key);
     deleteLater();
 }
 
 void CScrOptWpt::draw(QPainter& p)
 {
-    IGisItem * item = CGisWidget::self().getItemByKey(key);
+    IGisItem * item = CGisWorkspace::self().getItemByKey(key);
     if(nullptr == item)
     {
         deleteLater();
diff --git a/src/gis/wpt/CScrOptWpt.h b/src/gis/wpt/CScrOptWpt.h
index 34de118..7e0968b 100644
--- a/src/gis/wpt/CScrOptWpt.h
+++ b/src/gis/wpt/CScrOptWpt.h
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -44,6 +45,9 @@ private slots:
     void slotMove();
     void slotProj();
     void slotBubble();
+    void slotDeleteRadius();
+    void slotNogoArea();
+    void slotEditRadius();
 
 private:
     IGisItem::key_t key;
diff --git a/src/gis/wpt/CScrOptWptRadius.cpp b/src/gis/wpt/CScrOptWptRadius.cpp
new file mode 100644
index 0000000..e0bcddd
--- /dev/null
+++ b/src/gis/wpt/CScrOptWptRadius.cpp
@@ -0,0 +1,98 @@
+/**********************************************************************************************
+    Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+    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 Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+
+#include "CMainWindow.h"
+#include "canvas/CCanvas.h"
+#include "gis/CGisWorkspace.h"
+#include "gis/wpt/CGisItemWpt.h"
+#include "gis/wpt/CProjWpt.h"
+#include "gis/wpt/CScrOptWptRadius.h"
+#include "helpers/CDraw.h"
+#include "mouse/IMouse.h"
+
+#include <QtWidgets>
+
+CScrOptWptRadius::CScrOptWptRadius(CGisItemWpt *wpt, const QPoint& point, IMouse *parent)
+    : IScrOpt(parent)
+    , key(wpt->getKey())
+{
+    setupUi(this);
+    setOrigin(point);
+    label->setFont(CMainWindow::self().getMapFont());
+
+    qreal proximity = wpt->getProximity();
+    if(proximity == NOFLOAT)
+    {
+        proximity = 0.;
+    }
+
+    QString val, unit;
+    IUnit::self().meter2distance(proximity, val, unit);
+    label->setText(QString("%1%2").arg(val).arg(unit));
+
+    adjustSize();
+
+    toolNogoArea->setChecked(wpt->isNogoArea());
+
+    anchor = wpt->getPointCloseBy(point);
+    move(anchor.toPoint() + QPoint(-width()/2,SCR_OPT_OFFSET));
+    show();
+
+    connect(toolDelete,   &QToolButton::clicked, this, &CScrOptWptRadius::slotDelete);
+    connect(toolEdit,     &QToolButton::clicked, this, &CScrOptWptRadius::slotEdit);
+    connect(toolNogoArea, &QToolButton::clicked, this, &CScrOptWptRadius::slotNogoArea);
+
+    adjustSize();
+}
+
+CScrOptWptRadius::~CScrOptWptRadius()
+{
+}
+
+void CScrOptWptRadius::slotDelete()
+{
+    CGisWorkspace::self().deleteWptRadius(key);
+    deleteLater();
+}
+
+void CScrOptWptRadius::slotNogoArea()
+{
+    CGisWorkspace::self().toggleWptNogoArea(key);
+    deleteLater();
+}
+
+void CScrOptWptRadius::slotEdit()
+{
+    CGisWorkspace::self().editWptRadius(key);
+    deleteLater();
+}
+
+void CScrOptWptRadius::draw(QPainter& p)
+{
+    IGisItem * item = CGisWorkspace::self().getItemByKey(key);
+    if(nullptr == item)
+    {
+        deleteLater();
+        return;
+    }
+    item->drawHighlight(p);
+
+    CDraw::bubble(p, geometry(), anchor.toPoint());
+}
diff --git a/src/gis/wpt/CScrOptWpt.h b/src/gis/wpt/CScrOptWptRadius.h
similarity index 75%
copy from src/gis/wpt/CScrOptWpt.h
copy to src/gis/wpt/CScrOptWptRadius.h
index 34de118..508c103 100644
--- a/src/gis/wpt/CScrOptWpt.h
+++ b/src/gis/wpt/CScrOptWptRadius.h
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -16,39 +17,36 @@
 
 **********************************************************************************************/
 
-#ifndef CSCROPTWPT_H
-#define CSCROPTWPT_H
+#ifndef CSCROPTWPTRADIUS_H
+#define CSCROPTWPTRADIUS_H
 
 #include "gis/IGisItem.h"
 #include "mouse/IScrOpt.h"
 
-#include "ui_IScrOptWpt.h"
+#include "ui_IScrOptWptRadius.h"
 #include <QWidget>
 
 class CGisItemWpt;
 class IMouse;
 
-class CScrOptWpt : public IScrOpt, private Ui::IScrOptWpt
+class CScrOptWptRadius : public IScrOpt, private Ui::IScrOptWptRadius
 {
     Q_OBJECT
 public:
-    CScrOptWpt(CGisItemWpt * wpt, const QPoint &point, IMouse *parent);
-    virtual ~CScrOptWpt();
+    CScrOptWptRadius(CGisItemWpt * wpt, const QPoint &point, IMouse *parent);
+    virtual ~CScrOptWptRadius();
 
     void draw(QPainter& p) override;
 
 private slots:
     void slotDelete();
+    void slotNogoArea();
     void slotEdit();
-    void slotCopy();
-    void slotMove();
-    void slotProj();
-    void slotBubble();
 
 private:
     IGisItem::key_t key;
     QPointF anchor;
 };
 
-#endif //CSCROPTWPT_H
+#endif //CSCROPTWPTRADIUS_H
 
diff --git a/src/gis/wpt/IScrOptWpt.ui b/src/gis/wpt/IScrOptWpt.ui
index 65d3cf5..09001f6 100644
--- a/src/gis/wpt/IScrOptWpt.ui
+++ b/src/gis/wpt/IScrOptWpt.ui
@@ -138,6 +138,62 @@
       </widget>
      </item>
      <item>
+      <widget class="Line" name="line_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="toolEditRadius">
+       <property name="toolTip">
+        <string>edit radius of circular area</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../resources.qrc">
+         <normaloff>:/icons/32x32/WptEditProx.png</normaloff>:/icons/32x32/WptEditProx.png</iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="toolNogoArea">
+       <property name="toolTip">
+        <string>Switch between proximity and nogo-area</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../resources.qrc">
+         <normaloff>:/icons/32x32/WptProx.png</normaloff>
+         <normalon>:/icons/32x32/WptAvoid.png</normalon>:/icons/32x32/WptProx.png</iconset>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="toolDelRadius">
+       <property name="toolTip">
+        <string>Delete circle defined by waypoint</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../resources.qrc">
+         <normaloff>:/icons/32x32/WptDelProx.png</normaloff>:/icons/32x32/WptDelProx.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
diff --git a/src/gis/wpt/IScrOptWpt.ui b/src/gis/wpt/IScrOptWptRadius.ui
similarity index 51%
copy from src/gis/wpt/IScrOptWpt.ui
copy to src/gis/wpt/IScrOptWptRadius.ui
index 65d3cf5..c8213e7 100644
--- a/src/gis/wpt/IScrOptWpt.ui
+++ b/src/gis/wpt/IScrOptWptRadius.ui
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>IScrOptWpt</class>
- <widget class="QWidget" name="IScrOptWpt">
+ <class>IScrOptWptRadius</class>
+ <widget class="QWidget" name="IScrOptWptRadius">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
-    <height>157</height>
+    <width>306</width>
+    <height>52</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -40,69 +40,35 @@
      <property name="spacing">
       <number>3</number>
      </property>
+     <property name="sizeConstraint">
+      <enum>QLayout::SetNoConstraint</enum>
+     </property>
      <item>
       <widget class="QToolButton" name="toolEdit">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="toolTip">
-        <string>View details and edit.</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../resources.qrc">
-         <normaloff>:/icons/32x32/EditDetails.png</normaloff>:/icons/32x32/EditDetails.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="toolCopy">
-       <property name="toolTip">
-        <string>Copy waypoint into another project.</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../resources.qrc">
-         <normaloff>:/icons/32x32/Copy.png</normaloff>:/icons/32x32/Copy.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="toolDelete">
        <property name="toolTip">
-        <string>Delete waypoint from project.</string>
+        <string>edit radius of circular area</string>
        </property>
        <property name="text">
         <string>...</string>
        </property>
        <property name="icon">
         <iconset resource="../../resources.qrc">
-         <normaloff>:/icons/32x32/DeleteOne.png</normaloff>:/icons/32x32/DeleteOne.png</iconset>
+         <normaloff>:/icons/32x32/WptEditProx.png</normaloff>:/icons/32x32/WptEditProx.png</iconset>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="Line" name="line">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="toolBubble">
+      <widget class="QToolButton" name="toolNogoArea">
        <property name="toolTip">
-        <string>Show content as static bubble.</string>
+        <string>Switch between proximity and nogo-area</string>
        </property>
        <property name="text">
         <string>...</string>
        </property>
        <property name="icon">
         <iconset resource="../../resources.qrc">
-         <normaloff>:/icons/32x32/Bubble.png</normaloff>:/icons/32x32/Bubble.png</iconset>
+         <normaloff>:/icons/32x32/WptProx.png</normaloff>
+         <normalon>:/icons/32x32/WptAvoid.png</normalon>:/icons/32x32/WptProx.png</iconset>
        </property>
        <property name="checkable">
         <bool>true</bool>
@@ -110,30 +76,16 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="toolMove">
-       <property name="toolTip">
-        <string>Move waypoint to a new location.</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../resources.qrc">
-         <normaloff>:/icons/32x32/WptMove.png</normaloff>:/icons/32x32/WptMove.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="toolProj">
+      <widget class="QToolButton" name="toolDelete">
        <property name="toolTip">
-        <string>Clone waypoint and move clone a given distance and angle.</string>
+        <string>Delete circle defined by waypoint</string>
        </property>
        <property name="text">
         <string>...</string>
        </property>
        <property name="icon">
         <iconset resource="../../resources.qrc">
-         <normaloff>:/icons/32x32/WptProj.png</normaloff>:/icons/32x32/WptProj.png</iconset>
+         <normaloff>:/icons/32x32/WptDelProx.png</normaloff>:/icons/32x32/WptDelProx.png</iconset>
        </property>
       </widget>
      </item>
@@ -144,7 +96,7 @@
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>40</width>
+         <width>0</width>
          <height>20</height>
         </size>
        </property>
@@ -155,14 +107,14 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
-       <width>300</width>
+       <width>0</width>
        <height>0</height>
       </size>
      </property>
@@ -183,26 +135,8 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="CPhotoAlbum" name="photoAlbum" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>100</height>
-      </size>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>CPhotoAlbum</class>
-   <extends>QWidget</extends>
-   <header>widgets/CPhotoAlbum.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources>
   <include location="../../resources.qrc"/>
  </resources>
diff --git a/src/helpers/CDraw.cpp b/src/helpers/CDraw.cpp
index 23930c3..de8fc63 100644
--- a/src/helpers/CDraw.cpp
+++ b/src/helpers/CDraw.cpp
@@ -28,6 +28,7 @@
 QPen CDraw::penBorderBlue(QColor(10,10,150,220),2);
 QPen CDraw::penBorderGray(Qt::lightGray,2);
 QPen CDraw::penBorderBlack(QColor(0,0,0,200),2);
+QPen CDraw::penBorderRed(Qt::red,2);
 QBrush CDraw::brushBackWhite(QColor(255,255,255,255));
 QBrush CDraw::brushBackYellow(QColor(0xff, 0xff, 0xcc, 0xE0));
 
@@ -154,7 +155,7 @@ void CDraw::text(const QString &str, QPainter &p, const QRect &r, const QColor &
     p.drawText(r, Qt::AlignCenter, str);
 }
 
-QPoint CDraw::bubble(QPainter &p, const QRect &contentRect, const QPoint &pointerPos, int pointerBaseWidth, float pointerBasePos)
+QPoint CDraw::bubble(QPainter &p, const QRect &contentRect, const QPoint &pointerPos, int pointerBaseWidth, float pointerBasePos, const QPen &pen)
 {
     QPainterPath bubblePath;
     bubblePath.addRoundedRect(contentRect, RECT_RADIUS, RECT_RADIUS);
@@ -192,7 +193,7 @@ QPoint CDraw::bubble(QPainter &p, const QRect &contentRect, const QPoint &pointe
         bubblePath = bubblePath.united(pointerPath);
     }
 
-    p.setPen  (CDraw::penBorderGray);
+    p.setPen  (pen);
     p.setBrush(CDraw::brushBackWhite);
 
     p.drawPolygon(bubblePath.toFillPolygon());
diff --git a/src/helpers/CDraw.h b/src/helpers/CDraw.h
index 10889a6..82375b8 100644
--- a/src/helpers/CDraw.h
+++ b/src/helpers/CDraw.h
@@ -41,6 +41,7 @@ public:
     static QPen penBorderBlue;
     static QPen penBorderGray;
     static QPen penBorderBlack;
+    static QPen penBorderRed;
     static QBrush brushBackWhite;
     static QBrush brushBackYellow;
 
@@ -78,7 +79,7 @@ public:
        @param pointerBaseWidth  The width of the pointer
        @param pointerBasePos    The (relative) location of the pointer (in percent / pixels)
      */
-    static QPoint bubble(QPainter &p, const QRect &contentRect, const QPoint &pointerPos, int pointerBaseWidth = 20, float pointerBasePos = .5f);
+    static QPoint bubble(QPainter &p, const QRect &contentRect, const QPoint &pointerPos, int pointerBaseWidth = 20, float pointerBasePos = .5f, const QPen& pen = penBorderGray);
 
 private:
     /**
diff --git a/src/helpers/CProgressDialog.cpp b/src/helpers/CProgressDialog.cpp
index 0d18319..6d5e758 100644
--- a/src/helpers/CProgressDialog.cpp
+++ b/src/helpers/CProgressDialog.cpp
@@ -16,6 +16,8 @@
 
 **********************************************************************************************/
 
+#include "CMainWindow.h"
+#include "canvas/CCanvas.h"
 #include "helpers/CProgressDialog.h"
 #include "units/IUnit.h"
 
@@ -136,3 +138,13 @@ bool CProgressDialog::wasCanceled()
 {
     return result() == QMessageBox::Abort;
 }
+
+void CProgressDialog::showEvent(QShowEvent *)
+{
+    // that is a workaround for canvas loosing mousetracking caused by CProgressDialog being modal:
+    CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
+    if (canvas != nullptr)
+    {
+        canvas->mouseTrackingLost();
+    }
+}
diff --git a/src/helpers/CProgressDialog.h b/src/helpers/CProgressDialog.h
index 1408087..3ba4de6 100644
--- a/src/helpers/CProgressDialog.h
+++ b/src/helpers/CProgressDialog.h
@@ -54,6 +54,9 @@ public:
 public slots:
     void reject() override;
 
+protected:
+    void showEvent(QShowEvent *) override;
+
 private:
     void pause();
     void goOn();
diff --git a/src/icons/32x32/Filter.png b/src/icons/32x32/Filter.png
new file mode 100644
index 0000000..c5cd069
Binary files /dev/null and b/src/icons/32x32/Filter.png differ
diff --git a/src/icons/32x32/LogProject.png b/src/icons/32x32/LogProject.png
new file mode 100755
index 0000000..ad0a18c
Binary files /dev/null and b/src/icons/32x32/LogProject.png differ
diff --git a/src/icons/32x32/QlbProject.png b/src/icons/32x32/QlbProject.png
new file mode 100644
index 0000000..13dd887
Binary files /dev/null and b/src/icons/32x32/QlbProject.png differ
diff --git a/src/icons/32x32/SmlProject.png b/src/icons/32x32/SmlProject.png
new file mode 100644
index 0000000..825c5b4
Binary files /dev/null and b/src/icons/32x32/SmlProject.png differ
diff --git a/src/icons/32x32/ToggleDatabase.png b/src/icons/32x32/ToggleDatabase.png
new file mode 100644
index 0000000..f401ffb
Binary files /dev/null and b/src/icons/32x32/ToggleDatabase.png differ
diff --git a/src/icons/32x32/TrackMinMax.png b/src/icons/32x32/TrackMinMax.png
new file mode 100644
index 0000000..40d3b36
Binary files /dev/null and b/src/icons/32x32/TrackMinMax.png differ
diff --git a/src/icons/32x32/WptAvoid.png b/src/icons/32x32/WptAvoid.png
new file mode 100644
index 0000000..d765cdf
Binary files /dev/null and b/src/icons/32x32/WptAvoid.png differ
diff --git a/src/icons/32x32/WptDelProx.png b/src/icons/32x32/WptDelProx.png
new file mode 100644
index 0000000..393c8bb
Binary files /dev/null and b/src/icons/32x32/WptDelProx.png differ
diff --git a/src/icons/32x32/WptEditProx.png b/src/icons/32x32/WptEditProx.png
new file mode 100644
index 0000000..cdd3419
Binary files /dev/null and b/src/icons/32x32/WptEditProx.png differ
diff --git a/src/icons/48x48/Filter.png b/src/icons/48x48/Filter.png
new file mode 100644
index 0000000..de03795
Binary files /dev/null and b/src/icons/48x48/Filter.png differ
diff --git a/src/icons/48x48/LogProject.png b/src/icons/48x48/LogProject.png
new file mode 100755
index 0000000..3779457
Binary files /dev/null and b/src/icons/48x48/LogProject.png differ
diff --git a/src/icons/48x48/QlbProject.png b/src/icons/48x48/QlbProject.png
new file mode 100644
index 0000000..d1b2cb3
Binary files /dev/null and b/src/icons/48x48/QlbProject.png differ
diff --git a/src/icons/48x48/SmlProject.png b/src/icons/48x48/SmlProject.png
new file mode 100644
index 0000000..b0a429d
Binary files /dev/null and b/src/icons/48x48/SmlProject.png differ
diff --git a/src/icons/48x48/ToggleDatabase.png b/src/icons/48x48/ToggleDatabase.png
new file mode 100644
index 0000000..cfb9d38
Binary files /dev/null and b/src/icons/48x48/ToggleDatabase.png differ
diff --git a/src/icons/48x48/TrackMinMax.png b/src/icons/48x48/TrackMinMax.png
new file mode 100644
index 0000000..cc292ab
Binary files /dev/null and b/src/icons/48x48/TrackMinMax.png differ
diff --git a/src/icons/48x48/WptAvoid.png b/src/icons/48x48/WptAvoid.png
new file mode 100644
index 0000000..05aef7e
Binary files /dev/null and b/src/icons/48x48/WptAvoid.png differ
diff --git a/src/icons/48x48/WptDelProx.png b/src/icons/48x48/WptDelProx.png
new file mode 100644
index 0000000..177dc79
Binary files /dev/null and b/src/icons/48x48/WptDelProx.png differ
diff --git a/src/icons/48x48/WptEditProx.png b/src/icons/48x48/WptEditProx.png
new file mode 100644
index 0000000..958b501
Binary files /dev/null and b/src/icons/48x48/WptEditProx.png differ
diff --git a/src/icons/Filter.svg b/src/icons/Filter.svg
new file mode 100644
index 0000000..34f935c
--- /dev/null
+++ b/src/icons/Filter.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3369"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Filter.svg">
+  <defs
+     id="defs3371" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="11.631081"
+     inkscape:cy="32.106251"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1080"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4153" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3374">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4159"
+       style="fill:#000080">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4155"
+         d="M 5,9 60,9 60,19 40,39"
+         style="fill:#000080;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4157"
+         d="M 40,39 40,59 25,59 25,39 5,19 5,9"
+         style="fill:#000080;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/LogProject.svg b/src/icons/LogProject.svg
new file mode 100755
index 0000000..96df896
--- /dev/null
+++ b/src/icons/LogProject.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="SmlProject.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.919596"
+     inkscape:cx="20.703879"
+     inkscape:cy="34.262575"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1215"
+     inkscape:window-height="913"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <path
+       style="fill:none;stroke:#000080;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 54,1014.3622 c 0,0 -15,1 -23,6 -6.836781,4.273 14.72678,4.2732 11,8 -3.72678,3.7268 -28.376052,2.4145 -32.8593751,5.1854 -2.0050036,1.2391 -5.0000004,5 -5.0000004,5"
+       id="path3078"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc" />
+    <path
+       style="fill:#ff0000;stroke:#ff0000;stroke-width:1.34993111999999993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       d="m 27.270471,992.71371 25.339695,10.78739 -28.507157,10.7873 3.167462,-21.57469"
+       id="path3763"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;stroke:#000000;stroke-width:0.71901649px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 20.720056,1031.245 3.609174,-39.39147 3.609174,0 z"
+       id="path3761"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <rect
+       style="fill:none;stroke:none"
+       id="rect3769"
+       width="40"
+       height="40"
+       x="2.640624"
+       y="991.49402" />
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="-1032.9608"
+       y="15.999999"
+       id="text3848"
+       sodipodi:linespacing="125%"
+       transform="matrix(0,-1,1,0,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan3850"
+         x="-1032.9608"
+         y="15.999999"
+         style="font-size:18px">LOG</tspan></text>
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3859"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+         id="flowRegion3861"><rect
+           id="rect3863"
+           width="75.35714"
+           height="62.142857"
+           x="-9.4642859"
+           y="2.2142856" /></flowRegion><flowPara
+         id="flowPara3865" /></flowRoot>  </g>
+</svg>
diff --git a/src/icons/QlbProject.svg b/src/icons/QlbProject.svg
new file mode 100644
index 0000000..ce0e05d
--- /dev/null
+++ b/src/icons/QlbProject.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="QlbProject.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="-19.914939"
+     inkscape:cy="35.807015"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="989"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <path
+       style="fill:none;stroke:#000080;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 54.195846,1014.5765 c 0,0 -15,1 -22.999999,6 -6.836782,4.273 14.726779,4.2732 10.999999,8 -3.72678,3.7268 -28.376052,2.4145 -32.8593748,5.1854 -2.005004,1.2391 -5.0000008,5 -5.0000008,5"
+       id="path3078"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc" />
+    <path
+       style="fill:#784421;stroke:#784421;stroke-width:1.34993112;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 27.270471,992.71371 25.339695,10.78739 -28.507157,10.7873 3.167462,-21.57469"
+       id="path3763"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;stroke:#000000;stroke-width:0.71901649px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 20.720056,1031.245 3.609174,-39.39147 3.609174,0 z"
+       id="path3761"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <rect
+       style="fill:none;stroke:none"
+       id="rect3769"
+       width="40"
+       height="40"
+       x="2.6406245"
+       y="991.49402" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:bold;font-size:14px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       x="-1036.3622"
+       y="16"
+       id="text3848"
+       sodipodi:linespacing="125%"
+       transform="matrix(0,-1,1,0,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan3850"
+         x="-1036.3622"
+         y="16"
+         style="font-size:18px">QLB</tspan></text>
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3859"
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:12px;line-height:125%;letter-spacing:0px;word-spacing:0px"><flowRegion
+         id="flowRegion3861"><rect
+           id="rect3863"
+           width="75.35714"
+           height="62.142857"
+           x="-9.4642859"
+           y="2.2142856" /></flowRegion><flowPara
+         id="flowPara3865" /></flowRoot>  </g>
+</svg>
diff --git a/src/icons/SmlProject.svg b/src/icons/SmlProject.svg
new file mode 100644
index 0000000..07f89fe
--- /dev/null
+++ b/src/icons/SmlProject.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="SmlProject.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.919596"
+     inkscape:cx="20.703879"
+     inkscape:cy="34.262575"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1375"
+     inkscape:window-height="819"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <path
+       style="fill:none;stroke:#000080;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 54,1014.3622 c 0,0 -15,1 -23,6 -6.836781,4.273 14.72678,4.2732 11,8 -3.72678,3.7268 -28.376052,2.4145 -32.8593751,5.1854 -2.0050036,1.2391 -5.0000004,5 -5.0000004,5"
+       id="path3078"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc" />
+    <path
+       style="fill:#ff0000;stroke:#ff0000;stroke-width:1.34993111999999993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       d="m 27.270471,992.71371 25.339695,10.78739 -28.507157,10.7873 3.167462,-21.57469"
+       id="path3763"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;stroke:#000000;stroke-width:0.71901649px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 20.720056,1031.245 3.609174,-39.39147 3.609174,0 z"
+       id="path3761"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <rect
+       style="fill:none;stroke:none"
+       id="rect3769"
+       width="40"
+       height="40"
+       x="2.640624"
+       y="991.49402" />
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="-1032.9608"
+       y="15.999999"
+       id="text3848"
+       sodipodi:linespacing="125%"
+       transform="matrix(0,-1,1,0,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan3850"
+         x="-1032.9608"
+         y="15.999999"
+         style="font-size:18px">SML</tspan></text>
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3859"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
+         id="flowRegion3861"><rect
+           id="rect3863"
+           width="75.35714"
+           height="62.142857"
+           x="-9.4642859"
+           y="2.2142856" /></flowRegion><flowPara
+         id="flowPara3865" /></flowRoot>  </g>
+</svg>
diff --git a/src/icons/ToggleDatabase.svg b/src/icons/ToggleDatabase.svg
new file mode 100644
index 0000000..c9151bb
--- /dev/null
+++ b/src/icons/ToggleDatabase.svg
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3462"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ToggleDatabase.svg"
+   inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_touch/src/icons/48x48/ToggleRouter.png"
+   inkscape:export-xdpi="67.5"
+   inkscape:export-ydpi="67.5">
+  <defs
+     id="defs3464">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4326"
+       is_visible="true" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.89"
+     inkscape:cx="-5.1828622"
+     inkscape:cy="34.818224"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="993"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     showguides="false" />
+  <metadata
+     id="metadata3467">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.10540044px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3336"
+       width="29.544342"
+       height="29.544342"
+       x="20.729263"
+       y="12.790267" />
+    <rect
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.10540044px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3338"
+       width="20.299173"
+       height="20.299173"
+       x="35.199963"
+       y="6.9617906" />
+    <rect
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:1.51195776px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       id="rect3336-3"
+       width="40.410511"
+       height="40.410511"
+       x="3.976562"
+       y="19.24929" />
+    <g
+       id="g4172"
+       transform="matrix(0.7,0,0,0.69586235,0.91588182,-670.65959)">
+      <g
+         style="stroke-width:3.38945651;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="matrix(0.9270579,0,0,0.9609277,5.3800344,983.04727)"
+         id="g3856">
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:3.60437727;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3012-6"
+           sodipodi:cx="30"
+           sodipodi:cy="19"
+           sodipodi:rx="20"
+           sodipodi:ry="5"
+           d="m 47.741363,16.691808 a 20,5 0 0 1 -8.506645,6.743279 20,5 0 0 1 -26.974053,-2.125921 20,5 0 0 1 8.500722,-6.743746 20,5 0 0 1 26.975919,2.12444"
+           sodipodi:start="5.8033439"
+           sodipodi:end="5.8029047"
+           sodipodi:open="true"
+           transform="matrix(0.97628959,0,0,0.90577639,0.75264714,41.745822)" />
+        <rect
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           id="rect3032"
+           width="40"
+           height="40"
+           x="10.056155"
+           y="18.943857" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:3.60437727;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3012"
+           sodipodi:cx="30"
+           sodipodi:cy="19"
+           sodipodi:rx="20"
+           sodipodi:ry="5"
+           d="m 47.741363,16.691808 a 20,5 0 0 1 -8.506645,6.743279 20,5 0 0 1 -26.974053,-2.125921 20,5 0 0 1 8.500722,-6.743746 20,5 0 0 1 26.975919,2.12444"
+           sodipodi:start="5.8033439"
+           sodipodi:end="5.8029047"
+           sodipodi:open="true"
+           transform="matrix(0.97628959,0,0,0.90577639,0.75264717,1.7458229)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:3.67074943;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3012-0"
+           sodipodi:cx="30"
+           sodipodi:cy="19"
+           sodipodi:rx="20"
+           sodipodi:ry="5"
+           d="M 49.959676,19.317345 A 20,5 0 0 1 30.145537,23.999868 20,5 0 0 1 10.060911,19.389931"
+           sodipodi:start="0.063511676"
+           sodipodi:end="3.0635271"
+           transform="matrix(0.9793945,0,0,0.87054856,0.71290745,12.690707)"
+           sodipodi:open="true" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:3.67074943;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3012-0-2"
+           sodipodi:cx="30"
+           sodipodi:cy="19"
+           sodipodi:rx="20"
+           sodipodi:ry="5"
+           d="M 49.959676,19.317345 A 20,5 0 0 1 30.145537,23.999868 20,5 0 0 1 10.060911,19.389931"
+           sodipodi:start="0.063511676"
+           sodipodi:end="3.0635271"
+           transform="matrix(0.9793945,0,0,0.87054856,0.6219979,22.236163)"
+           sodipodi:open="true" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:3.67074943;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3012-0-1"
+           sodipodi:cx="30"
+           sodipodi:cy="19"
+           sodipodi:rx="20"
+           sodipodi:ry="5"
+           d="M 49.959676,19.317345 A 20,5 0 0 1 30.145537,23.999868 20,5 0 0 1 10.060911,19.389931"
+           sodipodi:start="0.063511676"
+           sodipodi:end="3.0635271"
+           transform="matrix(0.9793945,0,0,0.87054856,0.71290699,32.327076)"
+           sodipodi:open="true" />
+        <path
+           style="fill:#ffffff;stroke:#000080;stroke-width:3.38945651;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 10.454545,19 0,40"
+           id="path3084"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#000080;stroke-width:3.38945651;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 49.545455,19 0,40"
+           id="path3086"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="995.48077"
+         x="8.237051"
+         height="50"
+         width="50"
+         id="rect2997"
+         style="fill:none;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/TrackMinMax.svg b/src/icons/TrackMinMax.svg
new file mode 100644
index 0000000..760ee3e
--- /dev/null
+++ b/src/icons/TrackMinMax.svg
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3377"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="TrackMinMax.svg">
+  <defs
+     id="defs3379" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-16.727272"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="989"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3416" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3382">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g3937"
+       transform="matrix(0.29823762,0,0,0.37495918,-85.73452,-14.429214)"
+       inkscape:export-filename="/home/oeichler/Code/android/QLandkarteM/QLandkarteM/icons/48x48/record.png"
+       inkscape:export-xdpi="123.42857"
+       inkscape:export-ydpi="123.42857"
+       style="fill:#000080">
+      <g
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,70.373026,321.22792)"
+         id="g3863"
+         style="fill:#000080">
+        <path
+           sodipodi:type="arc"
+           style="fill:#000080;fill-opacity:1;stroke:none"
+           id="path3091"
+           sodipodi:cx="417"
+           sodipodi:cy="94.362183"
+           sodipodi:rx="7"
+           sodipodi:ry="7"
+           d="m 416.9824,87.362205 a 7,7 0 0 1 6.07773,3.496442 7,7 0 0 1 -0.003,7.0117 7,7 0 0 1 -6.08041,3.491803 L 417,94.362183 Z"
+           sodipodi:start="4.7098749"
+           sodipodi:end="1.5740743"
+           transform="matrix(2.8638155,0,0,0.95340127,-777.28343,4.421604)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#000080;fill-opacity:1;stroke:none"
+           id="path3093"
+           sodipodi:cx="407"
+           sodipodi:cy="91.862183"
+           sodipodi:rx="4"
+           sodipodi:ry="6.5"
+           d="m 407.02766,98.362027 a 4,6.5 0 0 1 -3.48505,-3.231014 4,6.5 0 0 1 -0.006,-6.520058 4,6.5 0 0 1 3.47881,-3.248726 L 407,91.862183 Z"
+           sodipodi:start="1.5638814"
+           sodipodi:end="4.7161735"
+           transform="matrix(2.1833386,0,0,1.0380416,-476.38942,-0.97014023)" />
+      </g>
+      <g
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,94.62502,319.68557)"
+         id="g3863-7"
+         style="fill:#000080">
+        <path
+           sodipodi:type="arc"
+           style="fill:#000080;fill-opacity:1;stroke:none"
+           id="path3091-3"
+           sodipodi:cx="417"
+           sodipodi:cy="94.362183"
+           sodipodi:rx="7"
+           sodipodi:ry="7"
+           d="m 416.9824,87.362205 a 7,7 0 0 1 6.07773,3.496442 7,7 0 0 1 -0.003,7.0117 7,7 0 0 1 -6.08041,3.491803 L 417,94.362183 Z"
+           sodipodi:start="4.7098749"
+           sodipodi:end="1.5740743"
+           transform="matrix(2.8638155,0,0,0.95340127,-777.28343,4.421604)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#000080;fill-opacity:1;stroke:none"
+           id="path3093-5"
+           sodipodi:cx="407"
+           sodipodi:cy="91.862183"
+           sodipodi:rx="4"
+           sodipodi:ry="6.5"
+           d="m 407.02766,98.362027 a 4,6.5 0 0 1 -3.48505,-3.231014 4,6.5 0 0 1 -0.006,-6.520058 4,6.5 0 0 1 3.47881,-3.248726 L 407,91.862183 Z"
+           sodipodi:start="1.5638814"
+           sodipodi:end="4.7161735"
+           transform="matrix(2.1833386,0,0,1.0380416,-476.38942,-0.97014023)" />
+      </g>
+      <g
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,69.311474,351.55812)"
+         id="g3863-8"
+         style="fill:#000080">
+        <path
+           sodipodi:type="arc"
+           style="fill:#000080;fill-opacity:1;stroke:none"
+           id="path3091-7"
+           sodipodi:cx="417"
+           sodipodi:cy="94.362183"
+           sodipodi:rx="7"
+           sodipodi:ry="7"
+           d="m 416.9824,87.362205 a 7,7 0 0 1 6.07773,3.496442 7,7 0 0 1 -0.003,7.0117 7,7 0 0 1 -6.08041,3.491803 L 417,94.362183 Z"
+           sodipodi:start="4.7098749"
+           sodipodi:end="1.5740743"
+           transform="matrix(2.8638155,0,0,0.95340127,-777.28343,4.421604)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#000080;fill-opacity:1;stroke:none"
+           id="path3093-6"
+           sodipodi:cx="407"
+           sodipodi:cy="91.862183"
+           sodipodi:rx="4"
+           sodipodi:ry="6.5"
+           d="m 407.02766,98.362027 a 4,6.5 0 0 1 -3.48505,-3.231014 4,6.5 0 0 1 -0.006,-6.520058 4,6.5 0 0 1 3.47881,-3.248726 L 407,91.862183 Z"
+           sodipodi:start="1.5638814"
+           sodipodi:end="4.7161735"
+           transform="matrix(2.1833386,0,0,1.0380416,-476.38942,-0.97014023)" />
+      </g>
+      <g
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,44.797353,350.17434)"
+         id="g3863-1"
+         style="fill:#000080">
+        <path
+           sodipodi:type="arc"
+           style="fill:#000080;fill-opacity:1;stroke:none"
+           id="path3091-0"
+           sodipodi:cx="417"
+           sodipodi:cy="94.362183"
+           sodipodi:rx="7"
+           sodipodi:ry="7"
+           d="m 416.9824,87.362205 a 7,7 0 0 1 6.07773,3.496442 7,7 0 0 1 -0.003,7.0117 7,7 0 0 1 -6.08041,3.491803 L 417,94.362183 Z"
+           sodipodi:start="4.7098749"
+           sodipodi:end="1.5740743"
+           transform="matrix(2.8638155,0,0,0.95340127,-777.28343,4.421604)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#000080;fill-opacity:1;stroke:none"
+           id="path3093-61"
+           sodipodi:cx="407"
+           sodipodi:cy="91.862183"
+           sodipodi:rx="4"
+           sodipodi:ry="6.5"
+           d="m 407.02766,98.362027 a 4,6.5 0 0 1 -3.48505,-3.231014 4,6.5 0 0 1 -0.006,-6.520058 4,6.5 0 0 1 3.47881,-3.248726 L 407,91.862183 Z"
+           sodipodi:start="1.5638814"
+           sodipodi:end="4.7161735"
+           transform="matrix(2.1833386,0,0,1.0380416,-476.38942,-0.97014023)" />
+      </g>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:21.49038124px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       x="11.259442"
+       y="24.409655"
+       id="text4166"
+       sodipodi:linespacing="125%"
+       transform="scale(0.83387017,1.1992275)"><tspan
+         sodipodi:role="line"
+         id="tspan4168"
+         x="11.259442"
+         y="24.409655"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#008000;">min</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:18.95981979px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       x="11.544643"
+       y="40.755177"
+       id="text4170"
+       sodipodi:linespacing="125%"
+       transform="scale(0.8385128,1.1925876)"><tspan
+         sodipodi:role="line"
+         id="tspan4172"
+         x="11.544643"
+         y="40.755177"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#800000;">max</tspan></text>
+  </g>
+</svg>
diff --git a/src/icons/WptAvoid.svg b/src/icons/WptAvoid.svg
new file mode 100644
index 0000000..538eccd
--- /dev/null
+++ b/src/icons/WptAvoid.svg
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3513"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="WptAvoid.svg"
+   inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_brouter/src/icons/48x48/WptAvoid.png"
+   inkscape:export-xdpi="67.5"
+   inkscape:export-ydpi="67.5">
+  <defs
+     id="defs3515">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3901"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path3895"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mstart"
+       style="overflow:visible">
+      <path
+         id="path3880"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.4) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3874"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-22.181818"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3090" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3518">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4173"
+       transform="matrix(1.5863632,0,0,1.5863632,-18.074028,-14.661358)">
+      <g
+         id="g3029">
+        <g
+           id="g3024"
+           transform="translate(3.9999971,1.44e-6)">
+          <path
+             inkscape:connector-curvature="0"
+             id="path3763"
+             d="M 25.452924,20.082225 37.356669,25.47591 23.964955,30.86956 25.452924,20.082225"
+             style="fill:#0000ff;stroke:#0000ff;stroke-width:0.65424097;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cccc"
+             inkscape:connector-curvature="0"
+             id="path3761"
+             d="m 22.375757,39.34786 1.695469,-19.695725 1.69547,0 z"
+             style="fill:#000000;stroke:#000000;stroke-width:0.34846967px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+          <rect
+             y="19.500017"
+             x="22.205851"
+             height="20"
+             width="18.790668"
+             id="rect3769"
+             style="fill:none;stroke:none" />
+        </g>
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#ff0000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3019"
+           sodipodi:cx="-95"
+           sodipodi:cy="24"
+           sodipodi:rx="20"
+           sodipodi:ry="20"
+           d="M -75,24 A 20,20 0 0 1 -94.978918,43.999989 20,20 0 0 1 -114.99996,24.042164 20,20 0 0 1 -95.063246,4.0001 20,20 0 0 1 -75.000178,23.915672"
+           sodipodi:start="0"
+           sodipodi:end="6.2789689"
+           sodipodi:open="true"
+           transform="matrix(0.93023255,0,0,0.93023256,119.97111,7.1744175)" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path3348"
+         d="m 28.607559,46.361476 c -6.54581,-1.249603 -11.68172,-5.926709 -13.528888,-12.320318 -0.492332,-1.704111 -0.673823,-5.406083 -0.360314,-7.349513 1.048644,-6.500507 5.864204,-11.833956 12.384783,-13.716706 1.692373,-0.488655 5.30862,-0.673321 7.260496,-0.370762 5.358482,0.830615 10.06364,4.344103 12.558257,9.377641 1.353334,2.730708 1.678665,4.164887 1.690998,7.454546 0.0086,2.282151 -0.05713,2.979509 -0.402446,4.272727 -1.609281,6.026802 -6.311363,10.750722 -12.306787,12.3639 [...]
+         style="opacity:1;fill:#ffaaaa;fill-opacity:1;stroke:#000080;stroke-width:0.72727275;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/WptDelProx.svg b/src/icons/WptDelProx.svg
new file mode 100644
index 0000000..f53276a
--- /dev/null
+++ b/src/icons/WptDelProx.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3513"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="WptDelProx.svg"
+   inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_brouter/src/icons/48x48/WptDelProx.png"
+   inkscape:export-xdpi="67.5"
+   inkscape:export-ydpi="67.5">
+  <defs
+     id="defs3515" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-72.636364"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3518">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:3.93489718;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4140"
+       sodipodi:type="arc"
+       sodipodi:cx="28.733286"
+       sodipodi:cy="17.523773"
+       sodipodi:rx="15.633598"
+       sodipodi:ry="15.633598"
+       sodipodi:start="0"
+       sodipodi:end="6.2789616"
+       sodipodi:open="true"
+       d="M 44.366884,17.523773 A 15.633598,15.633598 0 0 1 28.749794,33.157363 15.633598,15.633598 0 0 1 13.099722,17.556789 15.633598,15.633598 0 0 1 28.683762,1.8902533 15.633598,15.633598 0 0 1 44.366745,17.457742" />
+    <path
+       style="fill:#000080;stroke:#000000;stroke-width:1.41162848px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 7.3802102,22.702198 11.0374298,40.8224 27.569289,0 10.988826,-40.8224 -49.5955448,0 z"
+       id="path3971-4"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/icons/WptEditProx.svg b/src/icons/WptEditProx.svg
new file mode 100644
index 0000000..8800059
--- /dev/null
+++ b/src/icons/WptEditProx.svg
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3513"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="WptEditProx.svg"
+   inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_brouter/src/icons/48x48/WptEditProx.png"
+   inkscape:export-xdpi="67.5"
+   inkscape:export-ydpi="67.5">
+  <defs
+     id="defs3515">
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker4385"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Send">
+      <path
+         transform="scale(0.3) rotate(180) translate(-2.3,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000080;stroke-opacity:1;fill:#000080;fill-opacity:1"
+         id="path4387" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker5139"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path5141"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1;fill:#000080;fill-opacity:1"
+         transform="scale(0.2) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker5049"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path5051"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.2) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Sstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4227"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.2) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker4505"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4225"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker4460"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4231"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000080;stroke-opacity:1;fill:#000080;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3901"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path3895"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mstart"
+       style="overflow:visible">
+      <path
+         id="path3880"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.4) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3874"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-3"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3901-6"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4185"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4187"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart-7"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3880-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.4,0,0,0.4,4,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-22.66464"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3090" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3518">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4244"
+       transform="matrix(1.4980669,0,0,1.4980669,-15.348322,-12.044175)">
+      <path
+         sodipodi:open="true"
+         sodipodi:end="6.2789689"
+         sodipodi:start="0"
+         d="M 50.203669,29.499998 A 18.60465,18.60465 0 0 1 31.618629,48.104638 18.60465,18.60465 0 0 1 12.994409,29.53922 18.60465,18.60465 0 0 1 31.540185,10.895441 18.60465,18.60465 0 0 1 50.203503,29.421554"
+         sodipodi:ry="18.60465"
+         sodipodi:rx="18.60465"
+         sodipodi:cy="29.499998"
+         sodipodi:cx="31.599018"
+         id="path3019"
+         style="fill:none;stroke:#ff0000;stroke-width:2.79069757;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3763"
+         d="M 34.890063,9.4541605 46.793808,14.847845 33.402094,20.241495 34.890063,9.4541605"
+         style="fill:#0000ff;stroke:#0000ff;stroke-width:0.65424097;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3761"
+         d="m 31.812896,28.719795 1.695469,-19.6957245 1.69547,0 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.34846967px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <rect
+         y="8.871953"
+         x="31.642988"
+         height="20"
+         width="18.790668"
+         id="rect3769"
+         style="fill:none;stroke:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3096"
+         d="m 31.728402,28.962813 -18.790669,-5"
+         style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3098"
+         d="m 31.728402,28.962813 18.790669,5"
+         style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/waypoints/32x32/Summit.png b/src/icons/waypoints/32x32/Summit.png
index bb5e10d..4374060 100644
Binary files a/src/icons/waypoints/32x32/Summit.png and b/src/icons/waypoints/32x32/Summit.png differ
diff --git a/src/icons/waypoints/Summit.svg b/src/icons/waypoints/Summit.svg
index 1441f2f..4a8a983 100644
--- a/src/icons/waypoints/Summit.svg
+++ b/src/icons/waypoints/Summit.svg
@@ -14,33 +14,35 @@
    viewBox="0 0 27.062747 26.910182"
    version="1.1"
    id="svg8"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="Summit.svg">
   <defs
      id="defs2" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#d1cad1"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
+     borderopacity="1"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.4865144"
-     inkscape:cx="-116.30113"
-     inkscape:cy="20.473107"
+     inkscape:zoom="1.7582312"
+     inkscape:cx="-38.495915"
+     inkscape:cy="33.491245"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1855"
-     inkscape:window-height="1056"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
+     inkscape:window-width="1920"
+     inkscape:window-height="993"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      units="mm"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
-     fit-margin-bottom="0">
+     fit-margin-bottom="0"
+     showborder="true"
+     borderlayer="false">
     <inkscape:grid
        type="xygrid"
        id="grid5701"
@@ -59,7 +61,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -68,13 +70,12 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(-11.499876,-22.464944)">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect2995"
-       width="21.840174"
-       height="21.708315"
-       x="14.113624"
-       y="25.052813" />
+    <path
+       style="fill:#ffffff;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 37.041667,46.968752 H 13.229166 l 11.906251,-22.489589 11.90625,22.489589"
+       id="path3789-1-2-1-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
     <path
        style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="m 17.558711,38.790719 6.494319,-2.044508 2.164773,-4.089016 8.659091,10.22254"
@@ -82,9 +83,9 @@
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccc" />
     <path
-       style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 37.041667,46.968752 H 13.229166 l 11.906251,-22.489589 11.90625,22.489589"
-       id="path3789-1-2-1-8"
+       style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 37.170475,46.821459 -23.812501,0 11.906251,-22.489589 11.90625,22.489589"
+       id="path3789-1-2-1-8-3"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccc" />
   </g>
diff --git a/src/locale/qmapshack.ts b/src/locale/qmapshack.ts
index 8dfff11..5790d43 100644
--- a/src/locale/qmapshack.ts
+++ b/src/locale/qmapshack.ts
@@ -120,12 +120,12 @@
 <context>
     <name>CCanvas</name>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="61"/>
+        <location filename="../canvas/CCanvas.cpp" line="63"/>
         <source>View %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="705"/>
+        <location filename="../canvas/CCanvas.cpp" line="766"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
@@ -270,86 +270,86 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="113"/>
+        <location filename="../gis/db/CDBProject.cpp" line="114"/>
         <source>Failed to load...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="114"/>
+        <location filename="../gis/db/CDBProject.cpp" line="115"/>
         <source>Can't load file "%1" . It will be skipped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="127"/>
+        <location filename="../gis/db/CDBProject.cpp" line="128"/>
         <source>Project already in database...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="128"/>
+        <location filename="../gis/db/CDBProject.cpp" line="129"/>
         <source>The project "%1" has already been imported into the database. It will be skipped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="279"/>
+        <location filename="../gis/db/CDBProject.cpp" line="280"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="285"/>
+        <location filename="../gis/db/CDBProject.cpp" line="286"/>
         <source>Conflict with database...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="286"/>
+        <location filename="../gis/db/CDBProject.cpp" line="287"/>
         <source>Clone && Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="287"/>
+        <location filename="../gis/db/CDBProject.cpp" line="288"/>
         <source>Force Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="288"/>
+        <location filename="../gis/db/CDBProject.cpp" line="289"/>
         <source>Take remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="572"/>
+        <location filename="../gis/db/CDBProject.cpp" line="573"/>
         <source>Missing folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="573"/>
+        <location filename="../gis/db/CDBProject.cpp" line="574"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="580"/>
+        <location filename="../gis/db/CDBProject.cpp" line="581"/>
         <source>Save ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>There was an unexpected database error:
 
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="760"/>
+        <location filename="../gis/db/CDBProject.cpp" line="761"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="761"/>
+        <location filename="../gis/db/CDBProject.cpp" line="762"/>
         <source>Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -504,17 +504,17 @@ To solve this conflict you can create and save a clone, force your version or dr
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
-        <source>distance: </source>
+        <source>Distance: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
-        <source>ascent: </source>
+        <source>Ascent: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
-        <source>descent: </source>
+        <source>Descent: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -913,18 +913,23 @@ To solve this conflict you can create and save a clone, force your version or dr
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
-        <source>Length: %1 %2</source>
+        <source>Length: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
-        <source>Length: -</source>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
+        <source>Time: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
-        <source>Time: %1 %2</source>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
+        <source>Distance: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
+        <source>Length: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -948,11 +953,6 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
-        <source>Distance: %1 %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
         <source>Changed route points.</source>
         <translation type="unfinished"></translation>
@@ -992,262 +992,284 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="80"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="78"/>
         <source>_Clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="251"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="261"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
-        <source>Length: %1 %2</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <source>, %1-, %2-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
-        <source>, %1%2 %3, %4%5 %6</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="396"/>
+        <source>Time: %1%2, Speed: %3%4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
-        <source>, %1-, %2-</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
+        <source>Time: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
-        <source>Time: -, Speed: -</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+        <source>Moving: %1%2, Speed: %3%4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Moving: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="421"/>
         <source>Start: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
         <source>Start: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
         <source>End: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
         <source>End: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
         <source>Points: %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="443"/>
         <source>Invalid elevations!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>Invalid timestamps!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
         <source>Invalid positions!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
         <source>Activities: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
         <source>Index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
         <source>Index: visible %1, total %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
-        <source>Ele.: %1 %2</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+        <source>, Slope: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
-        <source> slope: %1%3 (%2%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
-        <source> speed: %1%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
         <source>... and %1 tags not displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
         <source>Distance: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
         <source>Moving: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1318"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1331"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1387"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1570"/>
         <source>track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1522"/>
         <source>Hide point %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1526"/>
         <source>Hide points %1..%2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
-        <source> Moving: %1%2 (%3%)</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="701"/>
+        <source>, %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
-        <source>, %1%2</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="124"/>
+        <source>Invalid points....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
-        <source> Time: %1%2</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="125"/>
+        <source>The track '%1' has %2 invalid points out of %3 visible points. Do you want to hide invalid points now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
-        <source>Time: %1, Speed: %2 %3</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
-        <source>Moving: %1, Speed: %2 %3</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>max.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="377"/>
+        <source>Length: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <source>, %1%2%3, %4%5%6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="589"/>
+        <source>Ele.: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <source>, Speed: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="636"/>
         <source>Ascent: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>Descent: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="644"/>
         <source>Ascent: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
-        <source> Descent: %1%2 (%3%)</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
+        <source>, Descent: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
         <source>Distance: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <source>, Moving: %1%2 (%3%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
         <source>Ascent: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
         <source>Descent: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
         <source>Ascent: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
-        <source> Descent: %1%2</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="696"/>
+        <source>, Descent: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="706"/>
         <source>Distance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="711"/>
+        <source>, Time: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1377"/>
         <source>Permanently removed points %1..%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1555"/>
         <source>Show points.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2194"/>
         <source>Changed name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2200"/>
         <source>Changed comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2206"/>
         <source>Changed description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2223"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2247"/>
         <source>Changed activity to '%1' for complete track.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2286"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1332,7 +1354,7 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qlgt/converter.cpp" line="195"/>
+        <location filename="../qlgt/converter.cpp" line="196"/>
         <source>Copy flag information from QLandkarte GT track</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1355,70 +1377,85 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="104"/>
         <source>_Clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
-        <source>Elevation: %1 %2</source>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="277"/>
+        <source>Elevation: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
-        <source>Proximity: %1 %2</source>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="288"/>
+        <source>Proximity: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
         <source>Changed name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
         <source>Changed position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
         <source>Changed elevation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="413"/>
+        <source>Removed proximity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="417"/>
         <source>Changed proximity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="432"/>
         <source>Changed icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="438"/>
         <source>Changed comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="444"/>
         <source>Changed description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="450"/>
         <source>Changed links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="456"/>
         <source>Changed images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="462"/>
         <source>Add image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="877"/>
+        <source>Changed to proximity-radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="882"/>
+        <source>Changed to nogo-area</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CGisListDB</name>
@@ -1573,249 +1610,269 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CGisListWks</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="101"/>
+        <location filename="../gis/CGisListWks.cpp" line="106"/>
         <source>Edit..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
         <source>Show on Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="109"/>
         <source>Hide from Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="109"/>
+        <location filename="../gis/CGisListWks.cpp" line="114"/>
         <source>Sort by Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="110"/>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Sort by Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="117"/>
+        <location filename="../gis/CGisListWks.cpp" line="122"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="119"/>
+        <location filename="../gis/CGisListWks.cpp" line="124"/>
         <source>Save as GPX 1.1 w/o ext...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="122"/>
+        <location filename="../gis/CGisListWks.cpp" line="127"/>
         <source>Send to Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Sync. with Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="126"/>
+        <location filename="../gis/CGisListWks.cpp" line="131"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="140"/>
         <source>Update Project on Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="166"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="149"/>
+        <location filename="../gis/CGisListWks.cpp" line="154"/>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="102"/>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="155"/>
         <source>Copy to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="113"/>
+        <location filename="../gis/CGisListWks.cpp" line="118"/>
         <source>Autom. Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="118"/>
+        <location filename="../gis/CGisListWks.cpp" line="123"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Track Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="154"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Select Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="155"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Edit Track Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="156"/>
+        <location filename="../gis/CGisListWks.cpp" line="161"/>
         <source>Reverse Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="157"/>
+        <location filename="../gis/CGisListWks.cpp" line="162"/>
         <source>Combine Tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="159"/>
+        <location filename="../gis/CGisListWks.cpp" line="164"/>
         <source>Copy Track with Waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="167"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Show Bubble</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="169"/>
+        <location filename="../gis/CGisListWks.cpp" line="175"/>
         <source>Move Waypoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="170"/>
+        <location filename="../gis/CGisListWks.cpp" line="176"/>
         <source>Proj. Waypoint...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../gis/CGisListWks.cpp" line="177"/>
+        <source>Change Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../gis/CGisListWks.cpp" line="178"/>
-        <source>Route Instructions</source>
+        <source>Toggle Nogo-Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <source>Delete Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
+        <source>Route Instructions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="191"/>
         <source>Calculate Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="181"/>
+        <location filename="../gis/CGisListWks.cpp" line="192"/>
         <source>Reset Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="193"/>
         <source>Edit Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="183"/>
+        <location filename="../gis/CGisListWks.cpp" line="194"/>
         <source>Convert to Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="192"/>
+        <location filename="../gis/CGisListWks.cpp" line="204"/>
         <source>Edit Area Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="199"/>
+        <location filename="../gis/CGisListWks.cpp" line="212"/>
         <source>Create Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="200"/>
+        <location filename="../gis/CGisListWks.cpp" line="213"/>
         <source>Change Icon (sel. waypt. only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="158"/>
+        <location filename="../gis/CGisListWks.cpp" line="163"/>
         <source>Set Track Activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="634"/>
+        <location filename="../gis/CGisListWks.cpp" line="646"/>
         <source>Drop items...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="659"/>
-        <location filename="../gis/CGisListWks.cpp" line="1691"/>
-        <location filename="../gis/CGisListWks.cpp" line="1729"/>
+        <location filename="../gis/CGisListWks.cpp" line="671"/>
+        <location filename="../gis/CGisListWks.cpp" line="1771"/>
+        <location filename="../gis/CGisListWks.cpp" line="1809"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="785"/>
+        <location filename="../gis/CGisListWks.cpp" line="797"/>
         <source>Saving workspace. Please wait.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="831"/>
+        <location filename="../gis/CGisListWks.cpp" line="843"/>
         <source>Loading workspace. Please wait.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>Close all projects...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>This will remove all projects from the workspace.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Delete project...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Do you really want to delete %1?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>CGisWidget</name>
+    <name>CGisWorkspace</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>Load project...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>The project "%1" is already in the workspace.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="559"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="213"/>
+        <source><b>Item Selection: </b>Item selected from workspace list. Click on the map to switch back to normal mouse selection behavior.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="626"/>
         <source>Copy items...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="578"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="645"/>
         <source>Change waypoint symbols.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Cut Track...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Do you want to delete the original track?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1942,98 +1999,295 @@ line %2, column %3:
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <source>Speed</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
+        <source>Cadence</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
+        <source>Air Temp.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
         <source>Air Temperature</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
+        <source>Water Temp.</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
         <source>Water Temperature</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
         <source>Depth</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
+        <source>Depth</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
+        <source>Heart R.</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
         <source>Heart Rate</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="93"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="112"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
         <source>Cadence</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
         <source>Speed</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+        <source>Accel.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
         <source>Acceleration</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
         <source>Course</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
+        <source>Course</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
+        <source>Temp.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
         <source>Temperature</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
+        <source>Dist.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
         <source>Distance</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Ele.</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <source>Elevation</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
+        <source>Energy</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
         <source>Energy</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Sea Lev. Pres.</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
         <source>Sea Level Pressure</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
-        <source>Speed (vertical)</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>v. Speed</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
-        <source>Slope*</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>Vertical Speed</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
-        <source>Speed*</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
-        <source>Elevation</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <source>Speed over Distance*</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
+        <source>Speed over Time*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Elevation*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
         <source>Progress</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
-        <source>Terrain slope</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
+        <source>Progress*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terr. Slope</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terrain Slope*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope*</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLogProject</name>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="62"/>
+        <source>Failed to load file %1...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="84"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="95"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="102"/>
+        <source>Not an Openambit log file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="113"/>
+        <source>Device: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="140"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="145"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="150"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="182"/>
+        <source>Use of local time...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="183"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="245"/>
+        <source>This LOG file does not contain any position data and can not be displayed by QMapShack: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2048,53 +2302,54 @@ line %2, column %3:
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="813"/>
+        <location filename="../CMainWindow.cpp" line="859"/>
         <source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="941"/>
-        <source>Ele: %1%2</source>
+        <location filename="../CMainWindow.cpp" line="987"/>
+        <source>Ele.: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="953"/>
+        <location filename="../CMainWindow.cpp" line="999"/>
         <source>Slope: %1%2</source>
+        <comment>terrain</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="969"/>
+        <location filename="../CMainWindow.cpp" line="1015"/>
         <source>[Grid: %1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1110"/>
+        <location filename="../CMainWindow.cpp" line="1156"/>
         <source>Load GIS Data...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
         <source>Select output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>QMapShack View (*.view)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>Select file to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1481"/>
+        <location filename="../CMainWindow.cpp" line="1532"/>
         <source>Fatal...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1482"/>
+        <location filename="../CMainWindow.cpp" line="1533"/>
         <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3038,42 +3293,42 @@ Unknown structure.</source>
 <context>
     <name>CMouseNormal</name>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="39"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
         <source>Add POI as Waypoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
         <source>Add Waypoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
         <source>Add Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
         <source>Add Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="44"/>
         <source>Add Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="45"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="46"/>
         <source>Select Items On Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
         <source>Copy position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="49"/>
         <source>Copy position (Grid)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3089,7 +3344,7 @@ Unknown structure.</source>
 <context>
     <name>CMouseRangeTrk</name>
     <message>
-        <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
+        <location filename="../mouse/CMouseRangeTrk.cpp" line="239"/>
         <source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
         <translation type="unfinished"></translation>
     </message>
@@ -3139,12 +3394,12 @@ Unknown structure.</source>
     <name>CPlot</name>
     <message>
         <location filename="../plot/CPlot.cpp" line="55"/>
-        <source>distance [%1]</source>
+        <source>Distance [%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../plot/CPlot.cpp" line="60"/>
-        <source>time</source>
+        <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3152,12 +3407,12 @@ Unknown structure.</source>
     <name>CPlotProfile</name>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="79"/>
-        <source>distance [%1]</source>
+        <source>Distance [%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="80"/>
-        <source>alt. [%1]</source>
+        <source>Ele. [%1]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3206,12 +3461,12 @@ y: %4 m/px</source>
 <context>
     <name>CProgressDialog</name>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="46"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="48"/>
         <source>Elapsed time: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="132"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="134"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3256,6 +3511,29 @@ is not a valid coordinate system definition:
     </message>
 </context>
 <context>
+    <name>CQlbProject</name>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="138"/>
+        <source>Could not convert...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="139"/>
+        <source>The file contains overlays that can not be converted. This is because QMapShack does not support all overlay types of QLandkarte.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CQlgtDb</name>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="308"/>
@@ -3441,114 +3719,120 @@ is not a valid coordinate system definition:
 <context>
     <name>CRouterBRouter</name>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
         <source>original</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
         <source>first alternative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
         <source>second alternative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="53"/>
         <source>third alternative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="148"/>
         <source>BRouter (offline)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="155"/>
         <source>BRouter (online)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="185"/>
         <source>profile: %1, alternative: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="283"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="408"/>
+        <source>BRouter does not support more then 1 nogo-area in this version, consider to upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="297"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="420"/>
         <source>response is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="334"/>
         <source>Bad response from server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="386"/>
         <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="270"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="389"/>
         <source>Calculate route with %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="454"/>
         <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="444"/>
         <source><br/>Calculation time: %1s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="548"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="600"/>
         <source>running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="592"/>
         <source>starting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="554"/>
         <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="581"/>
         <source>Warning...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="586"/>
         <source>I understand the risk. Don't tell me again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="607"/>
         <source>stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="618"/>
         <source>not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="629"/>
         <source>online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4272,17 +4556,17 @@ is not a valid coordinate system definition:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="58"/>
         <source>Select files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="82"/>
         <source>Select target path...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="143"/>
         <source>!!! done !!!
 </source>
         <translation type="unfinished"></translation>
@@ -4470,6 +4754,71 @@ line %2, column %3:
     </message>
 </context>
 <context>
+    <name>CSmlProject</name>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="63"/>
+        <source>Failed to load file %1...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="85"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="96"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="103"/>
+        <source>Not an sml file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="129"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="134"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="139"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="160"/>
+        <source>Device: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="148"/>
+        <source>Battery usage: %1 %/hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="195"/>
+        <source>Use of local time...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="196"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="245"/>
+        <source>This SML file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CTableTrk</name>
     <message>
         <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
@@ -4483,7 +4832,7 @@ line %2, column %3:
         <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
-        <source>%1 %2</source>
+        <source>%1%2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5376,42 +5725,42 @@ If you want to keep just one half you can simply remove the points, or check thi
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="118"/>
+        <location filename="../dem/IDemList.ui" line="112"/>
         <source>To add files with elevation data use <b>File->Setup DEM Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="131"/>
+        <location filename="../dem/IDemList.ui" line="125"/>
         <source>Use the context menu (right mouse button click on entry) to activate a file. Use drag-n-drop to move the activated file in the process order. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="156"/>
+        <location filename="../dem/IDemList.ui" line="150"/>
         <source>Activate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="165"/>
+        <location filename="../dem/IDemList.ui" line="159"/>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="168"/>
+        <location filename="../dem/IDemList.ui" line="162"/>
         <source>Hide DEM behind previous one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="177"/>
+        <location filename="../dem/IDemList.ui" line="171"/>
         <source>Move down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="180"/>
+        <location filename="../dem/IDemList.ui" line="174"/>
         <source>Show DEM on top of next one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="189"/>
+        <location filename="../dem/IDemList.ui" line="183"/>
         <source>Reload DEM</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5951,7 +6300,7 @@ If you want to keep just one half you can simply remove the points, or check thi
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="292"/>
+        <location filename="../device/IDevice.cpp" line="314"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6446,89 +6795,117 @@ If you want to keep just one half you can simply remove the points, or check thi
     </message>
 </context>
 <context>
+    <name>IGisDatabase</name>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="59"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="64"/>
+        <source>Age</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="97"/>
+        <source>To add a database do a right click on the database list above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="44"/>
+        <location filename="../gis/IGisItem.cpp" line="45"/>
         <source>[no name]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>The item is not part of the project in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="317"/>
+        <location filename="../gis/IGisItem.cpp" line="318"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="323"/>
+        <location filename="../gis/IGisItem.cpp" line="324"/>
         <source>The item is not in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="329"/>
+        <location filename="../gis/IGisItem.cpp" line="330"/>
         <source>The item might need to be saved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="413"/>
+        <location filename="../gis/IGisItem.cpp" line="414"/>
         <source>Initial version.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="529"/>
+        <location filename="../gis/IGisItem.cpp" line="534"/>
+        <source>Never ask again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="535"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="530"/>
+        <location filename="../gis/IGisItem.cpp" line="536"/>
         <source>Read Only Mode...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="700"/>
-        <location filename="../gis/IGisItem.cpp" line="753"/>
+        <location filename="../gis/IGisItem.cpp" line="713"/>
+        <location filename="../gis/IGisItem.cpp" line="766"/>
         <source><h4>Description:</h4></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="703"/>
-        <location filename="../gis/IGisItem.cpp" line="756"/>
+        <location filename="../gis/IGisItem.cpp" line="716"/>
+        <location filename="../gis/IGisItem.cpp" line="769"/>
         <source><p>--- no description ---</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="714"/>
+        <location filename="../gis/IGisItem.cpp" line="727"/>
         <source><h4>Comment:</h4></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="717"/>
+        <location filename="../gis/IGisItem.cpp" line="730"/>
         <source><p>--- no comment ---</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="728"/>
-        <location filename="../gis/IGisItem.cpp" line="767"/>
+        <location filename="../gis/IGisItem.cpp" line="741"/>
+        <location filename="../gis/IGisItem.cpp" line="780"/>
         <source><h4>Links:</h4></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="731"/>
-        <location filename="../gis/IGisItem.cpp" line="770"/>
+        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="783"/>
         <source><p>--- no links ---</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Edit name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Enter new %1 name.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6536,118 +6913,107 @@ It is either a new item or it has been deleted in the database by someone else.<
 <context>
     <name>IGisProject</name>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source>Save project?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source><h3>%1</h3>The project was changed. Save before closing it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="356"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="375"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="366"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="385"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="367"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="386"/>
         <source>Canceled correlation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="412"/>
-        <location filename="../gis/prj/IGisProject.cpp" line="469"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="431"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="488"/>
         <source>Save "%1" to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="554"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="573"/>
         <source><br/>
 Filename: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="559"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="578"/>
         <source>Waypoints: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="563"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="582"/>
         <source>Tracks: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="567"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="586"/>
         <source>Routes: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="571"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="590"/>
         <source>Areas: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="691"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="733"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="692"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="734"/>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>IGisWidget</name>
+    <name>IGisWorkspace</name>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="14"/>
+        <location filename="../gis/IGisWorkspace.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="43"/>
+        <location filename="../gis/IGisWorkspace.ui" line="43"/>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="50"/>
+        <location filename="../gis/IGisWorkspace.ui" line="50"/>
         <source>Change the opacity of all GIS Items on the map.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="66"/>
+        <location filename="../gis/IGisWorkspace.ui" line="66"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="116"/>
-        <location filename="../gis/IGisWidget.ui" line="146"/>
+        <location filename="../gis/IGisWorkspace.ui" line="116"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="151"/>
-        <source>Age</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="185"/>
-        <source>To add a database do a right click on the database list above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="205"/>
+        <location filename="../gis/IGisWorkspace.ui" line="129"/>
         <source>Clear Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <location filename="../gis/IGisWorkspace.ui" line="138"/>
         <source>Setup Filter</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6749,7 +7115,7 @@ Filename: %1</source>
 <context>
     <name>ILineOp</name>
     <message>
-        <location filename="../mouse/line/ILineOp.cpp" line="212"/>
+        <location filename="../mouse/line/ILineOp.cpp" line="279"/>
         <source>Routing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6801,378 +7167,394 @@ Filename: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="103"/>
+        <location filename="../IMainWindow.ui" line="104"/>
         <source>Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="113"/>
+        <location filename="../IMainWindow.ui" line="114"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="121"/>
-        <source>Project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="132"/>
+        <location filename="../IMainWindow.ui" line="133"/>
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="157"/>
+        <location filename="../IMainWindow.ui" line="152"/>
         <source>Maps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="200"/>
+        <location filename="../IMainWindow.ui" line="189"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="239"/>
-        <source>Data</source>
+        <location filename="../IMainWindow.ui" line="122"/>
+        <location filename="../IMainWindow.ui" line="222"/>
+        <source>Workspace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="257"/>
-        <source>Route</source>
+        <location filename="../IMainWindow.ui" line="231"/>
+        <source>Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="287"/>
-        <source>Toolbar</source>
+        <location filename="../IMainWindow.ui" line="257"/>
+        <source>Routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="302"/>
-        <location filename="../IMainWindow.ui" line="305"/>
+        <location filename="../IMainWindow.ui" line="276"/>
+        <location filename="../IMainWindow.ui" line="279"/>
         <source>Add Map View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="308"/>
+        <location filename="../IMainWindow.ui" line="282"/>
         <source>Ctrl+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="323"/>
+        <location filename="../IMainWindow.ui" line="297"/>
         <source>Show Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="335"/>
+        <location filename="../IMainWindow.ui" line="309"/>
         <source>Setup Map Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="350"/>
+        <location filename="../IMainWindow.ui" line="324"/>
         <source>Show Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="353"/>
+        <location filename="../IMainWindow.ui" line="327"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="365"/>
+        <location filename="../IMainWindow.ui" line="339"/>
         <source>Setup Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="368"/>
+        <location filename="../IMainWindow.ui" line="342"/>
         <source>Ctrl+Alt+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="383"/>
+        <location filename="../IMainWindow.ui" line="357"/>
         <source>Flip Mouse Wheel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="395"/>
-        <location filename="../IMainWindow.ui" line="398"/>
+        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="372"/>
         <source>Setup Map Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="413"/>
+        <location filename="../IMainWindow.ui" line="387"/>
         <source>POI Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="428"/>
+        <location filename="../IMainWindow.ui" line="402"/>
         <source>Night / Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="443"/>
+        <location filename="../IMainWindow.ui" line="417"/>
         <source>Map Tool Tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="446"/>
+        <location filename="../IMainWindow.ui" line="420"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="458"/>
+        <location filename="../IMainWindow.ui" line="432"/>
         <source>Setup DEM Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="470"/>
+        <location filename="../IMainWindow.ui" line="444"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="482"/>
+        <location filename="../IMainWindow.ui" line="456"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="485"/>
+        <location filename="../IMainWindow.ui" line="459"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="497"/>
-        <location filename="../IMainWindow.ui" line="500"/>
+        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="474"/>
         <source>Setup Map View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="512"/>
+        <location filename="../IMainWindow.ui" line="486"/>
         <source>Load GIS Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="515"/>
+        <location filename="../IMainWindow.ui" line="489"/>
         <source>Load projects from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="518"/>
+        <location filename="../IMainWindow.ui" line="492"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="530"/>
+        <location filename="../IMainWindow.ui" line="504"/>
         <source>Save All GIS Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="533"/>
+        <location filename="../IMainWindow.ui" line="507"/>
         <source>Save all projects in the workspace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="536"/>
+        <location filename="../IMainWindow.ui" line="510"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="548"/>
+        <location filename="../IMainWindow.ui" line="522"/>
         <source>Setup Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="560"/>
+        <location filename="../IMainWindow.ui" line="534"/>
         <source>Add empty project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="575"/>
+        <location filename="../IMainWindow.ui" line="549"/>
         <source>Search Google</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="587"/>
+        <location filename="../IMainWindow.ui" line="561"/>
         <source>Close all projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="590"/>
+        <location filename="../IMainWindow.ui" line="564"/>
         <source>F8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="602"/>
+        <location filename="../IMainWindow.ui" line="576"/>
         <source>Setup Units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="614"/>
+        <location filename="../IMainWindow.ui" line="588"/>
         <source>Setup Workspace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="617"/>
+        <location filename="../IMainWindow.ui" line="591"/>
         <source>Setup save on exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="629"/>
+        <location filename="../IMainWindow.ui" line="603"/>
         <source>Import Database from QLandkarte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="632"/>
+        <location filename="../IMainWindow.ui" line="606"/>
         <source>Import QLandkarte GT database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="644"/>
+        <location filename="../IMainWindow.ui" line="618"/>
         <source>VRT Builder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="647"/>
+        <location filename="../IMainWindow.ui" line="621"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="659"/>
+        <location filename="../IMainWindow.ui" line="633"/>
         <source>Store Map View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="662"/>
+        <location filename="../IMainWindow.ui" line="636"/>
         <source>Write current active map and DEM list including the properties to a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="674"/>
+        <location filename="../IMainWindow.ui" line="648"/>
         <source>Load Map View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="677"/>
+        <location filename="../IMainWindow.ui" line="651"/>
         <source>Restore view with active map and DEM list including the properties from a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="692"/>
+        <location filename="../IMainWindow.ui" line="666"/>
         <source>Ext. Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="695"/>
+        <location filename="../IMainWindow.ui" line="669"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="707"/>
+        <location filename="../IMainWindow.ui" line="681"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="710"/>
+        <location filename="../IMainWindow.ui" line="684"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="722"/>
+        <location filename="../IMainWindow.ui" line="696"/>
         <source>Clone Map View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="725"/>
+        <location filename="../IMainWindow.ui" line="699"/>
         <source>Ctrl+Shift+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="737"/>
+        <location filename="../IMainWindow.ui" line="711"/>
         <source>Create Routino Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="749"/>
+        <location filename="../IMainWindow.ui" line="723"/>
         <source>Save(Print) Map Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="752"/>
+        <location filename="../IMainWindow.ui" line="726"/>
         <source>Print a selected area of the map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="755"/>
+        <location filename="../IMainWindow.ui" line="729"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="767"/>
+        <location filename="../IMainWindow.ui" line="741"/>
         <source>Setup Coord. Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="770"/>
+        <location filename="../IMainWindow.ui" line="744"/>
         <source>Change the format coordinates are displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="782"/>
+        <location filename="../IMainWindow.ui" line="756"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="794"/>
+        <location filename="../IMainWindow.ui" line="768"/>
         <source>Setup Waypoint Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="797"/>
+        <location filename="../IMainWindow.ui" line="771"/>
         <source>Setup path to custom icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="806"/>
+        <location filename="../IMainWindow.ui" line="780"/>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="809"/>
+        <location filename="../IMainWindow.ui" line="783"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="818"/>
+        <location filename="../IMainWindow.ui" line="792"/>
         <source>Quickstart Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="827"/>
+        <location filename="../IMainWindow.ui" line="801"/>
         <source>Setup Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="839"/>
+        <location filename="../IMainWindow.ui" line="813"/>
         <source>Toggle Docks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="842"/>
+        <location filename="../IMainWindow.ui" line="816"/>
         <source>Toggle visibility of dockable windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="845"/>
+        <location filename="../IMainWindow.ui" line="819"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="854"/>
+        <location filename="../IMainWindow.ui" line="828"/>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="857"/>
+        <location filename="../IMainWindow.ui" line="831"/>
         <source>F11</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="843"/>
+        <source>Min./Max. Track Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="846"/>
+        <source>Show the minimum and maximum values of the track properties along the track in the map view.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="849"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="245"/>
+        <source>Database</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IMapList</name>
@@ -7403,14 +7785,18 @@ I don't want to read the documentation!</source>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
-        <source>1. Select one or multiple source files.
-2. Select a file name for the target VRT file.
-3. Press "Start" button.
+        <source><ol>
+<li>Select one or multiple source files.</li>
+<li>Select a file name for the target VRT file.</li>
+<li>Press "Start" button.</li>
+</ol>
 
 Tip:
-* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
-* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
-* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
+<ul>
+<li>If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.</li>
+<li>Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.</li>
+<li>The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</li>
+</ul></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7448,62 +7834,62 @@ Tip:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="289"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="300"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="297"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="308"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="305"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="316"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="313"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="321"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="327"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="343"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="504"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="515"/>
         <source><b>%1 Metrics</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="507"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="518"/>
         <source>Distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="509"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="520"/>
         <source>Ascent:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="511"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="522"/>
         <source>Descent:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.h" line="135"/>
+        <location filename="../mouse/line/IMouseEditLine.h" line="137"/>
         <source><br/><b>Move the map</b><br/>If you keep the left mouse button pressed and move the mouse, you will move the map.<br/><br/></source>
         <translation type="unfinished"></translation>
     </message>
@@ -7791,6 +8177,21 @@ or
         <source>Caution! BRouter is listening on all ports for connections.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="217"/>
+        <source><p><a href="http://brouter.de/brouter/" target="_blank">BRouter</a> © <a href="https://github.com/abrensch/brouter/blob/master/LICENSE" target="_blank">ABrensch, Licence GPLv3</a></p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="227"/>
+        <source><p>Directions Courtesy of <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="237"/>
+        <source><p>Routing data <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a> contributors</p></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRouterBRouterInfo</name>
@@ -8079,7 +8480,7 @@ or
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="131"/>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="118"/>
         <source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path. You can create your own routing data with <b>Tool->Create Routino Database</b>.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8119,13 +8520,13 @@ or
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="22"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="25"/>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="63"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="39"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="42"/>
         <source>Select source files:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8149,6 +8550,18 @@ or
         <source>File Prefix</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="133"/>
+        <source><p>To create a Routino routing database you need to download *pbf files from <a href='http://download.geofabrik.de/'>GeoFabrik</a>. The process of creating a Routino database is quite slow and the resulting files quite large. Therefore it's recommended not to download whole continents. Limit your download to those countries you really need. However as Routino can't route over several databases you have to include all countries that ar [...]
+
+<ol>
+<li>Select one or multiple source *.pbf files.</li>
+<li>Select a path for your Routino database.</li>
+<li>Select a prefix. The database will be listed by this prefix.</li>
+<li>Press "Start" button.</li>
+</ol></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IScrOptEditLine</name>
@@ -8659,6 +9072,8 @@ or
         <location filename="../gis/wpt/IScrOptWpt.ui" line="101"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="118"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="132"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="153"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="170"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8688,7 +9103,57 @@ or
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="176"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="150"/>
+        <source>edit radius of circular area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="167"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="185"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="232"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptWptRadius</name>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="49"/>
+        <source>edit radius of circular area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="52"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="66"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="84"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="63"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="81"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="128"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9521,6 +9986,11 @@ or
         <source>short format</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="123"/>
+        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IToolBarSetupDialog</name>
@@ -9576,18 +10046,18 @@ or
 <context>
     <name>IUnit</name>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
         <source>Bad position format. Must be: "[N|S] ddd mm.sss [W|E] ddd mm.sss" or "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Position values out of bounds. </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9600,22 +10070,42 @@ or
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="24"/>
+        <location filename="../units/IUnitsSetup.ui" line="36"/>
+        <source>Length unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="48"/>
         <source>Nautic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="31"/>
+        <location filename="../units/IUnitsSetup.ui" line="61"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="38"/>
+        <location filename="../units/IUnitsSetup.ui" line="74"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="47"/>
+        <location filename="../units/IUnitsSetup.ui" line="80"/>
+        <source>Slope unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="92"/>
+        <source>Degrees (°)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="105"/>
+        <source>Percent (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="133"/>
         <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/locale/qmapshack_es.ts b/src/locale/qmapshack_ca.ts
similarity index 66%
copy from src/locale/qmapshack_es.ts
copy to src/locale/qmapshack_ca.ts
index 0039761..57129f5 100644
--- a/src/locale/qmapshack_es.ts
+++ b/src/locale/qmapshack_ca.ts
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="es_ES">
+<TS version="2.1" language="ca">
 <context>
     <name>CAbout</name>
     <message>
         <location filename="../CAbout.cpp" line="38"/>
         <source>%1 (API V%2, expected V%3)</source>
-        <translation>%1 (API V%2, se esperaba V%3)</translation>
+        <translation>%1 (API V%2, s'esperava V%3)</translation>
     </message>
     <message>
         <location filename="../CAbout.cpp" line="42"/>
@@ -16,7 +16,7 @@
     <message>
         <location filename="../CAbout.cpp" line="49"/>
         <source>(no DBUS: device detection and handling disabled)</source>
-        <translation>(no DBUS: detección y manipulación de dispositivos desactivados)</translation>
+        <translation>(no DBUS: la detecció i manipulació de dispositius està desactivada)</translation>
     </message>
 </context>
 <context>
@@ -24,7 +24,7 @@
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="51"/>
         <source>Foot</source>
-        <translation>A pié</translation>
+        <translation>A peu</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="59"/>
@@ -39,32 +39,32 @@
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="75"/>
         <source>Car</source>
-        <translation>Coche</translation>
+        <translation>Cotxe</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="83"/>
         <source>Cable Car</source>
-        <translation>Teleférico</translation>
+        <translation>Telefèric</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="91"/>
         <source>Swim</source>
-        <translation>Natación</translation>
+        <translation>Natació</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="99"/>
         <source>Ship</source>
-        <translation>Barco</translation>
+        <translation>Vaixell</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="115"/>
         <source>Ski/Winter</source>
-        <translation>Esquí</translation>
+        <translation>Esquí/Hivern</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
         <source>No Activity</source>
-        <translation>Sin Actividad</translation>
+        <translation>Sense activitat</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
@@ -74,60 +74,60 @@
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
         <source>Ascent:</source>
-        <translation>Ascenso:</translation>
+        <translation>Ascens:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="372"/>
         <source>Descent:</source>
-        <translation>Descenso:</translation>
+        <translation>Descens:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="107"/>
         <source>Aeronautics</source>
-        <translation>Aeronáutica</translation>
+        <translation>Aeronàutica</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
         <source>Public Transport</source>
-        <translation>Transporte Público</translation>
+        <translation>Transport Públic</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
         <source>Distance:</source>
-        <translation>Distancia:</translation>
+        <translation>Distància:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="396"/>
         <source>Speed Moving:</source>
-        <translation>Velocidad en movimiento:</translation>
+        <translation>Velocitat en Moviment:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="420"/>
         <source>Speed Total:</source>
-        <translation>Velocidad Total:</translation>
+        <translation>Velocitat Total:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="444"/>
         <source>Time Moving:</source>
-        <translation>Tiempo en movimiento:</translation>
+        <translation>Temps en Moviment:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="468"/>
         <source>Time Total:</source>
-        <translation>Tiempo Total:</translation>
+        <translation>Temps Total:</translation>
     </message>
 </context>
 <context>
     <name>CCanvas</name>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="61"/>
+        <location filename="../canvas/CCanvas.cpp" line="63"/>
         <source>View %1</source>
         <translation>Vista %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="705"/>
+        <location filename="../canvas/CCanvas.cpp" line="766"/>
         <source>Setup Map Background</source>
-        <translation>Configuracion del Mapa de Fondo</translation>
+        <translation>Configura el Fons del Mapa</translation>
     </message>
 </context>
 <context>
@@ -143,32 +143,32 @@
     <message>
         <location filename="../setup/CCommandProcessor.cpp" line="31"/>
         <source>Print debug output to console.</source>
-        <translation>Imprimir salida de depuración en la consola.</translation>
+        <translation>Imprimeix la sortida de depuració a la consola.</translation>
     </message>
     <message>
         <location filename="../setup/CCommandProcessor.cpp" line="34"/>
         <source>Print debug output to logfile (temp. path).</source>
-        <translation>Imprimir salida de depuración en archivo (carpeta temporal).</translation>
+        <translation>Imprimeix la sortida de depuració al fitxer de registre (temp. camí).</translation>
     </message>
     <message>
         <location filename="../setup/CCommandProcessor.cpp" line="37"/>
         <source>Do not show splash screen.</source>
-        <translation>No mostrar pantalla de bienvenida</translation>
+        <translation>No mostrar la pantalla de presentació.</translation>
     </message>
     <message>
         <location filename="../setup/CCommandProcessor.cpp" line="40"/>
         <source>File with QMapShack configuration.</source>
-        <translation>Archivo con la configuración de QMapShack</translation>
+        <translation>Fitxer amb configuració QMapShack.</translation>
     </message>
     <message>
         <location filename="../setup/CCommandProcessor.cpp" line="40"/>
         <source>file</source>
-        <translation>Archivo</translation>
+        <translation>Fitxer</translation>
     </message>
     <message>
         <location filename="../setup/CCommandProcessor.cpp" line="43"/>
         <source>Files for future use.</source>
-        <translation>Archivos para uso futuro</translation>
+        <translation>Fitxers per a utilitzar més endavant.</translation>
     </message>
 </context>
 <context>
@@ -184,17 +184,17 @@
     <message>
         <location filename="../gis/db/CDBFolderLostFound.cpp" line="30"/>
         <source>All your data grouped by folders.</source>
-        <translation>Todos tus datos agrupados en carpetas.</translation>
+        <translation>Totes les teves dades agrupades en carpetes. </translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderLostFound.cpp" line="59"/>
         <source>Lost & Found (%1)</source>
-        <translation>Objetos Perdidos (%1)</translation>
+        <translation>Perdut i trobat (%1)</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderLostFound.cpp" line="64"/>
         <source>Lost & Found</source>
-        <translation>Objetos Perdidos</translation>
+        <translation>Perdut i trobat</translation>
     </message>
 </context>
 <context>
@@ -202,12 +202,12 @@
     <message>
         <location filename="../gis/db/CDBFolderMysql.cpp" line="33"/>
         <source>All your data grouped by folders.</source>
-        <translation>Todos tus datos agrupados en carpetas.</translation>
+        <translation>Totes les teves dades agrupades en carpetes. </translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderMysql.cpp" line="53"/>
         <source>MySQL Database</source>
-        <translation>Mi base de datos SQL</translation>
+        <translation>Base de Dades MySQL</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderMysql.cpp" line="56"/>
@@ -218,12 +218,12 @@
     <message>
         <location filename="../gis/db/CDBFolderMysql.cpp" line="65"/>
         <source> (No PW)</source>
-        <translation>(Sin PW)</translation>
+        <translation>(No PI)</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderMysql.cpp" line="73"/>
         <source>Error: </source>
-        <translation>Error: </translation>
+        <translation>Error:</translation>
     </message>
 </context>
 <context>
@@ -231,22 +231,22 @@
     <message>
         <location filename="../gis/db/CDBFolderSqlite.cpp" line="30"/>
         <source>All your data grouped by folders.</source>
-        <translation>Todos tus datos agrupados en carpetas.</translation>
+        <translation>Totes les teves dades agrupades en carpetes. </translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderSqlite.cpp" line="52"/>
         <source>SQLite Database</source>
-        <translation>Base de Datos SQLite</translation>
+        <translation>Base de Dades SQLite</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderSqlite.cpp" line="62"/>
         <source>File: </source>
-        <translation>Archivo:</translation>
+        <translation>Fitxer:</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderSqlite.cpp" line="66"/>
         <source>Error: </source>
-        <translation>Error: </translation>
+        <translation>Error:</translation>
     </message>
 </context>
 <context>
@@ -264,98 +264,98 @@
     <message>
         <location filename="../gis/db/CDBItem.cpp" line="99"/>
         <source>%1 days</source>
-        <translation>%1 dias</translation>
+        <translation>%1 dia</translation>
     </message>
 </context>
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="113"/>
+        <location filename="../gis/db/CDBProject.cpp" line="114"/>
         <source>Failed to load...</source>
-        <translation>Falló al cargar...</translation>
+        <translation>No s'ha pogut carregar...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="114"/>
+        <location filename="../gis/db/CDBProject.cpp" line="115"/>
         <source>Can't load file "%1" . It will be skipped.</source>
-        <translation>No se puede cargar el archivo "%1" . Se omitirá.</translation>
+        <translation>No s'ha pogut carregar el fitxer "%1% . S'ometrà l'element.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="127"/>
+        <location filename="../gis/db/CDBProject.cpp" line="128"/>
         <source>Project already in database...</source>
-        <translation>Proyecto ya en base de datos ...</translation>
+        <translation>El Projecte ja és a la base de dades...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="128"/>
+        <location filename="../gis/db/CDBProject.cpp" line="129"/>
         <source>The project "%1" has already been imported into the database. It will be skipped.</source>
-        <translation>El proyecto "%1" Ya se ha importado a la base de datos. Se omitirá.</translation>
+        <translation>El projecte "%1" ja és a la base de dades. S'ometrà l'element.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="279"/>
+        <location filename="../gis/db/CDBProject.cpp" line="280"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
-        <translation>El elemento %1 se ha cambiado por %2 (%3). 
+        <translation>%2 (%3) ha modificat l'element %1. 
 
-Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar tu versión y tomar la de la base de datos</translation>
+Per a resolver aquest conflicte heu de crear i desar una còpia idèntica, forçar la vostra versió o deixar-la estar I agafar-ne una de la base de dades</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="285"/>
+        <location filename="../gis/db/CDBProject.cpp" line="286"/>
         <source>Conflict with database...</source>
-        <translation>Conflicto con la base de datos...</translation>
+        <translation>Conflicte amb la base de dades...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="286"/>
+        <location filename="../gis/db/CDBProject.cpp" line="287"/>
         <source>Clone && Save</source>
-        <translation>Duplicar y Guardar</translation>
+        <translation>Clona && Desa</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="287"/>
+        <location filename="../gis/db/CDBProject.cpp" line="288"/>
         <source>Force Save</source>
-        <translation>Forzar guardado</translation>
+        <translation>Desa forçosament</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="288"/>
+        <location filename="../gis/db/CDBProject.cpp" line="289"/>
         <source>Take remote</source>
-        <translation>Toma remota</translation>
+        <translation>Agafa'l remot</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="572"/>
+        <location filename="../gis/db/CDBProject.cpp" line="573"/>
         <source>Missing folder...</source>
-        <translation>Falta la carpeta</translation>
+        <translation>Manca la carpeta...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="573"/>
+        <location filename="../gis/db/CDBProject.cpp" line="574"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
-        <translation>Error al guardar el proyecto. La carpeta se ha eliminado de la base de datos.</translation>
+        <translation>No s'ha pogut desar el projecte. La carpeta s'ha esborrat de la base de dades.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="580"/>
+        <location filename="../gis/db/CDBProject.cpp" line="581"/>
         <source>Save ...</source>
-        <translation>Guardar...</translation>
+        <translation>Desa...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>There was an unexpected database error:
 
 %1</source>
-        <translation>Se produjo un error de base de datos inesperado:
+        <translation>S'ha produït un error inesperat a la base de dades:
 
 %1</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="760"/>
+        <location filename="../gis/db/CDBProject.cpp" line="761"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
-        <translation>El proyecto '%1' Está a punto de actualizarse desde la base de datos. Sin embargo, hay cambios no guardados.</translation>
+        <translation>El projecte '%1' és a punt de modificar-se desde la base de dades. Tanmateix hi ha canvis que no s'han desat.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="761"/>
+        <location filename="../gis/db/CDBProject.cpp" line="762"/>
         <source>Save changes?</source>
-        <translation>¿Guardar cambios?</translation>
+        <translation>Desar els canvis?</translation>
     </message>
 </context>
 <context>
@@ -376,12 +376,12 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../dem/CDemPathSetup.cpp" line="41"/>
         <source>Add or remove paths containing DEM data. There can be multiple files in a path but no sub-path is parsed. Supported formats are: %1</source>
-        <translation>Añadir o quitar rutas que contienen datos DEM. Puede haber múltiples archivos en una ruta, pero no se buscará en los subdirectorios. Los formatos soportados son: %1</translation>
+        <translation>Afegir o suprimir camins a dades DEM. Pot haver-hi diverses fitxers en un camí, però els camins secundaris no s'analitzaran. Els formats compatibles són: %1</translation>
     </message>
     <message>
         <location filename="../dem/CDemPathSetup.cpp" line="56"/>
         <source>Select DEM file path...</source>
-        <translation>Seleccione la ruta al archivo DEM...</translation>
+        <translation>Selecciona el camí als fitxers DEM...</translation>
     </message>
 </context>
 <context>
@@ -397,18 +397,18 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../dem/CDemVRT.cpp" line="44"/>
         <source>Failed to load file: %1</source>
-        <translation>Fallo al cargar el archivo: %1</translation>
+        <translation>  No s'ha pogut carregar el fitxer: %1</translation>
     </message>
     <message>
         <location filename="../dem/CDemVRT.cpp" line="52"/>
         <location filename="../dem/CDemVRT.cpp" line="61"/>
         <source>DEM must have one band with 16bit or 32bit data.</source>
-        <translation>El DEM debe tener una sola banda con datos de 16 o 32 bits.</translation>
+        <translation>Les dades DEM han de tenir un ample de banda de 16bit o 32bit.</translation>
     </message>
     <message>
         <location filename="../dem/CDemVRT.cpp" line="90"/>
         <source>No georeference information found.</source>
-        <translation>No se encontró información de georreferenciación.</translation>
+        <translation>No s'ha trobat informació de georeferència.</translation>
     </message>
 </context>
 <context>
@@ -416,7 +416,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="61"/>
         <source>none</source>
-        <translation>ninguno</translation>
+        <translation>cap</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="61"/>
@@ -427,31 +427,46 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="158"/>
         <source>Searching for images...</source>
-        <translation>Buscando imagenes...</translation>
+        <translation>Cercant imatges...</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="264"/>
         <source>No images found</source>
-        <translation>No se encontraron imagenes</translation>
+        <translation>  No s'ha trobat cap imatge</translation>
     </message>
 </context>
 <context>
     <name>CDetailsPrj</name>
     <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
+        <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
+        <translation>Voleu ordenar les fites al llarg d'un track, pero la correlació entre track i fita està desactivada. La voleu tornar a activar?</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
+        <source>Correlation...</source>
+        <translation>Correlació...</translation>
+    </message>
+    <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="267"/>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
         <source>none</source>
-        <translation>ninguna</translation>
+        <translation>Cap</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="340"/>
         <source>Build diary...</source>
-        <translation>Creando diario...</translation>
+        <translation>Crea el registre...</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="395"/>
+        <source><b>Summary over all tracks in project</b><br/></source>
+        <translation><b>Resum de tots els tracks del projecte</b><br/></translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="419"/>
         <source><h2>Waypoints</h2></source>
-        <translation>Waypoints</translation>
+        <translation><h2>Fites</h2></translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="426"/>
@@ -460,7 +475,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
         <location filename="../gis/prj/CDetailsPrj.cpp" line="691"/>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="721"/>
         <source>Info</source>
-        <translation>Información</translation>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="427"/>
@@ -469,22 +484,22 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
         <location filename="../gis/prj/CDetailsPrj.cpp" line="692"/>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="722"/>
         <source>Comment</source>
-        <translation>Comentario</translation>
+        <translation>Comentari</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
         <source><h2>Tracks</h2></source>
-        <translation>Tracks</translation>
+        <translation><h2>Pistes</h2></translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
         <source>From Start</source>
-        <translation>Desde el inicio</translation>
+        <translation>Des de l'inici</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
         <source>To Next</source>
-        <translation>Al siguiente</translation>
+        <translation>Al Següent</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
@@ -493,70 +508,55 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
-        <source>distance: </source>
-        <translation>Distancia:</translation>
+        <source>Distance: </source>
+        <translation>Distància:</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
-        <source>ascent: </source>
-        <translation>Ascenso:</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
-        <source><h2>Areas</h2></source>
-        <translation>Áreas</translation>
+        <source>Ascent: </source>
+        <translation>Ascens:</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
-        <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
-        <translation>Desea ordenar waypoints a lo largo de un track, pero ha desactivado la correlación de track y waypoint. ¿Desea volver a encenderlo?</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
-        <source>Correlation...</source>
-        <translation>Correlación..</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="395"/>
-        <source><b>Summary over all tracks in project</b><br/></source>
-        <translation><b>Resumen de todos los tracks del proyecto</b><br/></translation>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
+        <source>Descent: </source>
+        <translation>Descens:</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
-        <source>descent: </source>
-        <translation>descenso:</translation>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
+        <source><h2>Areas</h2></source>
+        <translation><h2>Àrees</h2></translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
         <source><h2>Routes</h2></source>
-        <translation><h2>Rutas</h2></translation>
+        <translation><h2>Rutes</h2></translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
         <source>Edit name...</source>
-        <translation>Editar nombre...</translation>
+        <translation>Edita el nom...</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
         <source>Enter new project name.</source>
-        <translation>Introducir nuevo nombre de proyecto.</translation>
+        <translation>Introdueix el nom del nou projecte.</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
         <source>Edit keywords...</source>
-        <translation>Editar etiquetas...</translation>
+        <translation>Edita les paraules clau...</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
         <source>Enter keywords.</source>
-        <translation>Introducir etiquetas.</translation>
+        <translation> Introduïu les paraules clau.</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="897"/>
         <source>Print Diary</source>
-        <translation>Imprimir Diario</translation>
+        <translation>Imprimir Diari</translation>
     </message>
 </context>
 <context>
@@ -564,22 +564,22 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
         <source>Reduce visible track points</source>
-        <translation>Reducir puntos visibles del track</translation>
+        <translation>Redueix els punts visibles del track</translation>
     </message>
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
         <source>Change elevation of track points</source>
-        <translation>Cambiar altitud de puntos del track</translation>
+        <translation>Canvia l'elevació dels punts del track</translation>
     </message>
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
         <source>Change timestamp of track points</source>
-        <translation>Cambiar fecha/hora de puntos del track</translation>
+        <translation>Canvia la data i hora dels punts del track</translation>
     </message>
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
         <source>Miscellaneous</source>
-        <translation>Diversos</translation>
+        <translation>Miscel·lània</translation>
     </message>
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
@@ -589,7 +589,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
         <source>Activity</source>
-        <translation>Actividad</translation>
+        <translation>Activitat</translation>
     </message>
 </context>
 <context>
@@ -597,7 +597,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/wpt/CDetailsWpt.cpp" line="166"/>
         <source>Enter new proximity range.</source>
-        <translation>Introduzca el nuevo valor de proximidad.</translation>
+        <translation>Introducció d'un nou interval de proximitat. </translation>
     </message>
 </context>
 <context>
@@ -605,12 +605,12 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../device/CDeviceGarmin.cpp" line="272"/>
         <source>Picture%1</source>
-        <translation>foto%1</translation>
+        <translation>Imatge%1</translation>
     </message>
     <message>
         <location filename="../gis/gpx/serialization.cpp" line="1068"/>
         <source>Unknown</source>
-        <translation>Desconocido</translation>
+        <translation>Desconegut</translation>
     </message>
 </context>
 <context>
@@ -618,12 +618,12 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../device/CDeviceGarminArchive.cpp" line="30"/>
         <source>Archive - expand to load</source>
-        <translation>Archivo: expanda para cargar</translation>
+        <translation>Arxiu - amplia per a carregar</translation>
     </message>
     <message>
         <location filename="../device/CDeviceGarminArchive.cpp" line="43"/>
         <source>Archive - loaded</source>
-        <translation>Archivo - cargado</translation>
+        <translation>S'ha carregat l'arxiu</translation>
     </message>
 </context>
 <context>
@@ -631,7 +631,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../helpers/CElevationDialog.cpp" line="92"/>
         <source>No DEM data found for that point.</source>
-        <translation>No se encontraron datos DEM para ese punto.</translation>
+        <translation>No s'han trobat dades DEM per aquest punt. </translation>
     </message>
 </context>
 <context>
@@ -639,7 +639,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/db/CExportDatabase.cpp" line="90"/>
         <source>Select export path...</source>
-        <translation>Seleccionar ruta de exportación ...</translation>
+        <translation>Selecciona el camí d'exportació...</translation>
     </message>
 </context>
 <context>
@@ -654,34 +654,34 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="82"/>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="126"/>
         <source>Failed to create %1</source>
-        <translation>Fallo al crear %1</translation>
+        <translation> S'ha produït un error al crear %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="88"/>
         <source>Done!</source>
-        <translation>¡Hecho!</translation>
+        <translation>Fet !</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="100"/>
         <source>Abort by user!</source>
-        <translation>¡Cancelado por el usuario!</translation>
+        <translation>Cancel·lat per l'usuari!</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="108"/>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="140"/>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="165"/>
         <source>Database Error: %1</source>
-        <translation>Error de base de datos: %1</translation>
+        <translation> Error de base de dades: %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="153"/>
         <source>Save project as %1</source>
-        <translation>Guardar proyecto como %1</translation>
+        <translation>  Desa el projecte com a %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="157"/>
         <source>Failed!</source>
-        <translation>¡Falló!</translation>
+        <translation> S'ha produït un error!</translation>
     </message>
 </context>
 <context>
@@ -689,7 +689,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/trk/filter/CFilterDeleteExtension.cpp" line="57"/>
         <source>No extension available</source>
-        <translation>Extensión no disponible</translation>
+        <translation>No hi ha extensions disponibles</translation>
     </message>
 </context>
 <context>
@@ -697,17 +697,17 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="30"/>
         <source>coarse</source>
-        <translation>grueso</translation>
+        <translation>ample</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="31"/>
         <source>medium</source>
-        <translation>medio</translation>
+        <translation>mitjà</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="32"/>
         <source>fine</source>
-        <translation>fino</translation>
+        <translation>fi</translation>
     </message>
 </context>
 <context>
@@ -715,7 +715,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/fit/decoder/CFitCrcState.cpp" line="32"/>
         <source>FIT decoding error : invalid CRC.</source>
-        <translation>Error decodificando FIT : CRC inválido.</translation>
+        <translation>Error descodificant el fitxer FIT: CRC invàlid.</translation>
     </message>
 </context>
 <context>
@@ -723,7 +723,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="132"/>
         <source>FIT decoding error: unexpected end of file %1.</source>
-        <translation>FIT error de descodificación: final inesperado del archivo %1.</translation>
+        <translation>Error descodificant el fitxer FIT: Final de fitxer inesperat %1.</translation>
     </message>
 </context>
 <context>
@@ -731,7 +731,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/fit/decoder/CFitFieldBuilder.cpp" line="77"/>
         <source>FIT decoding error: unknown base type %1.</source>
-        <translation>Error de descodificación FIT: tipo de base desconocido %1.</translation>
+        <translation>Error descodificant el fitxer FIT: tipus base desconegut %1.</translation>
     </message>
 </context>
 <context>
@@ -739,12 +739,12 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
         <source>Missing field definition for development field.</source>
-        <translation>Falta la definición de campo para el campo de desarrollo.</translation>
+        <translation>Manca la definició del camp pel camp desenvolupament.</translation>
     </message>
     <message>
         <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="226"/>
         <source>FIT decoding error: invalid field def nr %1 while creating dev field profile.</source>
-        <translation>Error de decodificación FIT: campo no válido def nr %1 al crear el perfil de campo dev</translation>
+        <translation>Error descodificant el fitxer FIT: Definició numèrica invàlida en el camp %1 en crear la definició del perfil del camp.</translation>
     </message>
 </context>
 <context>
@@ -752,12 +752,12 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/fit/decoder/CFitHeaderState.cpp" line="69"/>
         <source>FIT decoding error: protocol %1 version not supported.</source>
-        <translation>Error de descodificación FIT: la versión del protocolo %1 no es compatible.</translation>
+        <translation>Error descodificant el fitxer FIT: la versió del protocol %1 no està implementada.</translation>
     </message>
     <message>
         <location filename="../gis/fit/decoder/CFitHeaderState.cpp" line="120"/>
         <source>FIT decoding error: file header signature mismatch. File is not FIT.</source>
-        <translation>Error de descodificación de FIT: falta de coincidencia de firma de encabezado de archivo. El archivo no es FIT.</translation>
+        <translation>Error descodificant el fitxer FIT: la capçalera de signatura del fitxer no coincideix. No és un fitxer FIT.</translation>
     </message>
 </context>
 <context>
@@ -765,12 +765,12 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/fit/CFitProject.cpp" line="61"/>
         <source>Failed to load file %1...</source>
-        <translation>Falló al cargar archivo %1...</translation>
+        <translation>  No s'ha pogut carregar el fitxer %1...</translation>
     </message>
     <message>
         <location filename="../gis/fit/CFitProject.cpp" line="93"/>
         <source>Failed to open FIT file %1.</source>
-        <translation>Falló al cargar archivo FIT %1.</translation>
+        <translation>  No s'ha pogut obrir el fitxer FIT %1.</translation>
     </message>
 </context>
 <context>
@@ -778,12 +778,12 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="70"/>
         <source>FIT decoding error: architecture %1 not supported.</source>
-        <translation>Error decodificacion FIT: Arquitectura %1 no soportada</translation>
+        <translation>Error descodificant el fitxer FIT: No està implementada l'arquitectura %1 .</translation>
     </message>
     <message>
         <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="110"/>
         <source>FIT decoding error: invalid offset %1 for state 'record content'</source>
-        <translation>FIT error de decodificación: desplazamiento no válido %1 para el contenido de registro de estado'</translation>
+        <translation>Error descodificant el fitxer FIT: desplaçament no vàlid %1 en l'estat 'contingut del registre'</translation>
     </message>
 </context>
 <context>
@@ -792,17 +792,17 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
         <location filename="../map/garmin/CGarminTyp.cpp" line="457"/>
         <location filename="../map/garmin/CGarminTyp.cpp" line="838"/>
         <source>Warning...</source>
-        <translation>Aviso...</translation>
+        <translation>Avís...</translation>
     </message>
     <message>
         <location filename="../map/garmin/CGarminTyp.cpp" line="457"/>
         <source>This is a typ file with unknown polygon encoding. Please report!</source>
-        <translation>Este es un fichero TYP con una codificación de polígonos desconocida. ¡Por favor repórtelo!</translation>
+        <translation>Aquest és un típus de fitxer amb una codificació de polígon desconeguda. Informeu de l'error!</translation>
     </message>
     <message>
         <location filename="../map/garmin/CGarminTyp.cpp" line="838"/>
         <source>This is a typ file with unknown polyline encoding. Please report!</source>
-        <translation>Este es un fichero TYP con una codificación de polilíneas desconocida. ¡Por favor repórtelo!</translation>
+        <translation>Aquest és un típus de fitxer amb una codificació de polilínia desconeguda. Informeu de l'error!</translation>
     </message>
 </context>
 <context>
@@ -810,7 +810,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="36"/>
         <source>thin</source>
-        <translation>fino</translation>
+        <translation>prim</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="37"/>
@@ -820,67 +820,67 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="38"/>
         <source>wide</source>
-        <translation>ancho</translation>
+        <translation>ample</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="39"/>
         <source>strong</source>
-        <translation>intenso</translation>
+        <translation>fort</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="78"/>
         <source>_Clone</source>
-        <translation>Duplicar</translation>
+        <translation>_Clona</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
         <source>Area: %1%2</source>
-        <translation>Área: %1%2</translation>
+        <translation>Àrea: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
         <source>Changed area shape.</source>
-        <translation>Se cambió la forma del área.</translation>
+        <translation>Forma de l'àrea canviada.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="459"/>
         <source>Changed name.</source>
-        <translation>Se cambió el nombre.</translation>
+        <translation>Nom canviat.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="465"/>
         <source>Changed border width.</source>
-        <translation>Se cambió la anchura del borde.</translation>
+        <translation>Amplada del contorn canviada.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="471"/>
         <source>Changed fill pattern.</source>
-        <translation>Se cambió el patró de relleno.</translation>
+        <translation>Patró d'emplenar canviat.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="477"/>
         <source>Changed opacity.</source>
-        <translation>Se cambió la opacidad.</translation>
+        <translation>Opacitat canviada.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="483"/>
         <source>Changed comment.</source>
-        <translation>Se cambió el comentario.</translation>
+        <translation>Comentari canviat.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="489"/>
         <source>Changed description.</source>
-        <translation>Se cambió la descripción.</translation>
+        <translation>Descripció canviada.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="495"/>
         <source>Changed links</source>
-        <translation>Se cambió el enlace</translation>
+        <translation>Enllaços canviats</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="506"/>
         <source>Changed color</source>
-        <translation>Se cambió el color</translation>
+        <translation>Color canviat</translation>
     </message>
 </context>
 <context>
@@ -888,7 +888,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="66"/>
         <source>_Clone</source>
-        <translation>_Duplicar</translation>
+        <translation>_Clona</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
@@ -898,68 +898,68 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
         <source>Changed name.</source>
-        <translation>Se cambió el nombre.</translation>
+        <translation>Nom canviat.</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
         <source>Changed comment</source>
-        <translation>Se cambió el comentario</translation>
+        <translation>Comentari canviat</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
         <source>Changed description</source>
-        <translation>Se cambió la descripción</translation>
+        <translation>Descripció canviada</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
         <source>Changed links</source>
-        <translation>Se cambió el enlace</translation>
+        <translation>Enllaços canviats</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
-        <source>Length: %1 %2</source>
-        <translation>Longitud: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
-        <source>Length: -</source>
-        <translation>Longitud: -</translation>
+        <source>Length: %1%2</source>
+        <translation>Llargada: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
         <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
-        <source>Time: %1 %2</source>
-        <translation>Tiempo: %1 %2</translation>
+        <source>Time: %1%2</source>
+        <translation>Temps: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
+        <source>Distance: %1%2</source>
+        <translation>Distància: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
+        <source>Length: -</source>
+        <translation>Llargada: -</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
         <source>Time: -</source>
-        <translation>Tiempo: -</translation>
+        <translation>Temps: -</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
         <source>%1%2 %3, %4%5 %6</source>
-        <translation type="unfinished"></translation>
+        <translation>%1%2 %3, %4%5 %6</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
         <source>Last time routed:<br/>%1</source>
-        <translation>Última vez enrutado:<br/>%1</translation>
+        <translation>Enrutat per darrera vegada :<br/>%1</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
         <source>with %1</source>
-        <translation>con %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
-        <source>Distance: %1 %2</source>
-        <translation>Distancia: %1 %2</translation>
+        <translation>amb %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
         <source>Changed route points.</source>
-        <translation>Puntos de ruta modificados.</translation>
+        <translation>Punts de la ruta canviats.</translation>
     </message>
 </context>
 <context>
@@ -967,7 +967,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/fit/serialization.cpp" line="285"/>
         <source>FIT file %1 contains no GPS data.</source>
-        <translation>Archivo FIT %1 no contiene datos GPS.</translation>
+        <translation>El fixer FIT %1 no conté dades GPS.</translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="211"/>
@@ -982,363 +982,385 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
         <location filename="../gis/tnv/serialization.cpp" line="211"/>
         <location filename="../gis/tnv/serialization.cpp" line="347"/>
         <source>Failed to open %1.</source>
-        <translation>Fallo al abrir %1.</translation>
+        <translation>Error en obrir %1.</translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="376"/>
         <location filename="../gis/tnv/serialization.cpp" line="387"/>
         <source>Only support lon/lat WGS 84 format.</source>
-        <translation>Solamente soporta formato lon/lat WGS84.</translation>
+        <translation>Sols s'admet lon/lat en format WGS 84.</translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="420"/>
         <source>Failed to read data.</source>
-        <translation>Fallo al leer los datos.</translation>
+        <translation>Error en llegir les dades.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="80"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="78"/>
         <source>_Clone</source>
-        <translation>_Duplicar</translation>
+        <translation>_Clona</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="251"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="261"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
-        <translation>Se cambiaron los puntos del track, y descartados todos los datos previos.</translation>
+        <translation>Punts del track canviats, les dades antigues s'han perdut.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <source>, %1-, %2-</source>
+        <translation>, %1-, %2-</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="396"/>
+        <source>Time: %1%2, Speed: %3%4</source>
+        <translation>Temps: %1%2, Velocitat: %3%4</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
+        <source>Time: -, Speed: -</source>
+        <translation>Temps: -, Velocitat: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
-        <source>Length: %1 %2</source>
-        <translation>Longitud: %1 %2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+        <source>Moving: %1%2, Speed: %3%4</source>
+        <translation>Moviment: %1%2, Velocitat: %3%4</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
-        <source>, %1%2 %3, %4%5 %6</source>
-        <translation>, %1%2 %3, %4%5 %6</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
+        <source>Moving: -, Speed: -</source>
+        <translation>Moviment: -, Velocitat: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="421"/>
         <source>Start: %1</source>
-        <translation>Inicio: %1</translation>
+        <translation>Inici: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
         <source>Start: -</source>
-        <translation>Inicio: -</translation>
+        <translation>Inici: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
         <source>End: %1</source>
         <translation>Final: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
         <source>End: -</source>
         <translation>Final: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
         <source>Points: %1 (%2)</source>
-        <translation>Puntos: %1 (%2)</translation>
+        <translation>Punts: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="443"/>
         <source>Invalid elevations!</source>
-        <translation>¡Datos de altitud invalidos!</translation>
+        <translation>Elevacions invàlidess!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>Invalid timestamps!</source>
-        <translation>¡Marcas de tiempo no válidas!</translation>
+        <translation>Marques horàries invàlides !</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
         <source>Invalid positions!</source>
-        <translation>¡Posiciones invalidas!</translation>
+        <translation>Posicions no vàlides!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
         <source>Activities: %1</source>
-        <translation>Actividades: %1</translation>
+        <translation>Activitats: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
         <source>Index: %1</source>
-        <translation>Indice: %1</translation>
+        <translation>Index: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
         <source>Index: visible %1, total %2</source>
-        <translation>Indice: visible %1. total %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
-        <source>Ele.: %1 %2</source>
-        <translation>Altitud: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
-        <source> slope: %1%3 (%2%)</source>
-        <translation> pendiente: %1%3 (%2%)</translation>
+        <translation>Índex: visible %1, total %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
-        <source> speed: %1%2</source>
-        <translation> velocidad: %1%2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+        <source>, Slope: %1%2</source>
+        <translation>, Pendent: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
         <source>... and %1 tags not displayed</source>
-        <translation>Y %1 etiquetas no mostradas</translation>
+        <translation>... I no es mostren %1 etiquetes</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
         <source>Distance: - (-)</source>
-        <translation>Distancia: - (-)</translation>
+        <translation>Distància: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
         <source>Moving: - (-)</source>
-        <translation>En movimiento: - (-)</translation>
+        <translation>En moviment: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1318"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1331"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1387"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1570"/>
         <source>track</source>
         <translation>track</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1522"/>
         <source>Hide point %1.</source>
-        <translation>Ocultar punto %1</translation>
+        <translation>Amagar punt %1.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1526"/>
         <source>Hide points %1..%2.</source>
-        <translation>Ocultar puntos %1..%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
-        <source> Moving: %1%2 (%3%)</source>
-        <translation> En movimiento: %1%2 (%3%)</translation>
+        <translation>Amagar punts %1..%2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="701"/>
         <source>, %1%2</source>
         <translation>, %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
-        <source> Time: %1%2</source>
-        <translation>Tiempo: %1%2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="124"/>
+        <source>Invalid points....</source>
+        <translation>punts invàlids....</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
-        <source>, %1-, %2-</source>
-        <translation>, %1-, %2-</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="125"/>
+        <source>The track '%1' has %2 invalid points out of %3 visible points. Do you want to hide invalid points now?</source>
+        <translation>El track '%1' té %2 punts invàlids dels %3 punts que es mostren. Vols amagar els punts invàlids?</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
-        <source>Time: %1, Speed: %2 %3</source>
-        <translation>Tiempo: %1, Velocidad: %2 %3</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>min.</source>
+        <translation>mín.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
-        <source>Time: -, Speed: -</source>
-        <translation>Tiempo: -, Velocidad: -</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>max.</source>
+        <translation>màx.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
-        <source>Moving: %1, Speed: %2 %3</source>
-        <translation>En movimiento: %1, Velocidad: %2 %3</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="377"/>
+        <source>Length: %1%2</source>
+        <translation>Longitud: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
-        <source>Moving: -, Speed: -</source>
-        <translation>En movimiento: -, Velocidad: -</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <source>, %1%2%3, %4%5%6</source>
+        <translation>, %1%2%3, %4%5%6</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="589"/>
+        <source>Ele.: %1%2</source>
+        <translation>Ele.: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <source>, Speed: %1%2</source>
+        <translation>, Velocitat: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="636"/>
         <source>Ascent: - (-)</source>
-        <translation>Ascenso: - (-)</translation>
+        <translation>Ascens: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>Descent: - (-)</source>
-        <translation>Descenso: - (-)</translation>
+        <translation>Descens: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="644"/>
         <source>Ascent: %1%2 (%3%)</source>
-        <translation>Ascenso: %1%2 (%3%)</translation>
+        <translation>Ascens: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
-        <source> Descent: %1%2 (%3%)</source>
-        <translation> Descenso: %1%2 (%3%)</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
+        <source>, Descent: %1%2 (%3%)</source>
+        <translation>, Descens: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
         <source>Distance: %1%2 (%3%)</source>
-        <translation>Distancia: %1%2 (%3%)</translation>
+        <translation>Distància: %1%2 (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <source>, Moving: %1%2 (%3%)</source>
+        <translation>, En moviment: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
         <source>Ascent: -</source>
-        <translation>Ascenso: -</translation>
+        <translation>Ascens: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
         <source>Descent: -</source>
-        <translation>Descenso: -</translation>
+        <translation>Descens: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
         <source>Ascent: %1%2</source>
-        <translation>Ascenso: %1%2</translation>
+        <translation>Ascens: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
-        <source> Descent: %1%2</source>
-        <translation>Descenso: %1%2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="696"/>
+        <source>, Descent: %1%2</source>
+        <translation>, Descens: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="706"/>
         <source>Distance: %1%2</source>
-        <translation>Distancia: %1%2</translation>
+        <translation>Distància: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="711"/>
+        <source>, Time: %1%2</source>
+        <translation>, Hora: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1377"/>
         <source>Permanently removed points %1..%2</source>
-        <translation>Puntos eliminados definitivamente %1..%2</translation>
+        <translation>S'han suprimit definitivament els punts %1..%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1555"/>
         <source>Show points.</source>
-        <translation>Mostrar puntos.</translation>
+        <translation>Mostrar els punts.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2194"/>
         <source>Changed name</source>
-        <translation>Se cambió el nombre</translation>
+        <translation>Nom canviat</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2200"/>
         <source>Changed comment</source>
-        <translation>Se cambió el comentario</translation>
+        <translation>Comentari canviat</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2206"/>
         <source>Changed description</source>
-        <translation>Se cambió la descripción</translation>
+        <translation>Descripció canviada</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed links</source>
-        <translation>Se cambió el enlace</translation>
+        <translation>Enllaços canviats</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2223"/>
         <source>Changed elevation of point %1 to %2 %3</source>
-        <translation>Se cambió altitud de los puntos %1 a %2 %3</translation>
+        <translation>Elevació dels punts %1 to %2 %3 canviada</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2247"/>
         <source>Changed activity to '%1' for complete track.</source>
-        <translation>Actividad cambiada a '%1' para todo el track.</translation>
+        <translation>Activitat de tot el track canviada a '%1'.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2286"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
-        <translation>Actividad cambiada a '%1' para el rango (%2..%3).</translation>
+        <translation>Activitat del rang(%2..%3) canviada a '%1'.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="96"/>
         <source>Hide points by Douglas Peuker algorithm (%1%2)</source>
-        <translation>Ocultar puntos con algoritmo Douglas Peuker (%1%2)</translation>
+        <translation>Utilitzar l'algoritme de Douglas Peuker per amagar punts (%1%2)</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="122"/>
         <source>Hide points with invalid data.</source>
-        <translation>Ocultar puntos con datos inválidos</translation>
+        <translation>Amagar punts amb dades invàlides.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="132"/>
         <source>Reset all hidden track points to visible</source>
-        <translation>Restaurados todos los puntos a visible</translation>
+        <translation>Fes visibles tots els punts amagats del track</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="162"/>
         <source>Permanently removed all hidden track points</source>
-        <translation>Elminados definitivamente todos los puntos ocultos del track</translation>
+        <translation>S'han suprimit definitivament tots els punts amagats del track. </translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="199"/>
         <source>Smoothed profile with a Median filter of size %1</source>
-        <translation>Pefil suavizado con Mediana de %1 puntos</translation>
+        <translation>Perfil suau utilitzant un filtre de Mitjana de mida %1 </translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="221"/>
         <source>Added terrain slope from DEM file.</source>
-        <translation>Añadida pendiente del terreno desde archivo DEM</translation>
+        <translation>S'ha afegit des d'un fitxer DEM el pendent d'un terreny.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="243"/>
         <source>Replaced elevation data with data from DEM files.</source>
-        <translation>Datos de altitud sustituidos por valores de fichero DEM.</translation>
+        <translation>Substituides les dades d'elevació amb les dades dels fitxers DEM</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="261"/>
         <source>Replaced elevation data with interpolated values. (M=%1, RMSErr=%2)</source>
-        <translation>Reemplazados datos de altitud con valores interpolados. (M=%1, RMSErr=%2)</translation>
+        <translation>Substituides les dades d'elevació amb valors interpolats. (M=%1, RMSErr=%2)</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="277"/>
         <source>Offset elevation data by %1%2.</source>
-        <translation>altitud desplazada %1%2.</translation>
+        <translation>Desplaçament de les dades d'elevació de %1%2.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="290"/>
         <source>Changed start of track to %1.</source>
-        <translation>Cambiado el inicio de track a %1.</translation>
+        <translation>Inici del track canviat a %1.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="303"/>
         <source>Remove timestamps.</source>
-        <translation>Eliminadas las marcas de tiempo.</translation>
+        <translation>Suprimeix les marques horàries.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="320"/>
         <source>Set artificial timestamps with delta of %1 sec.</source>
-        <translation>Marcas de tiempo ficticias con incremento de %1 sec.</translation>
+        <translation>Posa una marca horària inventada amb %1 sec. de valor delta.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="346"/>
         <source>Changed speed to %1%2.</source>
-        <translation>Velocidad modificada a %1%2.</translation>
+        <translation>Velocitat canviada a %1%2.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="365"/>
         <source>%1 (Segment %2)</source>
-        <translation>%1 (Segmento %2)</translation>
+        <translation>%1 (Segment %2)</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="383"/>
         <source>Removed extension %1 from all Track Points</source>
-        <translation>Eliminada extensión %1 a todos los puntos del track</translation>
+        <translation>S'ha suprimit definitivament l'extensió %1 de tots els punts del track. </translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="394"/>
         <source>Converted subpoints from routing to track points</source>
-        <translation>Convertidos puntos secundarios del ruteo a puntos de track</translation>
+        <translation>Convertir els subpunts obtinguts d'un itinerari a punts de track</translation>
     </message>
     <message>
-        <location filename="../qlgt/converter.cpp" line="195"/>
+        <location filename="../qlgt/converter.cpp" line="196"/>
         <source>Copy flag information from QLandkarte GT track</source>
-        <translation>Copiar información del encabezado del track de QLandkarte GT</translation>
+        <translation>Copia del track de QLandkarte GT la informació de l'indicador</translation>
     </message>
 </context>
 <context>
@@ -1346,7 +1368,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/gpx/serialization.cpp" line="609"/>
         <source>Archived</source>
-        <translation>Archivado</translation>
+        <translation>Arxivat</translation>
     </message>
     <message>
         <location filename="../gis/gpx/serialization.cpp" line="613"/>
@@ -1356,72 +1378,87 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/gpx/serialization.cpp" line="617"/>
         <source>Not Available</source>
-        <translation>No Disponible</translation>
+        <translation>No disponible</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="104"/>
         <source>_Clone</source>
-        <translation>Duplicar</translation>
+        <translation>_Clona</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
-        <source>Elevation: %1 %2</source>
-        <translation>Altitud: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="277"/>
+        <source>Elevation: %1%2</source>
+        <translation>Elevació: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
-        <source>Proximity: %1 %2</source>
-        <translation>Proximidad: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="288"/>
+        <source>Proximity: %1%2</source>
+        <translation>Proximitat: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
         <source>Changed name</source>
-        <translation>Se cambió el nombre</translation>
+        <translation>Nom canviat</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
         <source>Changed position</source>
-        <translation>Se cambió la posición</translation>
+        <translation>Posició canviada</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
         <source>Changed elevation</source>
-        <translation>Se cambió la altitud</translation>
+        <translation>Elevació canviada</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="413"/>
+        <source>Removed proximity</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="417"/>
         <source>Changed proximity</source>
-        <translation>Se cambió la proximidad</translation>
+        <translation>Proximitat canviada</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="432"/>
         <source>Changed icon</source>
-        <translation>Se cambió el icono</translation>
+        <translation>Icona canviada</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="438"/>
         <source>Changed comment</source>
-        <translation>Se cambió el comentario</translation>
+        <translation>Comentari canviat</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="444"/>
         <source>Changed description</source>
-        <translation>Se cambió la descripción</translation>
+        <translation>Descripció canviada</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="450"/>
         <source>Changed links</source>
-        <translation>Se cambió el enlace</translation>
+        <translation>Enllaços canviats</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="456"/>
         <source>Changed images</source>
-        <translation>Se cambió la imagen</translation>
+        <translation>Imatges canviades</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="462"/>
         <source>Add image</source>
-        <translation>Añadir Imagen</translation>
+        <translation>Afegir imatge</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="877"/>
+        <source>Changed to proximity-radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="882"/>
+        <source>Changed to nogo-area</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1429,47 +1466,47 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
     <message>
         <location filename="../gis/CGisListDB.cpp" line="84"/>
         <source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
-        <translation>Debido a cambios en el sistema de base de datos QMapShack olvidó el nombre de archivo de su base de datos  '%1'. Debe seleccionarlo de nuevo en el siguiente paso.</translation>
+        <translation>Degut a canvis en el sistema de base de dades, QMapShack desconeix el nom de fitxer de la vostre base de dades '%1'. Heu de seleccionar-la de nou en el següent pas.</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="85"/>
         <source>Select database file.</source>
-        <translation>Seleccionar archivo de base de datos.</translation>
+        <translation>Selecciona el fitxer de base de dades</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="118"/>
         <source>Add Database</source>
-        <translation>Añadir Base de Datos</translation>
+        <translation>Afegeix base de dades</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="121"/>
         <source>Add Folder</source>
-        <translation>Añadir carpeta</translation>
+        <translation>Afegir Carpeta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="122"/>
         <source>Rename Folder</source>
-        <translation>Renombrar carpeta</translation>
+        <translation>Canvia el nom de la Carpeta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="123"/>
         <source>Copy Folder</source>
-        <translation>Copiar carpeta</translation>
+        <translation>Copia la carpeta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="124"/>
         <source>Move Folder</source>
-        <translation>Mover carpeta</translation>
+        <translation>Moure Carpeta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="125"/>
         <source>Delete Folder</source>
-        <translation>Eliminar Carpeta</translation>
+        <translation>Suprimeix Carpeta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="127"/>
         <source>Import from Files...</source>
-        <translation>Importar desde archivos..</translation>
+        <translation>Importar de Fitxers...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="128"/>
@@ -1480,400 +1517,420 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
         <location filename="../gis/CGisListDB.cpp" line="131"/>
         <location filename="../gis/CGisListDB.cpp" line="147"/>
         <source>Delete Item</source>
-        <translation>Eliminar Elemento</translation>
+        <translation>Esborrar l'element</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="135"/>
         <source>Search Database</source>
-        <translation>Buscar base de datos</translation>
+        <translation>Cercant Base de Dades</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="136"/>
         <source>Sync. with Database</source>
-        <translation>Sincronizar con base de datos</translation>
+        <translation>Sinc. amb Base de Dades</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="137"/>
         <source>Remove Database</source>
-        <translation>Quitar Base de Datos</translation>
+        <translation>Suprimir base de dades</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="144"/>
         <source>Empty</source>
-        <translation>Vacío</translation>
+        <translation>Buit</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="444"/>
         <source>Remove database...</source>
-        <translation>Quitar Base de Datos...</translation>
+        <translation>Suprimir base de dades...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="444"/>
         <source>Do you really want to remove '%1' from the list?</source>
-        <translation>¿Seguro que quiere eliminar '%1' de la lista?</translation>
+        <translation>Esteu segur que voleu suprimir '%1' de la llista?</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="508"/>
+        <source>Delete database folder...</source>
+        <translation>Elimina la carpeta de les bases de dades...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="508"/>
         <source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
-        <translation>¿Está seguro que quiere borrar las carpetas seleccionadas y sus subcarpetas de la base de datos?</translation>
+        <translation>Segur que voleu suprimir de la base de dades les carpetes seleccionades i totes les subcarpetes?</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="676"/>
         <source>Bad operation....</source>
-        <translation>Mala operación...</translation>
+        <translation>Operació incorrecta...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="676"/>
         <source>The target folder is a subfolder of the one to move. This will not work.</source>
-        <translation>La carpeta de destino es una subcarpeta de la que se va a mover. Esto no funcionará.</translation>
+        <translation>La carpeta destí és una subcarpeta d'una de les que voleu moure. No es pot fer aquesta operació.</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="735"/>
         <source>Folder name...</source>
-        <translation>Nombre de carpeta...</translation>
+        <translation>Nom de la carpeta...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="735"/>
         <source>Rename folder:</source>
-        <translation>Renombrar carpeta:</translation>
+        <translation>Canvia el nom de la carpeta:</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="756"/>
+        <location filename="../gis/CGisListDB.cpp" line="777"/>
+        <source>Remove items...</source>
+        <translation>Suprimir elements...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="756"/>
+        <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
+        <translation>Voleu esborrar tots els elements de Perdut i Trobat? Això els eliminarà de forma permament.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="777"/>
+        <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
+        <translation>Voleu esborrar tots els elements seleccionats de Perdut i Trobat? Això els eliminarà de forma permament.</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="864"/>
         <source>Are you sure you want to delete '%1' from folder '%2'?</source>
-        <translation>¿Desea realmente eleiminar '%1' de la carpeta '%2'?</translation>
+        <translation>Segur que voleu suprimir '%1' de la carpeta '%2'?</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="865"/>
         <source>Delete...</source>
-        <translation>Borrar...</translation>
+        <translation>Suprimeix...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="1055"/>
         <source>Import GIS Data...</source>
-        <translation>Importar datos GIS...</translation>
+        <translation>Importar Dades GIS...</translation>
     </message>
+</context>
+<context>
+    <name>CGisListWks</name>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="508"/>
-        <source>Delete database folder...</source>
-        <translation>Eliminar Carpeta de la Base de Datos...</translation>
+        <location filename="../gis/CGisListWks.cpp" line="106"/>
+        <source>Edit..</source>
+        <translation>Edita...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="756"/>
-        <location filename="../gis/CGisListDB.cpp" line="777"/>
-        <source>Remove items...</source>
-        <translation>Eliminar elementos...</translation>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <source>Show on Map</source>
+        <translation>Mostra en el Mapa</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="756"/>
-        <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
-        <translation>¿Desea realmente eliminar todos los elementos de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
+        <location filename="../gis/CGisListWks.cpp" line="109"/>
+        <source>Hide from Map</source>
+        <translation>Amagar del Mapa</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="777"/>
-        <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
-        <translation>¿Desea realmente eliminar todos los elementos.seleccionados de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
+        <location filename="../gis/CGisListWks.cpp" line="114"/>
+        <source>Sort by Time</source>
+        <translation>Ordena per Hora</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
+        <source>Sort by Name</source>
+        <translation>Ordena per Nom</translation>
     </message>
-</context>
-<context>
-    <name>CGisListWks</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="117"/>
+        <location filename="../gis/CGisListWks.cpp" line="122"/>
         <source>Save</source>
-        <translation>Guardar</translation>
+        <translation>Desa</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="101"/>
-        <source>Edit..</source>
-        <translation>Editar..</translation>
+        <location filename="../gis/CGisListWks.cpp" line="124"/>
+        <source>Save as GPX 1.1 w/o ext...</source>
+        <translation>Desa com a GPX 1.1 sense ext...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="126"/>
+        <location filename="../gis/CGisListWks.cpp" line="127"/>
+        <source>Send to Devices</source>
+        <translation>Envia als Dispositius</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
+        <source>Sync. with Database</source>
+        <translation>Sinc. amb Base de Dades</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="131"/>
         <source>Close</source>
-        <translation>Cerrar</translation>
+        <translation>Tanca</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="140"/>
         <source>Update Project on Device</source>
-        <translation>Actualizar Proyecto en Dsipositivo</translation>
+        <translation>Modifica el Projecte en el Dispositiu</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="166"/>
+        <source>Delete</source>
+        <translation>Suprimeix</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="149"/>
+        <location filename="../gis/CGisListWks.cpp" line="154"/>
         <source>Edit...</source>
-        <translation>Editar...</translation>
+        <translation>Edita...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="102"/>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="155"/>
         <source>Copy to...</source>
-        <translation>Copiar a...</translation>
+        <translation>Copia a...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="113"/>
+        <location filename="../gis/CGisListWks.cpp" line="118"/>
         <source>Autom. Save</source>
-        <translation>Guardado Automático</translation>
+        <translation>Desa autom.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="118"/>
+        <location filename="../gis/CGisListWks.cpp" line="123"/>
         <source>Save as...</source>
-        <translation>Guardar como...</translation>
+        <translation>Anomena i desa...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
+        <source>Track Profile</source>
+        <translation>Perfil del Track</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="159"/>
+        <source>Select Range</source>
+        <translation>Selecciona Rang</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
+        <source>Edit Track Points</source>
+        <translation>Edita els Punts del Track</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <source>Reverse Track</source>
+        <translation>Invertir Track</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="162"/>
+        <source>Combine Tracks</source>
+        <translation>Unir Tracks</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="164"/>
         <source>Copy Track with Waypoints</source>
-        <translation>Copiar tracks y waypoints</translation>
+        <translation>Copia el track amb les Fites</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="167"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Show Bubble</source>
-        <translation>Mostrar burbuja de texto</translation>
+        <translation>Mostra la Bombolla</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="169"/>
+        <location filename="../gis/CGisListWks.cpp" line="175"/>
         <source>Move Waypoint</source>
-        <translation>Mover Waypoint</translation>
+        <translation>Moure la Fita</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="170"/>
+        <location filename="../gis/CGisListWks.cpp" line="176"/>
         <source>Proj. Waypoint...</source>
-        <translation>Proyectar Waypoint...</translation>
+        <translation>Proj. Fita...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="177"/>
+        <source>Change Radius</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="178"/>
-        <source>Route Instructions</source>
-        <translation>Instrucciones de ruta</translation>
+        <source>Toggle Nogo-Area</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <source>Delete Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
+        <source>Route Instructions</source>
+        <translation>Instruccions de l'Itinerari</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="191"/>
         <source>Calculate Route</source>
-        <translation>Calcular ruta</translation>
+        <translation>Calcular l'Itinerari</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="181"/>
+        <location filename="../gis/CGisListWks.cpp" line="192"/>
         <source>Reset Route</source>
-        <translation>Recalcular ruta</translation>
+        <translation>Reinicia Ruta</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="193"/>
         <source>Edit Route</source>
-        <translation>Editar ruta</translation>
+        <translation>Edita la Ruta</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="183"/>
+        <location filename="../gis/CGisListWks.cpp" line="194"/>
         <source>Convert to Track</source>
-        <translation>Convertir en track</translation>
+        <translation>Convertir a track</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="204"/>
+        <source>Edit Area Points</source>
+        <translation>Edita els Punts de l'Àrea</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="199"/>
+        <location filename="../gis/CGisListWks.cpp" line="212"/>
         <source>Create Route</source>
-        <translation>Crear ruta</translation>
+        <translation>Crear Ruta</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="200"/>
+        <location filename="../gis/CGisListWks.cpp" line="213"/>
         <source>Change Icon (sel. waypt. only)</source>
-        <translation>Cambiar icono</translation>
+        <translation>Canviar Icona (sols sel. fita)</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="158"/>
+        <location filename="../gis/CGisListWks.cpp" line="163"/>
         <source>Set Track Activity</source>
-        <translation>Establecer actividad del track</translation>
+        <translation>Assigna una Activitat al Track</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="634"/>
+        <location filename="../gis/CGisListWks.cpp" line="646"/>
         <source>Drop items...</source>
-        <translation>Descartar elementos</translation>
+        <translation>Deixar anar elements...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="659"/>
-        <location filename="../gis/CGisListWks.cpp" line="1691"/>
-        <location filename="../gis/CGisListWks.cpp" line="1729"/>
+        <location filename="../gis/CGisListWks.cpp" line="671"/>
+        <location filename="../gis/CGisListWks.cpp" line="1771"/>
+        <location filename="../gis/CGisListWks.cpp" line="1809"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
-        <translation><b>Actualizar dispositivos</b><p>Actualizar %1<br/>Por favor espere...</p></translation>
+        <translation><b>Modifica els dispositius </b><p>Modifica %1<br/>Si us plau, espereu...</p></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
-        <source>Delete project...</source>
-        <translation>Eliminar Proyecto...</translation>
+        <location filename="../gis/CGisListWks.cpp" line="797"/>
+        <source>Saving workspace. Please wait.</source>
+        <translation>S'està desant l'espai de treball. Espera.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
-        <source>Do you really want to delete %1?</source>
-        <translation>¿Desea realmente eliminar %1?</translation>
+        <location filename="../gis/CGisListWks.cpp" line="843"/>
+        <source>Loading workspace. Please wait.</source>
+        <translation>S'està carregant l'espai de treball. Espera.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
-        <source>Track Profile</source>
-        <translation>Perfil del Track</translation>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
+        <source>Close all projects...</source>
+        <translation>Tancar tots els projectes...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
-        <source>Show on Map</source>
-        <translation>Mostrar en el mapa</translation>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
+        <source>This will remove all projects from the workspace.</source>
+        <translation>S'eliminaran tots els projectes de l'espai de treball.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
-        <source>Hide from Map</source>
-        <translation>Ocultar en el mapa</translation>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
+        <source>Delete project...</source>
+        <translation>Suprimeix el projecte...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="109"/>
-        <source>Sort by Time</source>
-        <translation>Ordenar por fecha</translation>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
+        <source>Do you really want to delete %1?</source>
+        <translation>Esteu segur que voleu suprimir %1?</translation>
     </message>
+</context>
+<context>
+    <name>CGisWorkspace</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="110"/>
-        <source>Sort by Name</source>
-        <translation>Ordenar por nombre</translation>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
+        <source>Load project...</source>
+        <translation>Carregar projecte...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="119"/>
-        <source>Save as GPX 1.1 w/o ext...</source>
-        <translation>Guardar como GPX 1.1 w/o ext...</translation>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
+        <source>The project "%1" is already in the workspace.</source>
+        <translation>El projecte "%1" ja és a l'espai de treball.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="122"/>
-        <source>Send to Devices</source>
-        <translation>Enviar a dispositivo</translation>
+        <location filename="../gis/CGisWorkspace.cpp" line="213"/>
+        <source><b>Item Selection: </b>Item selected from workspace list. Click on the map to switch back to normal mouse selection behavior.</source>
+        <translation><b>Selecció d'Element: </b>Element seleccionat de la llista d'espais de treball. Feu clic en el mapa per tornar al comportament normal de selecció del ratolí.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
-        <source>Sync. with Database</source>
-        <translation>Sincronizar con base de datos</translation>
+        <location filename="../gis/CGisWorkspace.cpp" line="626"/>
+        <source>Copy items...</source>
+        <translation>Copia elements...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="154"/>
-        <source>Select Range</source>
-        <translation>Seleccionar Rango</translation>
+        <location filename="../gis/CGisWorkspace.cpp" line="645"/>
+        <source>Change waypoint symbols.</source>
+        <translation>Canviar el símbol de les fites.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="155"/>
-        <source>Edit Track Points</source>
-        <translation>Editar Puntos del Track</translation>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
+        <source>Cut Track...</source>
+        <translation>Tallar el Track...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="156"/>
-        <source>Reverse Track</source>
-        <translation>Invertir Track</translation>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
+        <source>Do you want to delete the original track?</source>
+        <translation>Voleu suprimir el track original?</translation>
     </message>
+</context>
+<context>
+    <name>CGpxProject</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="157"/>
-        <source>Combine Tracks</source>
-        <translation>Combinar Tracks</translation>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
+        <source>Failed to load file %1...</source>
+        <translation>Error en carregar el fitxer %1...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="192"/>
-        <source>Edit Area Points</source>
-        <translation>Editar Puntos del Área</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
-        <source>Delete</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="785"/>
-        <source>Saving workspace. Please wait.</source>
-        <translation>Guardando espacio de trabajo. Por favor espere.</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="831"/>
-        <source>Loading workspace. Please wait.</source>
-        <translation>Cargando espacio de trabajo. Por favor espere.</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
-        <source>Close all projects...</source>
-        <translation>Cerrar todos los proyectos...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
-        <source>This will remove all projects from the workspace.</source>
-        <translation>Esto eliminará todos los proyectos del espacio de trabajo.</translation>
-    </message>
-</context>
-<context>
-    <name>CGisWidget</name>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
-        <source>Load project...</source>
-        <translation>Cargar proyecto</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
-        <source>The project "%1" is already in the workspace.</source>
-        <translation>El proyecto "%1" ya está en el area de trabajo.</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="559"/>
-        <source>Copy items...</source>
-        <translation>Copia elementos....</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="578"/>
-        <source>Change waypoint symbols.</source>
-        <translation>Cambiar símbolos de waypoint</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
-        <source>Cut Track...</source>
-        <translation>Dividir Track...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
-        <source>Do you want to delete the original track?</source>
-        <translation>¿Desea borrar el track original?</translation>
-    </message>
-</context>
-<context>
-    <name>CGpxProject</name>
-    <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
-        <source>Failed to load file %1...</source>
-        <translation>Fallo al cargar archivo %1...</translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
-        <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
+        <source>Failed to open %1</source>
+        <translation>Error en obrir %1</translation>
     </message>
     <message>
         <location filename="../gis/gpx/CGpxProject.cpp" line="125"/>
         <source>Failed to read: %1
 line %2, column %3:
  %4</source>
-        <translation>Fallo al leer: %1
-línea %2, columna %3.
+        <translation>Error en llegir %1
+línia %2, columna %3:
  %4</translation>
     </message>
     <message>
         <location filename="../gis/gpx/CGpxProject.cpp" line="133"/>
         <source>Not a GPX file: %1</source>
-        <translation>No es un archivo GPX: %1</translation>
+        <translation>No és un fitxer GPX: %1</translation>
     </message>
     <message>
         <location filename="../gis/gpx/CGpxProject.cpp" line="268"/>
         <source>File exists ...</source>
-        <translation>El archivo ya existe ...</translation>
+        <translation>El fitxer existeix ...</translation>
     </message>
     <message>
         <location filename="../gis/gpx/CGpxProject.cpp" line="269"/>
         <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
-        <translation>El archivo ya existe y no lo ha creado QMapShack. Si pulsa 'sí' todos los datos de este archivo se perderán. Incluso si el archivo contiene datos GPX y QMapShack lo ha leído, QMapShack podría no ser capaz de leer y almacenar todos los elementos en el archivo, y aquellos que no haya leído se perderán. Se le recomienda usar otro archivo distinto. <b>¿Quiere realmente sobrescribir el archivo</b></translation>
+        <translation>Aquest fitxer ja existeix i no s'ha creat a QMapShack. Si premeu 'si' es perdrà tota la informació d'aquest fitxer. Fins i tot si aquest fitxer té informació GPX i s'ha carregat a QMapShack, QMapShack no pot carregar i emmagatzemar tota la informació existent en aquest fitxer.  La informació es perdrà. Recomano utilitzar un altre fitxer. <b>Segur que voleu sobreescriure el fitxer?</b></translation>
     </message>
     <message>
         <location filename="../gis/gpx/CGpxProject.cpp" line="386"/>
         <source>Failed to create file '%1'</source>
-        <translation>Fallo al crear el archivo '%1'</translation>
+        <translation>Ha fallat la creació del fitxer '%1'</translation>
     </message>
     <message>
         <location filename="../gis/gpx/CGpxProject.cpp" line="396"/>
         <source>Failed to write file '%1'</source>
-        <translation>Fallo al escribir en el archivo '%1'</translation>
+        <translation>Error en escriure al fitxer '%1'</translation>
     </message>
     <message>
         <location filename="../gis/gpx/CGpxProject.cpp" line="408"/>
         <source>Saving GIS data failed...</source>
-        <translation>Fallo guardando datos GIS...</translation>
+        <translation>Error desant dades GIS...</translation>
     </message>
 </context>
 <context>
@@ -1881,22 +1938,22 @@ línea %2, columna %3.
     <message>
         <location filename="../grid/CGrid.cpp" line="61"/>
         <source>%1 %2 </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2 </translation>
     </message>
     <message>
         <location filename="../grid/CGrid.cpp" line="65"/>
         <source>%1%2%5 %3%4%5 </source>
-        <translation type="unfinished"></translation>
+        <translation>%1%2%5 %3%4%5 </translation>
     </message>
     <message>
         <location filename="../grid/CGrid.cpp" line="72"/>
         <source>%1m, %2m </source>
-        <translation type="unfinished"></translation>
+        <translation>%1m, %2m </translation>
     </message>
     <message>
         <location filename="../grid/CGrid.cpp" line="76"/>
         <source>N %1m, E %2m </source>
-        <translation type="unfinished"></translation>
+        <translation>N %1m, E %2m </translation>
     </message>
 </context>
 <context>
@@ -1909,22 +1966,22 @@ línea %2, columna %3.
     <message>
         <location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
         <source>Cut history before</source>
-        <translation>Cortar historial antes</translation>
+        <translation>Talla l'historial abans de</translation>
     </message>
     <message>
         <location filename="../widgets/CHistoryListWidget.cpp" line="38"/>
         <source>Cut history after</source>
-        <translation>Cortar historial despues</translation>
+        <translation>Talla l'historial després de</translation>
     </message>
     <message>
         <location filename="../widgets/CHistoryListWidget.cpp" line="155"/>
         <source>History removal</source>
-        <translation>Borrar historial</translation>
+        <translation>Supresión de l'historial</translation>
     </message>
     <message>
         <location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
         <source>The removal is permanent and cannot be undone. <b>Do you really want to delete history before this step?</b></source>
-        <translation>El borrado es permanente y no se puede deshacer. <b>¿Esta seguro de querer borrar el historial anterior a este paso?</b></translation>
+        <translation>La supressió és permanent i no es pot desfer. <b>Realment vols suprimir tot l'historial abans de fer aquest pas?</b></translation>
     </message>
 </context>
 <context>
@@ -1932,115 +1989,314 @@ línea %2, columna %3.
     <message>
         <location filename="../tool/CImportDatabase.cpp" line="29"/>
         <source>Import QLandkarte Database</source>
-        <translation>Importar Base de Datos de QLandKarteGT</translation>
+        <translation>Importar Base de Dades QLandkarte</translation>
     </message>
     <message>
         <location filename="../tool/CImportDatabase.cpp" line="75"/>
         <source>Select source database...</source>
-        <translation>Seleccionar origen de base de datos...</translation>
+        <translation>Selecciona la base de dades origen...</translation>
     </message>
     <message>
         <location filename="../tool/CImportDatabase.cpp" line="97"/>
         <source>Select target database...</source>
-        <translation>Seleecionar destino de base de datos...</translation>
+        <translation>Selecciona la base de dades destí...</translation>
     </message>
 </context>
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <source>Speed</source>
+        <comment>extLongName</comment>
+        <translation>Velocitat</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
+        <source>Cadence</source>
+        <comment>extShortName</comment>
+        <translation>Cadència</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
+        <source>Air Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp. de l'Aire</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
         <source>Air Temperature</source>
-        <translation>Temperatura del aire</translation>
+        <comment>extLongName</comment>
+        <translation>Temperatura de l'Aire</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
+        <source>Water Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp. de l'Aigua</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
         <source>Water Temperature</source>
-        <translation>Temperatura del agua</translation>
+        <comment>extLongName</comment>
+        <translation>Temperatura de l'Aigua</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
+        <source>Depth</source>
+        <comment>extShortName</comment>
+        <translation>Profunditat</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
         <source>Depth</source>
-        <translation>Profundidad</translation>
+        <comment>extLongName</comment>
+        <translation>Profunditat</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
+        <source>Heart R.</source>
+        <comment>extShortName</comment>
+        <translation>Ritme cardíac</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
         <source>Heart Rate</source>
-        <translation>Ritmo cardiaco</translation>
+        <comment>extLongName</comment>
+        <translation>Ritme cardíac</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="93"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="112"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
         <source>Cadence</source>
+        <comment>extLongName</comment>
         <translation>Cadencia</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
         <source>Speed</source>
-        <translation>Velocidad</translation>
+        <comment>extShortName</comment>
+        <translation>Velocitat</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+        <source>Accel.</source>
+        <comment>extShortName</comment>
+        <translation>Accel.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
         <source>Acceleration</source>
-        <translation>Aceleración</translation>
+        <comment>extLongName</comment>
+        <translation>Accel·leració</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
+        <source>Course</source>
+        <comment>extShortName</comment>
+        <translation>Camí</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
         <source>Course</source>
-        <translation>Rumbo</translation>
+        <comment>extLongName</comment>
+        <translation>Camí</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
+        <source>Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
         <source>Temperature</source>
+        <comment>extLongName</comment>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
+        <source>Dist.</source>
+        <comment>extShortName</comment>
+        <translation>Dist.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
         <source>Distance</source>
-        <translation>Distancia</translation>
+        <comment>extLongName</comment>
+        <translation>Distància</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Ele.</source>
+        <comment>extShortName</comment>
+        <translation>Ele.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <source>Elevation</source>
+        <comment>extLongName</comment>
+        <translation>Elevació</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
+        <source>Energy</source>
+        <comment>extShortName</comment>
+        <translation>Energia</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
         <source>Energy</source>
-        <translation>Energía</translation>
+        <comment>extLongName</comment>
+        <translation>Energia</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Sea Lev. Pres.</source>
+        <comment>extShortName</comment>
+        <translation>Pres Niv. Mar.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
         <source>Sea Level Pressure</source>
-        <translation>Presión a nivel del mar</translation>
+        <comment>extLongName</comment>
+        <translation>Pressió a Nivell de Mar</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
-        <source>Speed (vertical)</source>
-        <translation>Velocidad vertical</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>v. Speed</source>
+        <comment>extShortName</comment>
+        <translation>v. Velocitat</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
-        <source>Slope*</source>
-        <translation>Pendiente</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>Vertical Speed</source>
+        <comment>extLongName</comment>
+        <translation>Velocitat Vertical</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
-        <source>Speed*</source>
-        <translation>Velocidad</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope</source>
+        <comment>extShortName</comment>
+        <translation>Pendent</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
-        <source>Elevation</source>
-        <translation>Altitud</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <source>Speed over Distance*</source>
+        <comment>extLongName</comment>
+        <translation>Velocitat per Distància*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
+        <source>Speed over Time*</source>
+        <comment>extLongName</comment>
+        <translation>Velocitat per Temps*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Elevation*</source>
+        <comment>extLongName</comment>
+        <translation>Elevació*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
         <source>Progress</source>
-        <translation>Progreso</translation>
+        <comment>extShortName</comment>
+        <translation>Progrés</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
+        <source>Progress*</source>
+        <comment>extLongName</comment>
+        <translation>Progrés*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terr. Slope</source>
+        <comment>extShortName</comment>
+        <translation>Terr. Pendent</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terrain Slope*</source>
+        <comment>extLongName</comment>
+        <translation>Terreny Pendent*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope*</source>
+        <translation>Pendent*</translation>
+    </message>
+</context>
+<context>
+    <name>CLogProject</name>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="62"/>
+        <source>Failed to load file %1...</source>
+        <translation>Error en carregar el fitxer %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="84"/>
+        <source>Failed to open %1</source>
+        <translation>Error en obrir %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="95"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Error en llegir %1
+línia %2, columna %3:
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="102"/>
+        <source>Not an Openambit log file: %1</source>
+        <translation>No és un fitxer de registre Openambit: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="113"/>
+        <source>Device: %1<br/></source>
+        <translation>Dispositiu: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="140"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation>Temps de recuperació: %1 h<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="145"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation>Efecte de la Sessió d'Entrenament: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="150"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation>Energia: %1 kCal<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="182"/>
+        <source>Use of local time...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="183"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
-        <source>Terrain slope</source>
-        <translation>Pendiente del terreno</translation>
+        <location filename="../gis/suunto/CLogProject.cpp" line="245"/>
+        <source>This LOG file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation>Aquest fitxer de LOG no conté cap dada i QMapShack no el pot visualitzar: %1</translation>
     </message>
 </context>
 <context>
@@ -2048,61 +2304,62 @@ línea %2, columna %3.
     <message>
         <location filename="../gis/db/CLostFoundProject.cpp" line="39"/>
         <source>Lost & Found</source>
-        <translation>Objetos Perdidos</translation>
+        <translation>Perdut i trobat</translation>
     </message>
 </context>
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="813"/>
+        <location filename="../CMainWindow.cpp" line="859"/>
         <source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
-        <translation>Usar <b>Menu->ver->Añadir vista de mapa</b> para abrir nueva vista, o <b>Menu->archivo->cargar vista de mapa</b> para restaurar una vista guardada. Or click <a href='newview'>here</a>.</translation>
+        <translation>Utilitza <b>Menu->Vista->Afegir vista de Mapa</b> per a obrir una nova vista. O <b>Menu->Fitxer->Carregar vista de Mapa</b> per a recuperar-ne un de desat. O feu clic <a href='newview'>aquí</a>.</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="941"/>
-        <source>Ele: %1%2</source>
-        <translation>Alt: %1%2</translation>
+        <location filename="../CMainWindow.cpp" line="987"/>
+        <source>Ele.: %1%2</source>
+        <translation>Ele.: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="953"/>
+        <location filename="../CMainWindow.cpp" line="999"/>
         <source>Slope: %1%2</source>
-        <translation>Pendiente: %1%2</translation>
+        <comment>terrain</comment>
+        <translation>Pendent: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="969"/>
+        <location filename="../CMainWindow.cpp" line="1015"/>
         <source>[Grid: %1]</source>
-        <translation>[Malla: %1]</translation>
+        <translation>[Graella: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1110"/>
+        <location filename="../CMainWindow.cpp" line="1156"/>
         <source>Load GIS Data...</source>
-        <translation>Cargar Datos GIS...</translation>
+        <translation>Carregar Dades GIS...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
         <source>Select output file</source>
-        <translation>Seleccionar archivo de salida</translation>
+        <translation>Selecciona el fitxer de sortida</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>QMapShack View (*.view)</source>
-        <translation>Vista de QMapShack (*.view)</translation>
+        <translation>Vista QMapShack (*.view)</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>Select file to load</source>
-        <translation>Seleccionar archivo a cargar</translation>
+        <translation>Selecciona el fitxer a carregar</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1481"/>
+        <location filename="../CMainWindow.cpp" line="1532"/>
         <source>Fatal...</source>
-        <translation type="unfinished"></translation>
+        <translation>Fatal...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1482"/>
+        <location filename="../CMainWindow.cpp" line="1533"/>
         <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
-        <translation>QMapShack detectó una biblioteca Proj4 mal instalada. Las tablas de traducción para las proyecciones EPSG usualmente almacenadas en / usr / share / proj faltan. Póngase en contacto con el responsable del paquete de su distribución para solucionarlo.</translation>
+        <translation>QMapShack ha detectat que la llibreria Proj4 no està instal·lada de forma correcte. Manquen les taules de conversió de les projeccions EPSG, emmagatzemades de normal a /usr/share/proj. Per a solucionar-ho contacteu el mantenidor del paquet de la distribució.</translation>
     </message>
 </context>
 <context>
@@ -2112,9 +2369,9 @@ línea %2, columna %3.
         <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
 
 If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
-        <translation>No hay mapas en este momento. QMapShack no es divertido sin mapas. Puede instalar mapas al presionar la tecla Ayuda! ¡Quiero mapas! En el botón ' mapas ',o puede presionar la tecla F1 para abrir la documentación en línea que le indica cómo usar QMapShack.
+        <translation>En aquest moment no hi ha cap mapa instal·lat. QMapShack no es diverteix si no té mapes. Podeu instal·lar-ne prement la tecla 'Ajuda. Vull mapes!' a la finestra 'Mapes' de l'acoblador. O bé, podeu prémer la tecla F1 per accedir a la documentació en línia que us explicarà com utilitzar QMapShack. 
 
-Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas listos para descargar e instalar requiere un buen servidor. Y esto no es un servicio gratuito. El proyecto carece de dinero. Además, los datos de mapa y DEM tienen un copyright. Por lo tanto, el titular de los derechos de autor tiene que ser preguntado antes de empaquetar los datos. Esto no es tan fácil como podría sonar y para algunos datos que tiene que pagar royalties. El proyecto simplemente carece de recursos [...]
+Si no es diverteix, perquè no l'hi doneu mapes? Per allotjar mapes a punt per a descarregar I instal·lar fa falta un bon servidor. I això no és un servei gratuït. El projecte no te els diners. A més, els mapes I les dades DEM tenen drets d'autor. Per tant, abans d'empaquetar les dades s'ha de demanar permís al propietari dels drets d'autor. Tot això no és tan senzill com sembla i, en alguns casos s'han de pagar royalties. El projecte simplement no disposa de [...]
     </message>
 </context>
 <context>
@@ -2122,237 +2379,237 @@ Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas lis
     <message>
         <location filename="../map/CMapIMG.cpp" line="146"/>
         <source>Failed ...</source>
-        <translation>Falló ...</translation>
+        <translation>Ha fallat ...</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="175"/>
         <source>Unspecified</source>
-        <translation>No especificado</translation>
+        <translation>Sense especificar</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="176"/>
         <source>French</source>
-        <translation>Francés</translation>
+        <translation>Francès</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="177"/>
         <source>German</source>
-        <translation>Alemán</translation>
+        <translation>Alemany</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="178"/>
         <source>Dutch</source>
-        <translation>Holandés</translation>
+        <translation>Holandes</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="179"/>
         <source>English</source>
-        <translation>Inglés</translation>
+        <translation>Anglès</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="180"/>
         <source>Italian</source>
-        <translation>Italiano</translation>
+        <translation>Italià</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="181"/>
         <source>Finnish</source>
-        <translation>Finés</translation>
+        <translation>Finlandés</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="182"/>
         <source>Swedish</source>
-        <translation>Sueco</translation>
+        <translation>Suec</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="183"/>
         <source>Spanish</source>
-        <translation>Español</translation>
+        <translation>Espanyol</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="184"/>
         <source>Basque</source>
-        <translation>Euskera</translation>
+        <translation>Basc</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="185"/>
         <source>Catalan</source>
-        <translation>Catalán</translation>
+        <translation>Català</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="186"/>
         <source>Galician</source>
-        <translation>Gallego</translation>
+        <translation>Gallec</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="187"/>
         <source>Welsh</source>
-        <translation>Galés</translation>
+        <translation>Gal·lès</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="188"/>
         <source>Gaelic</source>
-        <translation>Gaélico</translation>
+        <translation>Gaèlic</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="189"/>
         <source>Danish</source>
-        <translation>Danés</translation>
+        <translation>Danès</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="190"/>
         <source>Norwegian</source>
-        <translation>Noruego</translation>
+        <translation>Noruec</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="191"/>
         <source>Portuguese</source>
-        <translation>Portugués</translation>
+        <translation>Portuguès</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="192"/>
         <source>Slovak</source>
-        <translation>Eslovaco</translation>
+        <translation>Eslovac</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="193"/>
         <source>Czech</source>
-        <translation>Checo</translation>
+        <translation>Txec</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="194"/>
         <source>Croatian</source>
-        <translation>Croata</translation>
+        <translation>Croat</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="195"/>
         <source>Hungarian</source>
-        <translation>Húngaro</translation>
+        <translation>Hongarès</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="196"/>
         <source>Polish</source>
-        <translation>Polaco</translation>
+        <translation>Polonès</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="197"/>
         <source>Turkish</source>
-        <translation>Turco</translation>
+        <translation>Turc</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="198"/>
         <source>Greek</source>
-        <translation>Griego</translation>
+        <translation>Grec</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="199"/>
         <source>Slovenian</source>
-        <translation>Esloveno</translation>
+        <translation>Eslovè</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="200"/>
         <source>Russian</source>
-        <translation>Ruso</translation>
+        <translation>Rus</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="201"/>
         <source>Estonian</source>
-        <translation>Estonio</translation>
+        <translation>Estonià</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="202"/>
         <source>Latvian</source>
-        <translation>Letón</translation>
+        <translation>Letó</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="203"/>
         <source>Romanian</source>
-        <translation>Rumano</translation>
+        <translation>Romanès</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="204"/>
         <source>Albanian</source>
-        <translation>Albanés</translation>
+        <translation>Albanès</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="205"/>
         <source>Bosnian</source>
-        <translation>Bosnio</translation>
+        <translation>Bosnià</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="206"/>
         <source>Lithuanian</source>
-        <translation>Lituano</translation>
+        <translation>Lituà</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="207"/>
         <source>Serbian</source>
-        <translation>Serbio</translation>
+        <translation>Serbi</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="208"/>
         <source>Macedonian</source>
-        <translation>Macedonio</translation>
+        <translation>Macedoni</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="209"/>
         <source>Bulgarian</source>
-        <translation>Búlgaro</translation>
+        <translation>Búlgar</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="266"/>
         <source>Major highway</source>
-        <translation>Autovía Primaria</translation>
+        <translation>Autopista</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="267"/>
         <source>Principal highway</source>
-        <translation>Autovía secundaria</translation>
+        <translation>Autovia</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="268"/>
         <source>Other highway</source>
-        <translation>Otras autovías</translation>
+        <translation>Autovia</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="269"/>
         <source>Arterial road</source>
-        <translation>Carretera principal</translation>
+        <translation>Carretera nacional</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="270"/>
         <source>Collector road</source>
-        <translation>Carretera secundaria</translation>
+        <translation>Carretera comarcal</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="271"/>
         <source>Residential street</source>
-        <translation>Calle residencial</translation>
+        <translation>Carrer</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="272"/>
         <source>Alley/Private road</source>
-        <translation>Callejón/Carretera privada</translation>
+        <translation>Carretera privada</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="273"/>
         <source>Highway ramp, low speed</source>
-        <translation>Acceso a autopista, baja velocidad</translation>
+        <translation>Enllaç autopista, baixa velocitat</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="274"/>
         <source>Highway ramp, high speed</source>
-        <translation>Acceso a autopista, alta velocidad</translation>
+        <translation>Enllaç autopista, alta velocitat</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="275"/>
         <source>Unpaved road</source>
-        <translation>Carretera sin asfaltar</translation>
+        <translation>Carretera sense asfaltar</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="276"/>
         <source>Major highway connector</source>
-        <translation>Conexión con autovía principal</translation>
+        <translation>Enllaç d'autopistes</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="277"/>
@@ -2367,17 +2624,17 @@ Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas lis
     <message>
         <location filename="../map/CMapIMG.cpp" line="279"/>
         <source>Shoreline</source>
-        <translation>Línea de costa</translation>
+        <translation>Línia de costa</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="280"/>
         <source>Trail</source>
-        <translation>Sendero</translation>
+        <translation>Camí</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="281"/>
         <source>Stream</source>
-        <translation>Arroyo</translation>
+        <translation>Rierol</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="282"/>
@@ -2388,17 +2645,17 @@ Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas lis
         <location filename="../map/CMapIMG.cpp" line="283"/>
         <location filename="../map/CMapIMG.cpp" line="284"/>
         <source>Ferry</source>
-        <translation>Ferry</translation>
+        <translation>Transbordador</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="285"/>
         <source>State/province border</source>
-        <translation>Frontera de estado/provincia</translation>
+        <translation>Frontera provincial</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="286"/>
         <source>County/parish border</source>
-        <translation>Frontera de condado/término municipal</translation>
+        <translation>Frontera estatal</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="287"/>
@@ -2408,83 +2665,83 @@ Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas lis
     <message>
         <location filename="../map/CMapIMG.cpp" line="288"/>
         <source>River</source>
-        <translation>Río</translation>
+        <translation>Riu</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="289"/>
         <source>Minor land contour</source>
-        <translation>Curva altimétrica menor</translation>
+        <translation>Corba de nivell mínima</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="290"/>
         <source>Intermediate land contour</source>
-        <translation>Curva altimétrica intermedia</translation>
+        <translation>Corba de nivell intermèdia</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="291"/>
         <source>Major land contour</source>
-        <translation>Curva altimétrica principal</translation>
+        <translation>Corba de nivell màxima</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="292"/>
         <source>Minor depth contour</source>
-        <translation>Curva batimétrica menor</translation>
+        <translation>Corba de profunditat mínima</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="293"/>
         <source>Intermediate depth contour</source>
-        <translation>Curva batimétrica intermedia</translation>
+        <translation>Corba de profunditat intermèdia</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="294"/>
         <source>Major depth contour</source>
-        <translation>Curva batimétrica principal</translation>
+        <translation>Corba de profunditat màxima</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="295"/>
         <source>Intermittent stream</source>
-        <translation>Curso intermitente</translation>
+        <translation>Riera</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="296"/>
         <location filename="../map/CMapIMG.cpp" line="378"/>
         <source>Airport runway</source>
-        <translation>Pista de aterrizaje</translation>
+        <translation>Pista d'aterratge</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="297"/>
         <source>Pipeline</source>
-        <translation>Tubería</translation>
+        <translation>Oleoducte</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="298"/>
         <source>Powerline</source>
-        <translation>Línea eléctrica</translation>
+        <translation>Línia d'alta tensió</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="299"/>
         <source>Marine boundary</source>
-        <translation>Límite marítimo</translation>
+        <translation>Límit marí</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="300"/>
         <source>Hazard boundary</source>
-        <translation>Límite de peligro</translation>
+        <translation>Límit de risc</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="365"/>
         <source>Large urban area (&gt;200K)</source>
-        <translation>Área urbana grande (&gt;200K)</translation>
+        <translation>Àrea urbana gran (&gt;200K)</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="366"/>
         <source>Small urban area (&lt;200K)</source>
-        <translation>Área urbana pequeña (&lt;200K)</translation>
+        <translation>Àrea urbana petita (&lt;200K)</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="367"/>
         <source>Rural housing area</source>
-        <translation>Área de alojamienos rurales</translation>
+        <translation>Entorn rural</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="368"/>
@@ -2494,32 +2751,32 @@ Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas lis
     <message>
         <location filename="../map/CMapIMG.cpp" line="369"/>
         <source>Parking lot</source>
-        <translation>Aparcamiento</translation>
+        <translation>Aparcament</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="370"/>
         <source>Parking garage</source>
-        <translation>Garaje</translation>
+        <translation>Garatge</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="371"/>
         <source>Airport</source>
-        <translation>Aeropuerto</translation>
+        <translation>Aeroport</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="372"/>
         <source>Shopping center</source>
-        <translation>Centro comercial</translation>
+        <translation>Centre comercial</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="373"/>
         <source>Marina</source>
-        <translation>Puerto deportivo</translation>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="374"/>
         <source>University/College</source>
-        <translation>Universidad/Facultad</translation>
+        <translation>Universitat/Institut</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="375"/>
@@ -2529,68 +2786,68 @@ Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas lis
     <message>
         <location filename="../map/CMapIMG.cpp" line="376"/>
         <source>Industrial complex</source>
-        <translation>Complejo industrial</translation>
+        <translation>Zona industrial</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="377"/>
         <source>Reservation</source>
-        <translation>Reserva natural</translation>
+        <translation>Reserva</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="379"/>
         <source>Man-made area</source>
-        <translation>Área creada por el hombre</translation>
+        <translation>Zona artificial</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="380"/>
         <source>Sports complex</source>
-        <translation>Complejo deportivo</translation>
+        <translation>Complex esportiu</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="381"/>
         <source>Golf course</source>
-        <translation>Recorrido de golf</translation>
+        <translation>Camp de golf</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="382"/>
         <source>Cemetery</source>
-        <translation>Cementerio</translation>
+        <translation>Cementiri</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="383"/>
         <location filename="../map/CMapIMG.cpp" line="384"/>
         <location filename="../map/CMapIMG.cpp" line="385"/>
         <source>National park</source>
-        <translation>Parque nacional</translation>
+        <translation>Parc Nacional</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="386"/>
         <source>City park</source>
-        <translation>Parque urbano</translation>
+        <translation>Parc urbà</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="387"/>
         <location filename="../map/CMapIMG.cpp" line="388"/>
         <location filename="../map/CMapIMG.cpp" line="389"/>
         <source>State park</source>
-        <translation>Parque regional</translation>
+        <translation>Parc nacional</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="390"/>
         <source>Forest</source>
-        <translation>Bosque</translation>
+        <translation>Bosc</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="391"/>
         <source>Ocean</source>
-        <translation>Océano</translation>
+        <translation>Oceà</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="392"/>
         <location filename="../map/CMapIMG.cpp" line="394"/>
         <location filename="../map/CMapIMG.cpp" line="404"/>
         <source>Blue (unknown)</source>
-        <translation>Azul (desconocido)</translation>
+        <translation>Blau (Desconegut)</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="393"/>
@@ -2602,70 +2859,70 @@ Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas lis
         <location filename="../map/CMapIMG.cpp" line="396"/>
         <location filename="../map/CMapIMG.cpp" line="403"/>
         <source>Large lake</source>
-        <translation>Lago grande</translation>
+        <translation>Llac gran</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="397"/>
         <location filename="../map/CMapIMG.cpp" line="398"/>
         <source>Medium lake</source>
-        <translation>Lago mediano</translation>
+        <translation>Llac mitjà</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="399"/>
         <location filename="../map/CMapIMG.cpp" line="400"/>
         <source>Small lake</source>
-        <translation>Lago pequeño</translation>
+        <translation>LLac petit</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="401"/>
         <location filename="../map/CMapIMG.cpp" line="402"/>
         <source>Major lake</source>
-        <translation>Lago principal</translation>
+        <translation>Llac</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="405"/>
         <source>Major River</source>
-        <translation>Río Principal</translation>
+        <translation>Riu</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="406"/>
         <source>Large River</source>
-        <translation>Río Grande</translation>
+        <translation>Riu</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="407"/>
         <source>Medium River</source>
-        <translation>Río Mediano</translation>
+        <translation>Riu</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="408"/>
         <source>Small River</source>
-        <translation>Río Pequeño</translation>
+        <translation>Rierol</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="411"/>
         <source>Intermittent water</source>
-        <translation>Agua intermitente</translation>
+        <translation>Zona inundable</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="412"/>
         <source>Wetland/Swamp</source>
-        <translation>Marisma/Ciénaga</translation>
+        <translation>Aiguamolls / Pantà</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="413"/>
         <source>Glacier</source>
-        <translation>Glaciar</translation>
+        <translation>Glacera</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="414"/>
         <source>Orchard/Plantation</source>
-        <translation>Invernadero/Plantación</translation>
+        <translation>Hort / Camp de cultiu</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="415"/>
         <source>Scrub</source>
-        <translation>Monte bajo</translation>
+        <translation>Matolls</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="416"/>
@@ -2675,84 +2932,84 @@ Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas lis
     <message>
         <location filename="../map/CMapIMG.cpp" line="417"/>
         <source>Flat</source>
-        <translation>Llanura</translation>
+        <translation>Pla</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="418"/>
         <source>???</source>
-        <translation></translation>
+        <translation>???</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="432"/>
         <source>Read external type file...</source>
-        <translation>Cargar archivo TYP externo...</translation>
+        <translation>Llegir un tipus de fitxer extern...</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="432"/>
         <source>Failed to read type file: %1
 Fall back to internal types.</source>
-        <translation>Fallo al cargar archivo TYP: %1
-Se vuelve al TYP interno.</translation>
+        <translation>Error en la lectura del tipus de fitxer: %1
+Retorn als típus interns..</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="474"/>
         <source>Failed to read: </source>
-        <translation>Fallo al leer: </translation>
+        <translation>Error en llegir:</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="517"/>
         <source>Failed to open: </source>
-        <translation>Fallo al abrir: </translation>
+        <translation>Error en obrir:</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="541"/>
         <location filename="../map/CMapIMG.cpp" line="545"/>
         <source>Bad file format: </source>
-        <translation>Formato de archivo incorrecto: </translation>
+        <translation>Format de fitxer incorrecte: </translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="634"/>
         <source>Failed to read file structure: </source>
-        <translation>Fallo al leer la estructura del archivo: </translation>
+        <translation>Error en llegir l'estructura del fitxer:</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="669"/>
         <source>Loading %1</source>
-        <translation>Cargando %1</translation>
+        <translation>S'està carregant %1</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="675"/>
         <source>User abort: </source>
-        <translation>Cancelado por el usuario: </translation>
+        <translation>Interromput per l'usuari:</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="678"/>
         <source>File is NT format. QMapShack is unable to read map files with NT format: </source>
-        <translation>El archivo está en formato NT. QMapShack no puede leer archivos en formato NT: </translation>
+        <translation>El fixer estates en format NT. QMapShack no és capaç de llegir fitxers de mapes en format NT: </translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="769"/>
         <source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
-        <translation>El archivo contiene datos bloqueados y/o encriptados. Garmin no desea que utilice este archivo con ningún otro software que el suministrado por ellos.</translation>
+        <translation>El fitxer conté dades bloquejades / xifrades. Garmin sols permet utilitzar aquest fitxer amb programari subministrat per Garmin.</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="2388"/>
         <location filename="../map/CMapIMG.cpp" line="2394"/>
         <location filename="../map/CMapIMG.cpp" line="2398"/>
         <source>Point of Interest</source>
-        <translation>Punto de Interés</translation>
+        <translation>Fita</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="2484"/>
         <source>Unknown</source>
-        <translation>Desconocido</translation>
+        <translation>Desconegut</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="2526"/>
         <location filename="../map/CMapIMG.cpp" line="2534"/>
         <location filename="../map/CMapIMG.cpp" line="2541"/>
         <source>Area</source>
-        <translation>Área</translation>
+        <translation>Àrea</translation>
     </message>
 </context>
 <context>
@@ -2760,17 +3017,17 @@ Se vuelve al TYP interno.</translation>
     <message>
         <location filename="../map/CMapList.cpp" line="202"/>
         <source>Deactivate</source>
-        <translation>Desactivar</translation>
+        <translation>Desactivat</translation>
     </message>
     <message>
         <location filename="../map/CMapList.cpp" line="202"/>
         <source>Activate</source>
-        <translation>Activar</translation>
+        <translation>Activat</translation>
     </message>
     <message>
         <location filename="../map/CMapList.cpp" line="227"/>
         <source>Where do you want to store maps?</source>
-        <translation>¿Dónde desea almacenar mapas?</translation>
+        <translation>On vols desar els mapes?</translation>
     </message>
 </context>
 <context>
@@ -2778,17 +3035,17 @@ Se vuelve al TYP interno.</translation>
     <message>
         <location filename="../map/CMapMAP.cpp" line="46"/>
         <source>Failed ...</source>
-        <translation>Falló...</translation>
+        <translation>Ha fallat ...</translation>
     </message>
     <message>
         <location filename="../map/CMapMAP.cpp" line="63"/>
         <source>Failed to open: </source>
-        <translation>Fallo al abrir: </translation>
+        <translation>Error en obrir:</translation>
     </message>
     <message>
         <location filename="../map/CMapMAP.cpp" line="73"/>
         <source>Bad file format: </source>
-        <translation>Formato de archivo incorrecto: </translation>
+        <translation>Format de fitxer incorrecte: </translation>
     </message>
 </context>
 <context>
@@ -2796,17 +3053,17 @@ Se vuelve al TYP interno.</translation>
     <message>
         <location filename="../map/CMapPathSetup.cpp" line="47"/>
         <source>Add or remove paths containing maps. There can be multiple maps in a path but no sub-path is parsed. Supported formats are: %1</source>
-        <translation>Añada o elimine rutas que contengan mapas. Puede haber múltiples mapas en una ruta, pero no se buscará en subdirectorios. Los formatos soportados son: %1</translation>
+        <translation>Afegir o suprimir camins a mapes. Pot haver-hi diversos mapes en un camí, però els camins secundaris no s'analitzaran. Els formats compatibles són: %1</translation>
     </message>
     <message>
         <location filename="../map/CMapPathSetup.cpp" line="62"/>
         <source>Select map path...</source>
-        <translation>Selecciona la ruta del mapa...</translation>
+        <translation>Selecciona el camí als mapes...</translation>
     </message>
     <message>
         <location filename="../map/CMapPathSetup.cpp" line="81"/>
         <source>Select root path...</source>
-        <translation>Seleccionar carpeta raiz...</translation>
+        <translation>Selecciona el camí arrel...</translation>
     </message>
 </context>
 <context>
@@ -2814,7 +3071,7 @@ Se vuelve al TYP interno.</translation>
     <message>
         <location filename="../map/CMapPropSetup.cpp" line="196"/>
         <source>Select type file...</source>
-        <translation>Seleccionar archivo TYP...</translation>
+        <translation>Selecciona el tipus de fitxer...</translation>
     </message>
 </context>
 <context>
@@ -2834,17 +3091,17 @@ Se vuelve al TYP interno.</translation>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="48"/>
         <source>This is not a TwoNav RMAP file.</source>
-        <translation>Éste no es un archivo en formato RMAP de TwoNav.</translation>
+        <translation>No és un fitxer RMAP de TwoNav.</translation>
     </message>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="57"/>
         <source>Unknown sub-format.</source>
-        <translation>Sub-formato desconocido.</translation>
+        <translation>Subformat desconegut.</translation>
     </message>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="127"/>
         <source>Unknown version.</source>
-        <translation>Versión desconocida.</translation>
+        <translation>Versió desconeguda</translation>
     </message>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="144"/>
@@ -2852,12 +3109,12 @@ Se vuelve al TYP interno.</translation>
         <location filename="../map/CMapRMAP.cpp" line="187"/>
         <location filename="../map/CMapRMAP.cpp" line="209"/>
         <source>Failed to read reference point.</source>
-        <translation>Fallo al leer el punto de referencia.</translation>
+        <translation>Error en llegir el punt de referència.</translation>
     </message>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="237"/>
         <source>Unknown projection and datum (%1%2).</source>
-        <translation>Proyección y datum desconocidos (%1%2).</translation>
+        <translation>Projecció i datum desconeguts (%1%2).</translation>
     </message>
 </context>
 <context>
@@ -2871,15 +3128,15 @@ Se vuelve al TYP interno.</translation>
     <message>
         <location filename="../map/CMapTMS.cpp" line="68"/>
         <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
+        <translation>Error en obrir %1</translation>
     </message>
     <message>
         <location filename="../map/CMapTMS.cpp" line="78"/>
         <source>Failed to read: %1
 line %2, column %3:
  %4</source>
-        <translation>Fallo al leer: %1
-línea %2, columna %3.
+        <translation>Error en llegir %1
+línia %2, columna %3:
  %4</translation>
     </message>
     <message>
@@ -2902,17 +3159,17 @@ línea %2, columna %3.
         <location filename="../map/CMapVRT.cpp" line="45"/>
         <location filename="../map/CMapVRT.cpp" line="59"/>
         <source>Failed to load file: %1</source>
-        <translation>Fallo al leer el archivo: %1</translation>
+        <translation>Error en carregar el fitxer: %1...</translation>
     </message>
     <message>
         <location filename="../map/CMapVRT.cpp" line="83"/>
         <source>File must be 8 bit palette or gray indexed.</source>
-        <translation>El archivo debe ser con paleta de 8 bits o escala de grises indexada.</translation>
+        <translation>El fitxer ha de tenir una paleta de 8 bits o escala de grisos.</translation>
     </message>
     <message>
         <location filename="../map/CMapVRT.cpp" line="133"/>
         <source>No georeference information found.</source>
-        <translation>No se encontró información de georreferenciación.</translation>
+        <translation>No s'ha trobat informació de georeferència.</translation>
     </message>
 </context>
 <context>
@@ -2920,23 +3177,24 @@ línea %2, columna %3.
     <message>
         <location filename="../tool/CMapVrtBuilder.cpp" line="29"/>
         <source>Build GDAL VRT</source>
-        <translation>Crear GDAL VRT</translation>
+        <translation>Creació de GDAL VRT</translation>
     </message>
     <message>
         <location filename="../tool/CMapVrtBuilder.cpp" line="63"/>
         <source>Select files...</source>
-        <translation>Seleccionar ficheros de origen...</translation>
+        <translation>Selecciona els fitxers...</translation>
     </message>
     <message>
         <location filename="../tool/CMapVrtBuilder.cpp" line="87"/>
         <source>Select target file...</source>
-        <translation>Seleccionar fichero VRT de salida...</translation>
+        <translation>Selecciona el fitxer destí...</translation>
     </message>
     <message>
         <location filename="../tool/CMapVrtBuilder.cpp" line="150"/>
         <source>!!! done !!!
 </source>
-        <translation>¡¡¡ hecho !!!</translation>
+        <translation>!!! fet !!!
+</translation>
     </message>
 </context>
 <context>
@@ -2953,33 +3211,33 @@ línea %2, columna %3.
     <message>
         <location filename="../map/CMapWMTS.cpp" line="43"/>
         <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
+        <translation>Error en obrir %1</translation>
     </message>
     <message>
         <location filename="../map/CMapWMTS.cpp" line="53"/>
         <source>Failed to read: %1
 line %2, column %3:
  %4</source>
-        <translation>Fallo al leer: %1
-línea %2, columna %3.
+        <translation>Error en llegir %1
+línia %2, columna %3:
  %4</translation>
     </message>
     <message>
         <location filename="../map/CMapWMTS.cpp" line="63"/>
         <source>Failed to read: %1
 Unknown structure.</source>
-        <translation>Fallo al leer: %1
-Estructura desconocida.</translation>
+        <translation>No s'ha pogut llegir: %1
+Estructura desconeguda.</translation>
     </message>
     <message>
         <location filename="../map/CMapWMTS.cpp" line="72"/>
         <source>Unexpected service. '* WMTS 1.0.0' is expected. '%1 %2' is read.</source>
-        <translation>Servicio inesperado. '* WMTS 1.0.0' es el esperado. pero se ha leido '%1 %2'.</translation>
+        <translation>Servei inesperat. S'esperava'* WMTS 1.0.0'. S'ha llegit '%1 %2'.</translation>
     </message>
     <message>
         <location filename="../map/CMapWMTS.cpp" line="209"/>
         <source>No georeference information found.</source>
-        <translation>No se encontró información de georreferenciación.</translation>
+        <translation>No s'ha trobat informació de georeferència.</translation>
     </message>
 </context>
 <context>
@@ -2988,17 +3246,17 @@ Estructura desconocida.</translation>
         <location filename="../mouse/CMouseEditArea.cpp" line="28"/>
         <location filename="../mouse/CMouseEditArea.cpp" line="35"/>
         <source>Area</source>
-        <translation>Área</translation>
+        <translation>Àrea</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditArea.cpp" line="37"/>
         <source><b>Edit Area</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
-        <translation><b>Editar área</b><br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
+        <translation><b>Editar Àrea</b><br/>Selecciona una funció i un mode d'itinerari utilitzant els botons d'eines. Desprès, selecciona un punt de la línia. Només es poden canviar els punts assenyalats amb un quadrat gran. Els assenyalats amb un punt negre són subpunts que ha creat l'enrutament.<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditArea.cpp" line="94"/>
         <source>area</source>
-        <translation>área</translation>
+        <translation>àrea</translation>
     </message>
 </context>
 <context>
@@ -3007,17 +3265,17 @@ Estructura desconocida.</translation>
         <location filename="../mouse/CMouseEditRte.cpp" line="30"/>
         <location filename="../mouse/CMouseEditRte.cpp" line="37"/>
         <source>Route</source>
-        <translation>Ruta</translation>
+        <translation>Itinerari</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditRte.cpp" line="39"/>
         <source><b>Edit Route Points</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
-        <translation></b>Editar puntos de ruta<br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
+        <translation><b>Editar Punts de Ruta</b><br/>Selecciona una funció i un mode d'itinerari utilitzant els botons d'eines. Desprès, selecciona un punt de la línia. Només es poden canviar els punts assenyalats amb un quadrat gran. Els assenyalats amb un punt negre són subpunts que ha creat l'enrutament.<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditRte.cpp" line="105"/>
         <source>route</source>
-        <translation>Ruta</translation>
+        <translation>itinerari</translation>
     </message>
 </context>
 <context>
@@ -3026,22 +3284,22 @@ Estructura desconocida.</translation>
         <location filename="../mouse/CMouseEditTrk.cpp" line="28"/>
         <location filename="../mouse/CMouseEditTrk.cpp" line="35"/>
         <source>Track</source>
-        <translation></translation>
+        <translation>Track</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditTrk.cpp" line="38"/>
         <source><b>Edit Track Points</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
-        <translation><b>Editar puntos del track</b><br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
+        <translation><b>Editar Punts de Track</b><br/>Selecciona una funció i un mode d'itinerari utilitzant els botons d'eines. Desprès, selecciona un punt de la línia. Només es poden canviar els punts assenyalats amb un quadrat gran. Els assenyalats amb un punt negre són subpunts que ha creat l'enrutament.<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditTrk.cpp" line="80"/>
         <source>Warning!</source>
-        <translation>¡Cuidado!</translation>
+        <translation>Avís!</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditTrk.cpp" line="80"/>
         <source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
-        <translation>Esto sustituirá todos los datos del original con una simple línea de coordenadas. Todos los demás datos se perderán definitivamente.</translation>
+        <translation>Substitueix totes les dades originals per una simple línia de coordenades. Totes les altres dades es perdran definitivament.</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditTrk.cpp" line="110"/>
@@ -3052,44 +3310,44 @@ Estructura desconocida.</translation>
 <context>
     <name>CMouseNormal</name>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="39"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
         <source>Add POI as Waypoint</source>
-        <translation>Añadir POI como Waypoint </translation>
+        <translation>Afegir Punt d'Interès com una Fita</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
         <source>Add Waypoint</source>
-        <translation>Añadir Waypoint</translation>
+        <translation>Afegir Fita</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
         <source>Add Track</source>
-        <translation>Añadir Track</translation>
+        <translation>Afegir Track</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
         <source>Add Route</source>
-        <translation>Añadir ruta</translation>
+        <translation>Afegir Ruta</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="44"/>
         <source>Add Area</source>
-        <translation>Añadir Área</translation>
+        <translation>Afegir Àrea</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="45"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="46"/>
         <source>Select Items On Map</source>
-        <translation>Seleccionar elementos del mapa</translation>
+        <translation>Selecciona elements en el Mapa</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
         <source>Copy position</source>
-        <translation>Copiar posición</translation>
+        <translation>Copia la posició</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="49"/>
         <source>Copy position (Grid)</source>
-        <translation>Copiar posicion (malla)</translation>
+        <translation>Copia la posició (Graella)</translation>
     </message>
 </context>
 <context>
@@ -3097,15 +3355,15 @@ Estructura desconocida.</translation>
     <message>
         <location filename="../mouse/CMousePrint.cpp" line="31"/>
         <source><b>Save(Print) Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
-        <translation><b>Guardar/imprimir mapa</b><br/>Seleccione un area rectangular en el mapa pulsando el boton izquierdo del ratón y moviendolo hacia la esquina opuesta. Cancele con el boton derecho. Ajuste la seleccion haciendo clic y moviendo las esquinas.</translation>
+        <translation><b>Desa (Imprimeix) Mapa</b><br/>Selecciona una area rectangular en el mapa. Fes clic en el botó esquerra del ratolí i mou el ratolí. Fes clic al botó dret per interrompre. Per a ajustar la selecció apunta-fes clic-mou el ratolí a les cantonades.</translation>
     </message>
 </context>
 <context>
     <name>CMouseRangeTrk</name>
     <message>
-        <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
+        <location filename="../mouse/CMouseRangeTrk.cpp" line="239"/>
         <source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
-        <translation><b>Seleccionar rango</b><br/>Seleccione el punto inicial con el botón izquierdo del raton. Fije el punto final con una segunda pulsacion. El rango seleccionado se marca en verde. Un clic con el botón derecho del ratón abandona la selección del rango<br/></translation>
+        <translation><b>Selecció de l'Interval</b><br/>Amb el botó esquerra del ratolí selecciona el primer punt del track. I després un segon. Fent un clic al botó esquerra del ratolí surts de la selecció de l'interval.<br/></translation>
     </message>
 </context>
 <context>
@@ -3113,17 +3371,17 @@ Estructura desconocida.</translation>
     <message>
         <location filename="../mouse/CMouseSelect.cpp" line="32"/>
         <source><b>Select Items On Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
-        <translation><b>Seleccionar elementos en el mapa</b><br/>Seleccione un area rectangular con el boton izquierdo del ratón. Cancelar con clic derecho. Ajuste la seleccion haciendo clic y desplazando en las esquinas.</translation>
+        <translation><b>Seleccionar Elements del Mapa</b><br/>Selecciona una àrea rectangular en el mapa. Fes clic en el botó esquerra del ratolí i mou el ratolí. Fes clic al botó dret per interrompre. Per a ajustar la selecció apunta-fes clic-mou el ratolí a les cantonades.</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseSelect.cpp" line="99"/>
         <source><b>Selected:</b><br/></source>
-        <translation><b>Seleccionado:</b><br/></translation>
+        <translation><b>Seleccionats:</b><br/></translation>
     </message>
     <message>
         <location filename="../mouse/CMouseSelect.cpp" line="107"/>
         <source>%1 waypoints<br/></source>
-        <translation>%1 waypoints<br/></translation>
+        <translation>%1 fites<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CMouseSelect.cpp" line="102"/>
@@ -3133,12 +3391,12 @@ Estructura desconocida.</translation>
     <message>
         <location filename="../mouse/CMouseSelect.cpp" line="112"/>
         <source>%1 routes<br/></source>
-        <translation>%1 rutas<br/></translation>
+        <translation>%1 rutes<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CMouseSelect.cpp" line="117"/>
         <source>%1 areas<br/></source>
-        <translation>%1 áreas<br/></translation>
+        <translation>%1 àrees<br/></translation>
     </message>
 </context>
 <context>
@@ -3146,33 +3404,33 @@ Estructura desconocida.</translation>
     <message>
         <location filename="../widgets/CPhotoAlbum.cpp" line="73"/>
         <source>Select images...</source>
-        <translation>Seleccionar imagenes...</translation>
+        <translation>Selecciona imatges...</translation>
     </message>
 </context>
 <context>
     <name>CPlot</name>
     <message>
         <location filename="../plot/CPlot.cpp" line="55"/>
-        <source>distance [%1]</source>
-        <translation>distancia [%1]</translation>
+        <source>Distance [%1]</source>
+        <translation>Distància [%1]</translation>
     </message>
     <message>
         <location filename="../plot/CPlot.cpp" line="60"/>
-        <source>time</source>
-        <translation>tiempo</translation>
+        <source>Time</source>
+        <translation>Hora</translation>
     </message>
 </context>
 <context>
     <name>CPlotProfile</name>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="79"/>
-        <source>distance [%1]</source>
-        <translation>distancia [%1]</translation>
+        <source>Distance [%1]</source>
+        <translation>Distància [%1]</translation>
     </message>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="80"/>
-        <source>alt. [%1]</source>
-        <translation>alt. [%1]</translation>
+        <source>Ele. [%1]</source>
+        <translation>Ele. [%1]</translation>
     </message>
 </context>
 <context>
@@ -3180,22 +3438,22 @@ Estructura desconocida.</translation>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="67"/>
         <source>Print Map...</source>
-        <translation>Imprimir mapa...</translation>
+        <translation>Imprimir Mapa...</translation>
     </message>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="74"/>
         <source>Save Map as Image...</source>
-        <translation>Guardar mapa como imagen...</translation>
+        <translation>Desa el mapa com a imatge...</translation>
     </message>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="94"/>
         <source>Printer Properties...</source>
-        <translation>Imprimir propiedades...</translation>
+        <translation>Propietats de la impresora...</translation>
     </message>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="169"/>
         <source>Pages: %1 x %2</source>
-        <translation>Páginas: %1 x %2</translation>
+        <translation>Pàgines: %1 x %2</translation>
     </message>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="170"/>
@@ -3204,34 +3462,34 @@ Estructura desconocida.</translation>
 %1x%2 pixel
 x: %3 m/px
 y: %4 m/px</source>
-        <translation>Zoom con la rueda del ratón en el mapa inferior para cambiar la resolución:
+        <translation>Per a canviar la resolució fes Zoom en el mapa de sota amb la roda del ratolí:
 
-%1x%2 pixel
+%1x%2 píxel
 x: %3 m/px
 y: %4 m/px</translation>
     </message>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="216"/>
         <source>Printing pages.</source>
-        <translation>Imprimir páginas.</translation>
+        <translation>Impressió de les pàgines.</translation>
     </message>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="260"/>
         <source>Save map...</source>
-        <translation>Guardar mapa...</translation>
+        <translation>Desa el mapa...</translation>
     </message>
 </context>
 <context>
     <name>CProgressDialog</name>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="46"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="48"/>
         <source>Elapsed time: %1</source>
-        <translation>Tiempo transcurrido: %1</translation>
+        <translation>Temps transcorregut: %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="132"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="134"/>
         <source>Elapsed time: %1 seconds.</source>
-        <translation>Tiempo transcurrido: %1 segundos.</translation>
+        <translation>Temps transcorregut: %1 segons.</translation>
     </message>
 </context>
 <context>
@@ -3239,12 +3497,12 @@ y: %4 m/px</translation>
     <message>
         <location filename="../grid/CProjWizard.cpp" line="62"/>
         <source>north</source>
-        <translation>norte</translation>
+        <translation>nord</translation>
     </message>
     <message>
         <location filename="../grid/CProjWizard.cpp" line="63"/>
         <source>south</source>
-        <translation>sur</translation>
+        <translation>sud</translation>
     </message>
     <message>
         <location filename="../grid/CProjWizard.cpp" line="222"/>
@@ -3259,7 +3517,7 @@ is not a valid coordinate system definition:
 %2</source>
         <translation>El valor
 '%1'
-no es una definición de sistema de coordenadas válido:
+no és una coordenada vàlida en la configuración activa:
 %2</translation>
     </message>
 </context>
@@ -3268,12 +3526,35 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/wpt/CProjWpt.cpp" line="62"/>
         <source>Edit name...</source>
-        <translation>Editar nombre...</translation>
+        <translation>Edita el nom...</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CProjWpt.cpp" line="62"/>
         <source>Enter new waypoint name.</source>
-        <translation>Introduzca el nuevo nombre del waypoint.</translation>
+        <translation> Introduïu un nom nou a la fita.</translation>
+    </message>
+</context>
+<context>
+    <name>CQlbProject</name>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open...</source>
+        <translation type="unfinished">Error en obrir...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished">Error en obrir %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="138"/>
+        <source>Could not convert...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="139"/>
+        <source>The file contains overlays that can not be converted. This is because QMapShack does not support all overlay types of QLandkarte.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3281,37 +3562,37 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="308"/>
         <source>Migrating database from version 4 to 5.</source>
-        <translation>Convirtiendo base de datos de version 4 a 5.</translation>
+        <translation>S'està migrant la base de dades de la versió 4 a la 5.</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="362"/>
         <source>Migrating database from version 5 to 6.</source>
-        <translation>Convirtiendo base de datos de version 5 a 6.</translation>
+        <translation>S'està migrant la base de dades de la versió 5 a la 6.</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="420"/>
         <source>Migrating database from version 6 to 7.</source>
-        <translation>Convirtiendo base de datos de version 6 a 7.</translation>
+        <translation>S'està migrant la base de dades de la versió 6 a la 7.</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="486"/>
         <source>Migrating database from version 7 to 8.</source>
-        <translation>Convirtiendo base de datos de version 7 a 8.</translation>
+        <translation>S'està migrant la base de dades de la versió 7 a la 8.</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="515"/>
         <source>Migrating database from version 8 to 9.</source>
-        <translation>Convirtiendo base de datos de version 8 a 9.</translation>
+        <translation>S'està migrant la base de dades de la versió 8 a la 9.</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="538"/>
         <source>Open database: %1</source>
-        <translation>Abrir base de datos:%1</translation>
+        <translation>Obrir la base de dades: %1</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="547"/>
         <source>Folders:          %1</source>
-        <translation>Carpetas:          %1</translation>
+        <translation>Carpetes:          %1</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="556"/>
@@ -3321,77 +3602,77 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="564"/>
         <source>Routes:           %1 (Only the basic route will be copied)</source>
-        <translation>Rutas:           %1 (Sólo se copiará la ruta básica)</translation>
+        <translation>Itineraris: %1 (Sols es copiaran els itineraris bàsics)</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="572"/>
         <source>Waypoints:        %1</source>
-        <translation>Waypoints:        %1</translation>
+        <translation>Fites: %1</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="580"/>
         <source>Overlays:         %1 (areas will be converted as areas, distance lines will be converted to tracks, all other overlay items will be lost)</source>
-        <translation>Superposiciones:         %1 (las áreas se convertirán como áreas, las líneas de distancia se convertirán en tracks, todos los demás elementos de superposición se perderán</translation>
+        <translation>Superposicions: %1 (les àrees es convertiran a àrees, les línies de distància es convertiran a tracks, les altres superposicions es perdran)</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="587"/>
         <source>Diaries:          %1</source>
-        <translation>Diarios:          %1</translation>
+        <translation>Diaris: %1</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="594"/>
         <source>Map selections:   %1 (can't be converted to QMapShack)</source>
-        <translation>Selecciones de mapa:   %1 (NO pueden convertirse a QMapShack)</translation>
+        <translation>Selecció de Mapes:   %1 (no es pot convertir a QMapShack)</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="600"/>
         <source>------ Start to convert database to %1------</source>
-        <translation>------ Comenzar a convertir base de datos a %1------</translation>
+        <translation>------ Inicia la conversió de la base de dades a %1------</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="604"/>
         <source>Failed to create target database.</source>
-        <translation>Fallo al crear la base de datos de destino.</translation>
+        <translation>Ha fallat la creació de la base de dades destinació.</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="605"/>
         <source>------ Abort ------</source>
-        <translation>------ Cancelar ------</translation>
+        <translation>------ Interrompre ------</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="633"/>
         <source>------ Done ------</source>
-        <translation>------ Hecho ------</translation>
+        <translation>------ Fet ------</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="641"/>
         <source>Restore folders...</source>
-        <translation>Restaurar carpetas...</translation>
+        <translation>Restaura les carpetes...</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="661"/>
         <source>Imported %1 folders and %2 diaries</source>
-        <translation>Importadas %1 carpetas y %2 diarios</translation>
+        <translation>S'han importat %1 carpetes i %2 diaris</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="667"/>
         <source>Copy items...</source>
-        <translation>Copia elementos....</translation>
+        <translation>Copia elements...</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="685"/>
         <source>Imported %1 tracks, %2 waypoints, %3 routes, %4 areas</source>
-        <translation>Importado: %1 tracks, %2 waypoints, %3 routes, %4 areas</translation>
+        <translation>S'han importat %1 tracks, %2 fites, %3 rutes, %4 àrees</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="686"/>
         <source>Import folders...</source>
-        <translation>Importar carpetas...</translation>
+        <translation>Importar de carpetes...</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="751"/>
         <source>Overlay of type '%1' cant be converted</source>
-        <translation>No puede convertirse superposición del tipo '%1' </translation>
+        <translation>No es pot convertir una superposició de tipus '%1'</translation>
     </message>
 </context>
 <context>
@@ -3402,23 +3683,23 @@ no es una definición de sistema de coordenadas válido:
         <location filename="../qlgt/CQlgtTrack.cpp" line="265"/>
         <location filename="../qlgt/CQlgtTrack.cpp" line="291"/>
         <source>Corrupt track ...</source>
-        <translation>Track corrupto...</translation>
+        <translation>Track Corrupte...</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtTrack.cpp" line="164"/>
         <source>Number of trackpoints is not equal the number of training data trackpoints.</source>
-        <translation>El número de puntos del track no es igual al número de puntos de datos de entrenamiento.</translation>
+        <translation>El nombre de punts del track no és igual al nombre de punts del track amd dades d'entrenament.</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtTrack.cpp" line="218"/>
         <source>Number of trackpoints is not equal the number of extended data trackpoints.</source>
-        <translation>El número de puntos de track no es igual al número de datos extendidos</translation>
+        <translation>El nombre de punts del track no és igual al nombre de punts de track amb dades ampliades.</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtTrack.cpp" line="265"/>
         <location filename="../qlgt/CQlgtTrack.cpp" line="291"/>
         <source>Number of trackpoints is not equal the number of shadow data trackpoints.</source>
-        <translation>El número de puntos del track no es igual al número de datos extendidos ocultos.</translation>
+        <translation>El nombre de punts del track no és igual al nombre de punts del track amb dades complementaries.</translation>
     </message>
 </context>
 <context>
@@ -3426,22 +3707,22 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../qlgt/CQmsDb.cpp" line="47"/>
         <source>Existing file...</source>
-        <translation>Archivo existente...</translation>
+        <translation>Fitxer existent...</translation>
     </message>
     <message>
         <location filename="../qlgt/CQmsDb.cpp" line="47"/>
         <source>Remove existing %1?</source>
-        <translation>¿Eliminar los %1?</translation>
+        <translation>Suprimir %1 existents?</translation>
     </message>
     <message>
         <location filename="../qlgt/CQmsDb.cpp" line="52"/>
         <source>Remove existing file %1</source>
-        <translation>Eliminar el archivo %1</translation>
+        <translation>Suprimir el fitxer existent %1</translation>
     </message>
     <message>
         <location filename="../qlgt/CQmsDb.cpp" line="164"/>
         <source>%1: drop item with QLGT DB ID %2</source>
-        <translation>Descartar elemento %2 de la base de datos de QLandKarteGT</translation>
+        <translation>%1: deixa anar l'element amb QLGT DB ID %2</translation>
     </message>
 </context>
 <context>
@@ -3450,128 +3731,134 @@ no es una definición de sistema de coordenadas válido:
         <location filename="../gis/qms/CQmsProject.cpp" line="48"/>
         <location filename="../gis/qms/CQmsProject.cpp" line="80"/>
         <source>Failed to open...</source>
-        <translation>Fallo al abrir...</translation>
+        <translation>Error en obrir...</translation>
     </message>
     <message>
         <location filename="../gis/qms/CQmsProject.cpp" line="48"/>
         <location filename="../gis/qms/CQmsProject.cpp" line="80"/>
         <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
+        <translation>Error en obrir %1</translation>
     </message>
 </context>
 <context>
     <name>CRouterBRouter</name>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
         <source>original</source>
         <translation>original</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
         <source>first alternative</source>
-        <translation>Primera alternativa</translation>
+        <translation>primera alternativa</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
         <source>second alternative</source>
-        <translation>Segunda alternativa</translation>
+        <translation>segona alternativa</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="53"/>
         <source>third alternative</source>
-        <translation>Tercera alternativa</translation>
+        <translation>tercera alternativa</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="148"/>
         <source>BRouter (offline)</source>
-        <translation>BRouter (offline)</translation>
+        <translation>BRouter (desconnectat)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="155"/>
         <source>BRouter (online)</source>
-        <translation>BRouter (online)</translation>
+        <translation>BRouter (connectat)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="185"/>
         <source>profile: %1, alternative: %2</source>
         <translation>perfil: %1, alternativa: %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="283"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="408"/>
+        <source>BRouter does not support more then 1 nogo-area in this version, consider to upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="297"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="420"/>
         <source>response is empty</source>
-        <translation>La respuesta está vacía</translation>
+        <translation>resposta buida</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="334"/>
         <source>Bad response from server: %1</source>
-        <translation>Mala respuesta del servidor: %1</translation>
+        <translation>Resposta dolente del servidor: %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="386"/>
         <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
-        <translation><b>BRouter</b><br/>Solicitud de enrutamiento enviada al servidor. por favor espere...</translation>
+        <translation><b>BRouter</b><br/>La petició d'Itinerari s'ha enviat al servidor. Si us plau, espereu...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="270"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="389"/>
         <source>Calculate route with %1</source>
-        <translation>Calcular ruta con %1</translation>
+        <translation>Calcular l'itinerari amb %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="454"/>
         <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
-        <translation><b>BRouter</b><br/>Mala respuesta del servidor:<br/>%1</translation>
+        <translation><b>BRouter</b><br/>Resposta dolenta del servidor:<br/>%1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="444"/>
         <source><br/>Calculation time: %1s</source>
-        <translation>Tiempo empleado en el cálculo: %1s</translation>
+        <translation><br/>Calculant el temps: %1s</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="548"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="600"/>
         <source>running</source>
-        <translation>En marcha</translation>
+        <translation>correr</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="592"/>
         <source>starting</source>
-        <translation>comenzando</translation>
+        <translation>iniciant</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="554"/>
         <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local  [...]
-        <translation>QMapShack se comunica con BRouter a través de una conexión de red. Por lo general, esto se hace en una dirección especial que no se puede alcanzar desde fuera de su dispositivo. Sin embargo BRouter escucha las conexiones en todas las interfaces disponibles. Si usted está en su propia red privada con un cortafuegos activo, esto no es un gran problema. Si usted está en una red pública cada puerto abierto es un riesgo, ya que puede ser utilizado por otra persona para co [...]
+        <translation>QMapShack es comunica amb BRouter mitjançant una connexió de xarxa. De normal, això es fa mitjançant una adreça especial a la que no ets pots connectar des de fora del dispositiu. Tanmateix BRouter escolta les connexions de totes les interfícies disponibles. No hi ha cap problema si estàs connectat a una xarxa privada amb un tallafocs actiu. Si estàs connectat a una xarxa pública, cada un dels ports que tinguis oberts representa un risc que algú pot utilitzar per ata [...]
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="581"/>
         <source>Warning...</source>
-        <translation>Aviso...</translation>
+        <translation>Avís...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="586"/>
         <source>I understand the risk. Don't tell me again.</source>
-        <translation>Comprendo el riesgo. No avisar de nuevo</translation>
+        <translation>Entenc el risc. No m'ho diguis un altre cop.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="607"/>
         <source>stopped</source>
-        <translation>Parado</translation>
+        <translation>Aturat</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="618"/>
         <source>not installed</source>
-        <translation>No instalado</translation>
+        <translation>No instal·lat</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="629"/>
         <source>online</source>
-        <translation>online</translation>
+        <translation>En línia</translation>
     </message>
 </context>
 <context>
@@ -3579,22 +3866,22 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
         <source>%1 not accessible</source>
-        <translation>%1 no accessible</translation>
+        <translation>%1 no és accessible</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
         <source>%1 invalid result</source>
-        <translation>%1 resultado inválido</translation>
+        <translation>%1 resultat invàlid</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
         <source>Error parsing online-config:</source>
-        <translation>Error al analizar configuración online:</translation>
+        <translation>Error en analitzar la configuració en línia:</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="538"/>
         <source>Network error:</source>
-        <translation>Error de red</translation>
+        <translation>Error de xarxa:</translation>
     </message>
 </context>
 <context>
@@ -3602,164 +3889,164 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
         <source>Restore Default Values</source>
-        <translation>Restablecer valores por defecto</translation>
+        <translation>Restaura els Valors per Defecte</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
         <source>Open Directory</source>
-        <translation>Abrir carpeta</translation>
+        <translation>Obrir Directori</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
         <source>select Java Executable</source>
-        <translation>Seleccionar ejecutable Java</translation>
+        <translation>Selecciona l'Executable Java</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="414"/>
         <source>please select BRouter installation directory</source>
-        <translation>Seleccione carpeta de instalacion de BRouter</translation>
+        <translation>si us plau, selecciona el directori on instal·lar BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="419"/>
         <source>selected directory does not exist</source>
-        <translation>La carpeta seleccionada no existe</translation>
+        <translation>El directori seleccionat no existeix</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="420"/>
         <source>create directory and install BRouter there</source>
-        <translation>Cree una carpeta e instale BRouter allí</translation>
+        <translation>Crea un directori i hi instal·les BRrouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="427"/>
         <source>existing BRouter installation</source>
-        <translation>Instalacion de BRouter exixtente</translation>
+        <translation>BRouter ja està instal·lat</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="428"/>
         <source>update existing BRouter installation</source>
-        <translation>Actualizar instalación de BRouter</translation>
+        <translation>actualitzar la instal·lació existent de BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="433"/>
         <source>empty directory, create new BRouter installation here</source>
-        <translation>Carpeta vacia, instale BRouter aquí</translation>
+        <translation>el directori està buit, crea una nova instal·lació de BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
         <source>create new BRouter installation</source>
-        <translation>Crear nueva instalacion de BRouter</translation>
+        <translation>Crea una nova instal·lació de BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
         <source>seems to be a valid Java-executable</source>
-        <translation>Parece ser un ejecutable Java válido</translation>
+        <translation>sembla que el Java-executable és vàlid</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
         <source>doesn't seem to be a valid Java-executable</source>
-        <translation>no parece un ejecutable Java válido</translation>
+        <translation>no sembla que el Java-executable sigui vàlid</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
         <source>Java Executable not found</source>
-        <translation>Ejecutable Java no encontrado</translation>
+        <translation>No s'ha trobat l'Executable Java</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="496"/>
         <source>Error loading installation-page at %1</source>
-        <translation>Error al cargar la página de instalación en %1</translation>
+        <translation>Error en carregar la pàgina d'instal·lació a %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="505"/>
         <source>no brouter-version to install selected</source>
-        <translation>Ninguna versión de BRouter para instalar seleccionada</translation>
+        <translation>No s'ha seleccionat la versión per a instal·lar de brouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="513"/>
         <source>selected %1 for download and installation</source>
-        <translation>Seleccione %1 para descargar e instalar</translation>
+        <translation>%1 seleccionats per a baixar I instal·lar</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
         <source>Warning...</source>
-        <translation>Aviso...</translation>
+        <translation>Avís...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
         <source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
-        <translation>Descarga:%1<br/><br/> Esto descargará e instalará un archivo zip desde una ubicación de descarga que no está protegida por ningún estándar, usando HTTP normal. Normalmente esto debe ser HTTPS. El riesgo es que alguien redireccione la solicitud y le envíe un código postal de reemplazo con malware. No es posible que QMapShack lo detecte. <br/> Si no entiende esto o si tiene alguna duda, no proceda y cancele. Utilice la versión web de BRouter en su lug [...]
+        <translation>Baixada: %1<br/><br/>Es baixarà I s'instal·lara un fitxer zip des d'un servidor de baixades quen no compleix cap dels standards de seguretat normalment acceptats, utilitza HTTP en text pla. De normal s'hauria d'utilitzar HTTPS. Correu el risc que algú redireccioni la petició i baixeu un fitter zip amb codi maliciós. QMapShack no pot detectar-ho. <br/>Si no enteneu l'explicació o teniu algum dubte, no seguiu I cancel·leu la o [...]
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
         <source>I understand the risk and wish to proceed.</source>
-        <translation>Entiendo el riesgo, continuar.</translation>
+        <translation>Entenc el risc i vull continuar.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
         <source>download %1 started</source>
-        <translation>Iniciada descarga %1 </translation>
+        <translation>iniciada la baixada %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
         <source>Network Error: %1</source>
-        <translation>Error de red: %1</translation>
+        <translation>Error de xarxa: %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
         <source>download %1 finished</source>
-        <translation>Finalizada descarga %1</translation>
+        <translation>finalitzada la baixada %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
         <source>unzipping:</source>
-        <translation>Descomprimiendo:</translation>
+        <translation>descomprimint:</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
         <source>ready.</source>
-        <translation>Preparado</translation>
+        <translation>preparat.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="613"/>
         <source>download of brouter failed: %1</source>
-        <translation>Descarga de BRouter fallida: %1</translation>
+        <translation>error en la baixada de brouter: %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="623"/>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="630"/>
         <source>retrieving available profiles from %1</source>
-        <translation>Recuperar los perfiles disponibles de %1</translation>
+        <translation>Recuperant desde %1 els perfils disponibles</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="654"/>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="736"/>
         <source>content of profile</source>
-        <translation>Contenido del perfil</translation>
+        <translation>contingut del perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
         <source>Error:</source>
-        <translation></translation>
+        <translation>Error:</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
         <source>Error creating directory %1</source>
-        <translation>Error creando la carpeta %1</translation>
+        <translation>S'ha produït un error en crear el directori %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="571"/>
         <source>Error directory %1 does not exist</source>
-        <translation>Error: La carpeta %1 no existe</translation>
+        <translation>Error el directori %1 no existeix</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="578"/>
         <source>Error creating file %1</source>
-        <translation>Error creando archivo %1</translation>
+        <translation>S'ha produït un error en crear el fitxer %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="582"/>
         <source>Error writing to file %1</source>
-        <translation>Error escribiendo el archivo %1</translation>
+        <translation>S'ha produït un error en escriure al fitxer %1</translation>
     </message>
 </context>
 <context>
@@ -3767,7 +4054,7 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
         <source>Continue with Setup</source>
-        <translation>Continuar con la configuración</translation>
+        <translation>Continuar amb la Configuració</translation>
     </message>
 </context>
 <context>
@@ -3775,125 +4062,125 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
         <source>available routing-data is being determined.</source>
-        <translation>Se están determinando los datos de enrutamiento disponibles.</translation>
+        <translation>S'està determinant els itineraris disponibles.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="108"/>
         <source>Select outdated</source>
-        <translation>Selección caducada</translation>
+        <translation>Selecciona obsolets</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
         <source>Clear Selection</source>
-        <translation>Borrar selección</translation>
+        <translation>Elimina la Selecció</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
         <source>Delete selection</source>
-        <translation>Borrar Selección</translation>
+        <translation>Suprimeix selecció</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
         <source>Download</source>
-        <translation>Descargar</translation>
+        <translation>Baixada</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
+        <source>Error removing %1: %2</source>
+        <translation>S'ha produït un error en suprimir %1: %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="281"/>
         <source>Error creating segments directory %1</source>
-        <translation>Error al crear la carpeta de segmentos</translation>
+        <translation>Error en la creació de segments en el directori %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="694"/>
+        <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
+        <translation>actualitzat: %1 (%2), obsolets: %3 (%4), per a baixar: %5 (%6)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
+        <source>being downloaded: %1 of %2</source>
+        <translation>s'està baixant: %1 of %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
+        <source>no local data, online available: %1 (%2)</source>
+        <translation>no hi ha dades locals, disponibles en línia: %1 (%2)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="798"/>
+        <source>local data outdated (%1, %2 - remote %3, %4)</source>
+        <translation>les dades locals estan obsoletes (%1, %2 - remotes %3, %4)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
+        <source>Network Error</source>
+        <translation>Error de xarxa</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
+        <source>invalid result, no files found</source>
+        <translation>Resultat invàlid, no s'han trobat fitxers</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="365"/>
         <source>cannot parse: %1 is not a date</source>
-        <translation>No se puede analizar: %1 no es una fecha</translation>
+        <translation>no es pot analitzar: %1 no es una data</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="390"/>
         <source>cannot parse: %1 is not a valid size</source>
-        <translation>No se puede analizar: %1 No es un tamaño válido</translation>
+        <translation>no es pot analitzar: %1 la mida no és vàlida</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="409"/>
         <source>Error retrieving available routing data from %1: %2</source>
-        <translation>Error al recuperar los datos de enrutamiento disponibles de %1: %2</translation>
+        <translation>Error en la recuperació de les dades d'enrutament disponibles a %1: %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="490"/>
         <source>segments directory does not exist: </source>
-        <translation>Carpeta de segmentos no existe:</translation>
+        <translation>el directori de segments no existeix:</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="504"/>
         <source>error creating file %1: %2</source>
-        <translation>Error creando archivo %1: %2</translation>
+        <translation>Error en la creació del fitxer %1: %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="536"/>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="576"/>
         <source>no valid request for filename %1</source>
-        <translation>%1 : Solicitud no válida de nombre de archivo</translation>
+        <translation>la sol·licitud amb aquest nom de fitxer no és vàlida %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="541"/>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="584"/>
         <source>no open file assigned to request for %1</source>
-        <translation>Ningún archivo abierto asignado a la solicitud de %1</translation>
+        <translation>no hi ha cap fitxer obert per aquesta sol·licitud %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="551"/>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="594"/>
         <source>error writing to file %1: %2</source>
-        <translation>Error al escribir el archivo %1: %2</translation>
+        <translation>Error en escriure al fitxer %1: %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="620"/>
         <source>error renaming file %1 to %2: %3</source>
-        <translation>Error renombrando archivo %1 a %2: %3</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="694"/>
-        <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
-        <translation>actualizado: %1 (%2), obsoleto: %3 (%4), Para descargar: %5 (%6)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
-        <source>being downloaded: %1 of %2</source>
-        <translation>Descargando: %1 of %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
-        <source>no local data, online available: %1 (%2)</source>
-        <translation>Sin datos locales, disponible online: %1 (%2)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="798"/>
-        <source>local data outdated (%1, %2 - remote %3, %4)</source>
-        <translation>Datos locales obsoletos (%1, %2 - remoto%3, %4)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
-        <source>Error removing %1: %2</source>
-        <translation>Error eliminando %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
-        <source>Network Error</source>
-        <translation>Error de red</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
-        <source>invalid result, no files found</source>
-        <translation>Resultado no válido, no se encuentran archivos</translation>
+        <translation>Error en canviar el nom del fitxer %1 a %2: %3</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="806"/>
         <source>local data up to date (%1, %2)</source>
-        <translation>Datos locales actualizados (%1, %2)</translation>
+        <translation>dades locals actualitzades (%1, %2)</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="818"/>
         <source>no routing-data available</source>
-        <translation>Datos de ruteo no disponibles</translation>
+        <translation>No hi ha itineraris disponibles</translation>
     </message>
 </context>
 <context>
@@ -3902,13 +4189,15 @@ no es una definición de sistema de coordenadas válido:
         <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
         <source>!!! done !!!
 </source>
-        <translation>¡¡¡Hecho!!!</translation>
+        <translation>!!! fet !!!
+</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
         <source>!!! failed !!!
 </source>
-        <translation>!!! fallo !!!</translation>
+        <translation>!!! ha fallat !!!
+</translation>
     </message>
 </context>
 <context>
@@ -3916,12 +4205,12 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
         <source>Fastest</source>
-        <translation>Más rapido</translation>
+        <translation>Més ràpid</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="38"/>
         <source>Shortest</source>
-        <translation>Más corto</translation>
+        <translation>Més curt</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="39"/>
@@ -3931,17 +4220,17 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="40"/>
         <source>Pedestrian</source>
-        <translation>Peatón</translation>
+        <translation>Vianant</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="42"/>
         <source>US English</source>
-        <translation>Inglés USA</translation>
+        <translation>Anglés US</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="43"/>
         <source>British English</source>
-        <translation>Inglés UK</translation>
+        <translation>Angles Britànic</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="44"/>
@@ -3961,96 +4250,116 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="47"/>
         <source>German</source>
-        <translation>Alemán</translation>
+        <translation>Alemany</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="48"/>
         <source>Italian</source>
-        <translation>Italiano</translation>
+        <translation>Italià</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="49"/>
         <source>Norwegian</source>
-        <translation>Noruego</translation>
+        <translation>Noruec</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="50"/>
         <source>Spanish</source>
-        <translation>Español</translation>
+        <translation>Espanyol</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="51"/>
         <source>Swedish</source>
-        <translation>Sueco</translation>
+        <translation>Suec</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="110"/>
         <source>mode "%1"</source>
-        <translation>modo "%1"</translation>
+        <translation>mode "%1"</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="114"/>
         <source>no highways</source>
-        <translation>Evitar autopistas</translation>
+        <translation>evitar autopistes</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="125"/>
         <source>no toll roads</source>
-        <translation>Evitar peajes</translation>
+        <translation>evitar carreteres de peatge</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="136"/>
         <source>no seasonal</source>
-        <translation>Evitar estacionales</translation>
+        <translation>no estacional</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="147"/>
         <source>no unpaved</source>
-        <translation>Evitar no pavimentadas</translation>
+        <translation>evitar carreteres sense asfaltar</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="158"/>
         <source>no ferry</source>
-        <translation>Evitar Ferrys</translation>
+        <translation>no hi ha ferry</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="169"/>
         <source>no crossing of country borders</source>
-        <translation>No cruzar fronteras</translation>
+        <translation>no creuar fronteres de països</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="301"/>
         <source><b>MapQuest</b><br/>Routing request sent to server. Please wait...</source>
-        <translation><b>MapQuest</b><br/>Solicitud de ruta enviada al servidor. Por favor,espere...</translation>
+        <translation><b>MapQuest</b><br/>La petició d'Itinerari s'ha enviat al servidor. Si us plau, espereu...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="312"/>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="346"/>
         <source><b>MapQuest</b><br/>Bad response from server:<br/>%1</source>
-        <translation><b>MapQuest</b><br/>Mala respuesta del servidor:<br/>%1</translation>
+        <translation><b>MapQuest</b><br/>Resposta dolente del servidor:<br/>%1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="363"/>
         <source><br/>Calculation time: %1s</source>
-        <translation>Tiempo calculando: %1s</translation>
+        <translation><br/>Calculant el temps: %1s</translation>
     </message>
 </context>
 <context>
     <name>CRouterRoutino</name>
     <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
+        <source>Warning...</source>
+        <translation>Avís...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
+        <source>Found Routino with a wrong version. Expected %1 found %2</source>
+        <translation>S'ha trobat una versió incorrecte de Routino. S'esperava %1 s'ha trobat %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="59"/>
+        <source>Shortest</source>
+        <translation>Més curt</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="60"/>
+        <source>Quickest</source>
+        <translation>Més ràpid</translation>
+    </message>
+    <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="78"/>
         <source>Foot</source>
-        <translation>A pie</translation>
+        <translation>Peu</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="79"/>
         <source>Horse</source>
-        <translation>A caballo</translation>
+        <translation>Cavall</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="80"/>
         <source>Wheelchair</source>
-        <translation>Silla de ruedas</translation>
+        <translation>Cadira de rodes</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="81"/>
@@ -4070,157 +4379,147 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="84"/>
         <source>Motorcar</source>
-        <translation>Automóvil</translation>
+        <translation>Cotxe amb motor</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="85"/>
         <source>Goods</source>
-        <translation>Mercancias</translation>
+        <translation>Béns</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="59"/>
-        <source>Shortest</source>
-        <translation>El más corto</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
-        <source>Found Routino with a wrong version. Expected %1 found %2</source>
-        <translation>Routino se encuentra en una versión incorrecta. Esperado %1 encontrado %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="60"/>
-        <source>Quickest</source>
-        <translation>El más rápido</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="87"/>
-        <source>English</source>
-        <translation>Inglés</translation>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="87"/>
+        <source>English</source>
+        <translation>Anglès</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="88"/>
         <source>German</source>
-        <translation>Alemán</translation>
+        <translation>Alemany</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="89"/>
         <source>French</source>
-        <translation>Francés</translation>
+        <translation>Francès</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="90"/>
         <source>Hungarian</source>
-        <translation>Húngaro</translation>
+        <translation>Hongarès</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="91"/>
         <source>Dutch</source>
-        <translation>Holandés</translation>
+        <translation>Holandes</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="92"/>
         <source>Russian</source>
-        <translation>Ruso</translation>
+        <translation>Rus</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="93"/>
         <source>Polish</source>
-        <translation>Polaco</translation>
+        <translation>Polac</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="128"/>
         <source>A function was called without the database variable set.</source>
-        <translation>Se llamó una función sin la variable de base de datos establecida.</translation>
+        <translation>S'ha fet una crida a una funció sense estar activat l'entorn de variables de la base de dades.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="131"/>
         <source>A function was called without the profile variable set.</source>
-        <translation>Se llamó una función sin la variable de perfil establecida.</translation>
+        <translation>S'ha cridat a una funció sense establir les variables del perfil.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="134"/>
         <source>A function was called without the translation variable set.</source>
-        <translation>Se llamó una función sin el conjunto de variables de traducción</translation>
+        <translation>S'ha cridat a una funció sense establir les variables de la traducció.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="137"/>
         <source>The specified database to load did not exist.</source>
-        <translation>La base de datos especificada no existe</translation>
+        <translation>La base de dades especificada per carregar no existeix.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="140"/>
         <source>The specified database could not be loaded.</source>
-        <translation>No se pudo cargar la base de datos especificada</translation>
+        <translation>La base de dades especificada no es pot carregar.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="143"/>
         <source>The specified profiles XML file did not exist.</source>
-        <translation>El archivo XML de perfiles no existe</translation>
+        <translation>El perfil XML especificat no existeix.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="146"/>
         <source>The specified profiles XML file could not be loaded.</source>
-        <translation>El archivo XML de perfiles especificado no está cargado</translation>
+        <translation>El perfil XML especificat no es pot carregar.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="149"/>
         <source>The specified translations XML file did not exist.</source>
-        <translation>El archivo XML de traducción especificado no existe</translation>
+        <translation>El fitxer de traducció XML especificat no existeix.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="152"/>
         <source>The specified translations XML file could not be loaded.</source>
-        <translation>El archivo XML de traducción especificado no está cargado</translation>
+        <translation>El fitxer de traducció XML especificat no es pot carregar.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="155"/>
         <source>The requested profile name does not exist in the loaded XML file.</source>
-        <translation>El nombre del perfil solicitado no existe en el archivo XML cargado</translation>
+        <translation>El nom de perfil sol·licitat no existeix en el fitxer XML carregat.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="158"/>
         <source>The requested translation language does not exist in the loaded XML file.</source>
-        <translation>El idioma solicitado no existe en el archivo XML cargado</translation>
+        <translation>En el fitxer XML carregat no existeix la traducció a aquest idioma.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="161"/>
+        <source>In the routing database there is no highway near the coordinates to place a waypoint.</source>
+        <translation>A la base de dades de rutes no existeix cap autopista propera a les coordenades per a posar-hi una fita.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="164"/>
         <source>The profile and database do not work together.</source>
-        <translation>El perfil y la base de datos no funcionan juntos</translation>
+        <translation>El perfil i la base de dades no són compatibles.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="167"/>
         <source>The profile being used has not been validated.</source>
-        <translation>El perfil que se utiliza no ha sido validado</translation>
+        <translation>El perfil utilitzat no ha estat validat.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="170"/>
         <source>The user specified profile contained invalid data.</source>
-        <translation>El perfil especificado por el usuario contenía datos no válidos</translation>
+        <translation>El perfil d'usuari especificat conté dades invàlides.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="173"/>
         <source>The routing options specified are not consistent with each other.</source>
-        <translation>Las opciones de enrutamiento especificadas no son coherentes entre sí</translation>
+        <translation>Les opciones especificades en l'itinerary no son coherentes entre si.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="176"/>
         <source>There is a mismatch between the library and caller API version.</source>
-        <translation>Hay un desajuste entre la biblioteca y la versión de la API del llamante</translation>
+        <translation>No hi ha coincidència entre la llibreria i la versió de crida a la API.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="179"/>
         <source>Route calculation was aborted by user.</source>
-        <translation>El cálculo de la ruta ha sido cancelado por el usuario</translation>
+        <translation>L'usuari ha interromput el càlcul de la ruta.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="185"/>
         <source>A route could not be found to waypoint %1.</source>
-        <translation>No se pudo encontrar una ruta al waypoint %1</translation>
+        <translation>No s'ha trobat cap ruta cap a la fita %1.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="188"/>
         <source>Unknown error: %1</source>
-        <translation>Error desconocido: %1</translation>
+        <translation>Error desconegut %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="200"/>
@@ -4230,28 +4529,18 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="201"/>
         <source>, mode "%1"</source>
-        <translation>, modo "%1"</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
-        <source>Warning...</source>
-        <translation>Aviso...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="161"/>
-        <source>In the routing database there is no highway near the coordinates to place a waypoint.</source>
-        <translation>En la base de datos de enrutamiento no hay ninguna carretera cerca de las coordenadas para colocar un waypoint.</translation>
+        <translation>, mode "%1"</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="415"/>
         <source>Calculate route with %1</source>
-        <translation>Calcular ruta con %1</translation>
+        <translation>Calcular l'itinerari amb %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="340"/>
         <source><br/>Calculation time: %1s</source>
-        <translation><br/>Tiempo de cálculo: %1s</translation>
+        <translation><br/>Calculant el temps: %1s</translation>
     </message>
 </context>
 <context>
@@ -4259,12 +4548,12 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="40"/>
         <source>Add or remove paths containing Routino data. There can be multiple databases in a path but no sub-path is parsed.</source>
-        <translation>Agregar o quitar carpetas que contienen datos de Routino. Puede haber varias bases de datos en una carpeta, pero no se analiza ninguna subcarpeta.</translation>
+        <translation>Afegir o suprimir camins a dades Routino. Pot haver-hi diverses bases de dades en un camí, però els camins secundaris no s'analitzaran.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="55"/>
         <source>Select routing data file path...</source>
-        <translation>Seleccione la carpeta del archivo de datos de enrutamiento</translation>
+        <translation>Selecciona el camí dels fitxers amb dades d'itineraris...</translation>
     </message>
 </context>
 <context>
@@ -4272,17 +4561,17 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/rte/router/CRouterSetup.cpp" line="38"/>
         <source>Routino (offline)</source>
-        <translation>Routino (offline)</translation>
+        <translation>Routino (desconnectat)</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterSetup.cpp" line="39"/>
         <source>MapQuest (online)</source>
-        <translation>MapQuest (online)</translation>
+        <translation>MapQuest (en línia)</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
         <source>BRouter (online)</source>
-        <translation>BRouter (online)</translation>
+        <translation>BRouter (en línia)</translation>
     </message>
 </context>
 <context>
@@ -4290,23 +4579,24 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="33"/>
         <source>Create Routino Database</source>
-        <translation>Crear base de datos de Routino</translation>
+        <translation>Crea una Base de Dades Routino</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="58"/>
         <source>Select files...</source>
-        <translation>Seleccionar ficheros de origen...</translation>
+        <translation>Selecciona fitxers...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="82"/>
         <source>Select target path...</source>
-        <translation>Seleccionar carpeta de destino...</translation>
+        <translation>Selecciona el camí destí...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="143"/>
         <source>!!! done !!!
 </source>
-        <translation>¡¡¡Hecho!!!</translation>
+        <translation>!!! fet !!!
+</translation>
     </message>
 </context>
 <context>
@@ -4314,7 +4604,7 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../mouse/CScrOptRangeTrk.cpp" line="38"/>
         <source>No range selected</source>
-        <translation>No hay rango seleccionado</translation>
+        <translation>No s'ha seleccionat cap interval</translation>
     </message>
 </context>
 <context>
@@ -4322,52 +4612,52 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="93"/>
         <source><b>Exact Mode</b><br/>All selected items have to be completely inside the selected area.<br/></source>
-        <translation><b>Modo exacto</b><br/>Todos los elementos seleccionados estan completamente dentro del área.<br/></translation>
+        <translation><b>Mode exacte</b><br/>Tots els elements han d'estar del tot dins de l'àrea seleccionada.<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="97"/>
         <source><b>Intersecting Mode</b><br/>All selected items have to be inside or at least intersect the selected area.<br/></source>
-        <translation>Modo de intersección</b><br/>Todos los elementos seleccionados deben estar dentro o al menos intersecar el área seleccionada.<br/></translation>
+        <translation><b>Mode d'intersecció</b><br/>Tots els elements han d'estar dins o com a mínim han d'interseccionar amb l'àrea seleccionada.<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="101"/>
         <source><b>Add Tracks</b><br/>Add tracks to list of selected items<br/></source>
-        <translation><b>Agregar tracks</b><br/>Agregar tracks a la lista de elementos seleccionados<br/></translation>
+        <translation><b>Afegir Tracks</b><br/>Afegir tracks a la llista d'elements seleccionats<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="105"/>
         <source><b>Add Waypoints</b><br/>Add waypoints to list of selected items<br/></source>
-        <translation><b>Agregar waypoints</b><br/>Agregar waypoints a la lista de elementos seleccionados<br/></translation>
+        <translation><b>Afegir Fites</b><br/>Afegir fites a la llista d'elements seleccionats<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="109"/>
         <source><b>Add Routes</b><br/>Add routes to list of selected items<br/></source>
-        <translation><b>Agregar rutas</b><br/>Agregar rutas a la lista de elementos seleccionados <br/></translation>
+        <translation><b>Afegir Itineraris</b><br/>Afegir itineraris a la llista d'elements seleccionats<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="113"/>
         <source><b>Add Areas</b><br/>Add areas to list of selected items<br/></source>
-        <translation><b>Agregar áreas</b><br/>Agregar áreas a la lista de elementos seleccionados<br/></translation>
+        <translation><b>Afegir Àrees</b><br/>Afegir les àrees en la lista d'elements seleccionats<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="124"/>
         <source><b>Ignore Tracks</b><br/>Ignore tracks in list of selected items<br/></source>
-        <translation><b>Ignorar tracks</b><br/>Ignorar tracks de la lista de elementos seleccionados<br/></translation>
+        <translation><b>Ignora Tracks</b><br/>Ignora tracks de la llista d'elements seleccionats<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="128"/>
         <source><b>Ignore Waypoints</b><br/>Ignore waypoints in list of selected items<br/></source>
-        <translation><b>Ignorar Waypoints</b><br/>Ignorar waypoints de la lista de elementos seleccionados<br/></translation>
+        <translation><b>Ignora Fites</b><br/>Ignora fites a la llista d'elements seleccionats<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="132"/>
         <source><b>Ignore Routes</b><br/>Ignore routes in list of selected items<br/></source>
-        <translation><b>Ignorar rutas</b><br/>Ignorar rutas en la lista de elementos seleccionados<br/></translation>
+        <translation><b>Ignora Itineraris</b><br/>Ignora itineraris de la llista d'elements seleccionats<br/></translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="136"/>
         <source><b>Ignore Areas</b><br/>Ignore areas in list of selected items<br/></source>
-        <translation>Ignorar áreas</b><br/>Ignorar áreas de la lista de elementos seleccionados<br/></translation>
+        <translation><b>Ignorar les Àrees</b><br/>Ignorar les àrees en la lista d'elements seleccionats<br/></translation>
     </message>
 </context>
 <context>
@@ -4375,7 +4665,7 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/db/CSearchDatabase.cpp" line="38"/>
         <source>Search database '%1':</source>
-        <translation>Buscar base de datos '%1':</translation>
+        <translation>Cercant la base de dades '%1':</translation>
     </message>
 </context>
 <context>
@@ -4383,7 +4673,7 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/search/CSearchGoogle.cpp" line="118"/>
         <source>Unknown response</source>
-        <translation>Respuesta desconocida</translation>
+        <translation>Resposta desconeguda</translation>
     </message>
     <message>
         <location filename="../gis/search/CSearchGoogle.cpp" line="128"/>
@@ -4396,12 +4686,12 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/db/CSetupDatabase.cpp" line="47"/>
         <source>Missing Requirement</source>
-        <translation>Falta un requisito</translation>
+        <translation>Manca Requeriment</translation>
     </message>
     <message>
         <location filename="../gis/db/CSetupDatabase.cpp" line="48"/>
         <source>MySQL cannot be used at this point, because the corresponding driver (QMYSQL) is not available.<br />Please make sure you have installed the corresponding package.<br />If you don't know what to do now you should have <a href="%1">a look at the wiki</a>.</source>
-        <translation>SQL no se puede utilizar en este momento, ya que el controlador correspondiente (QMYSQL) no está disponible.<br />Asegúrese de haber instalado el paquete correspondiente.<br />Si usted no sabe qué hacer ahora debe <a href="%1">consultar la wiki</a>.</translation>
+        <translation>No es pot utilitzar MySQL ja que el controlador (QMYSQL) no està disponible.<br />Assegureu-vos d'haver instal·lat els paquets necessaris.<br />Si en aquest moment no sabeu que fer <a href="%1">podeu donar un cop d'ull a la wiki</a>.</translation>
     </message>
     <message>
         <location filename="../gis/db/CSetupDatabase.cpp" line="102"/>
@@ -4411,17 +4701,17 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/db/CSetupDatabase.cpp" line="102"/>
         <source>There is already a database with name '%1'</source>
-        <translation>Ya existe una base de datos con el nombre '%1'</translation>
+        <translation>Ja existeix una base de dades amb nom '%1'</translation>
     </message>
     <message>
         <location filename="../gis/db/CSetupDatabase.cpp" line="115"/>
         <source>New database...</source>
-        <translation>Nueva base de datos...</translation>
+        <translation>Nova base de dades...</translation>
     </message>
     <message>
         <location filename="../gis/db/CSetupDatabase.cpp" line="140"/>
         <source>Open database...</source>
-        <translation>Abrir base de datos...</translation>
+        <translation>Obrir base de dades...</translation>
     </message>
 </context>
 <context>
@@ -4429,12 +4719,12 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/db/CSetupWorkspace.cpp" line="55"/>
         <source>Setup database...</source>
-        <translation>Configurar la base de datos...</translation>
+        <translation>Configura la base de dades...</translation>
     </message>
     <message>
         <location filename="../gis/db/CSetupWorkspace.cpp" line="55"/>
         <source>Changes will become active after an application's restart.</source>
-        <translation>Los cambios surtirán efecto tras reiniciar la aplicación.</translation>
+        <translation>Els canvis s'activaran després del reinici d'una aplicació.</translation>
     </message>
 </context>
 <context>
@@ -4442,7 +4732,7 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/slf/CSlfProject.cpp" line="42"/>
         <source>Failed to load file %1...</source>
-        <translation>Fallo al cargar el archivo %1...</translation>
+        <translation>Error en carregar el fitxer %1...</translation>
     </message>
 </context>
 <context>
@@ -4450,46 +4740,113 @@ no es una definición de sistema de coordenadas válido:
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="63"/>
         <source>Failed to parse timestamp `%1`</source>
-        <translation>Error al analizar la marca de tiempo %1</translation>
+        <translation>Ha fallat l'anàlisi de la marca horària `%1`</translation>
     </message>
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="76"/>
         <source>%1 does not exist</source>
-        <translation>%1 no existe</translation>
+        <translation>%1 no existeix</translation>
     </message>
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="81"/>
         <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
+        <translation>Error en obrir %1</translation>
     </message>
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="92"/>
         <source>Failed to read: %1
 line %2, column %3:
  %4</source>
-        <translation>Fallo al leer: %1
-línea %2, columna %3.
+        <translation>Error en llegir %1
+línia %2, columna %3:
  %4</translation>
     </message>
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="99"/>
         <source>Not a SLF file: %1</source>
-        <translation>%1 no es un archivo SLF</translation>
+        <translation>No és un fitxer SLF: %1</translation>
     </message>
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="106"/>
         <source>Unsupported revision %1: %2</source>
-        <translation>Revisión no admitida %1: %2</translation>
+        <translation>Revisió incompatible %1: %2</translation>
     </message>
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="181"/>
         <source>Break %1</source>
-        <translation>Pausa %1</translation>
+        <translation>Divisió %1</translation>
     </message>
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
         <source>Lap %1</source>
-        <translation>Vuelta %1</translation>
+        <translation>Volta %1</translation>
+    </message>
+</context>
+<context>
+    <name>CSmlProject</name>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="63"/>
+        <source>Failed to load file %1...</source>
+        <translation>Error en carregar el fitxer %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="85"/>
+        <source>Failed to open %1</source>
+        <translation>Error en obrir %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="96"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Error en llegir %1
+línia %2, columna %3:
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="103"/>
+        <source>Not an sml file: %1</source>
+        <translation>No és un fitxer sml: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="129"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation>Temps de recuperació: %1 h<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="134"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation>Efecte de la Sessió d'Entrenament: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="139"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation>Energia: %1 kCal<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="160"/>
+        <source>Device: %1<br/></source>
+        <translation>Dispositiu: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="148"/>
+        <source>Battery usage: %1 %/hour</source>
+        <translation>Ús de la bateria: %1 %/hores</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="195"/>
+        <source>Use of local time...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="196"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="245"/>
+        <source>This SML file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation>Aquest fitxer SML no conté cap dada i QMapShack no el pot visualitzar: %1</translation>
     </message>
 </context>
 <context>
@@ -4497,7 +4854,7 @@ línea %2, columna %3.
     <message>
         <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
         <source>Double click to edit elevation value</source>
-        <translation>Doble clic para editar datos de altitud</translation>
+        <translation>Doble clic per editar el valor de l'elevació</translation>
     </message>
     <message>
         <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
@@ -4506,8 +4863,8 @@ línea %2, columna %3.
         <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
-        <source>%1 %2</source>
-        <translation type="unfinished"></translation>
+        <source>%1%2</source>
+        <translation>%1%2</translation>
     </message>
 </context>
 <context>
@@ -4515,97 +4872,97 @@ línea %2, columna %3.
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
         <source>Failed to load file %1...</source>
-        <translation>Fallo al cargar el archivo %1...</translation>
+        <translation>Error en carregar el fitxer %1...</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="73"/>
         <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
+        <translation>Error en obrir %1</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="84"/>
         <source>Failed to read: %1
 line %2, column %3:
  %4</source>
-        <translation>Fallo al leer: %1
-línea %2, columna %3.
+        <translation>Error en llegir %1
+línia %2, columna %3:
  %4</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="91"/>
         <source>Not a TCX file: %1</source>
-        <translation>%1 no es un archivo TCX</translation>
+        <translation>No és un fitxer TCX: %1</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="101"/>
         <source>This TCX file contains at least 1 workout, but neither an activity nor a course. As workouts do not contain position data, they can not be imported to QMapShack.</source>
-        <translation>Este archivo TCX contiene al menos un entrenamiento, pero ninguna actividad ni carrera. Como los entrenamientos no contienen datos de posición, no se pueden importar a QMapShack</translation>
+        <translation>Aquest fitxer TCX conté almenys 1 exercici, però cap activitat o camí. Els exercicis que no tenen dades de posició, no es poden importar a QMapShack.</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="106"/>
         <source>This TCX file does not contain any activity or course: %1</source>
-        <translation>El archivo TCX %1 no contiene ninguna actividad ni carrera</translation>
+        <translation>Aquest fitxer TCX no conté cap activitat ni cap camí: %1</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="275"/>
         <source>File exists ...</source>
-        <translation>El archivo ya existe ...</translation>
+        <translation>El fitxer ja existeix ...</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="276"/>
         <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
-        <translation>El archivo existe y no ha sido creado por QMapShack. Si pulsa 'yes' Se perderán todos los datos de este archivo. Incluso si este archivo contiene datos y ha sido cargado por QMapShack, QMapShack puede no ser capaz de cargar y almacenar todos los elementos de este archivo. Estos elementos se perderán. Se recomienda usar otro archivo. <b>¿Realmente desea sobrescribir el archivo?</b></translation>
+        <translation>Aquest fitxer ja existeix i no s'ha creat a QMapShack. Si premeu 'si' es perdrà tota la informació d'aquest fitxer. Fins i tot si aquest fitxer té informació i s'ha carregat a QMapShack, QMapShack no pot carregar i emmagatzemar tota la informació existent en aquest fitxer. La informació es perdrà. Recomano utilitzar un altre fitxer. Segur que voleu sobreescriure el fitxer?</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="315"/>
         <source>The track <b>%1</b> you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. <b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b></source>
-        <translation>El track <b>%1</b> Que ha seleccionado contiene puntos y marcas de tiempo no válidas. Es posible que el dispositivo no acepte el archivo de curso TCX generado si se deja como está <b>¿Desea aplicar un filtro con velocidad constante (10 m / s) y continuar?</b></translation>
+        <translation>El track <b>%1</b> que heu seleccionat conté punts de track amb marques horàries invàlides. Pot ser que el dispositiu no accepti el fitxer de camí TCX que s'ha generat si ho deixeu així. <b>Voleu aplicar un filtre amb velocitat constant de (10 m/s) i continuar?</b></translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
         <source>Course</source>
-        <translation>Carrera</translation>
+        <translation>Camí</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
         <source>Activity</source>
-        <translation>Actividad</translation>
+        <translation>Activitat</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation>Cancel·la</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
         <source>Track with invalid timestamps...</source>
-        <translation>Track con marcas de tiempo inválidas.</translation>
+        <translation>Track amb marques horàries invàlides...</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="334"/>
         <source>Activity or course?</source>
-        <translation>¿Actividad o carrera?</translation>
+        <translation>Activitat o camí?</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
         <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
-        <translation>QMapShack no sabe cómo <b>%1</b> Debe ser guardado. <b>¿Desea guardarlo como carrera o como actividad? </b>Recuerde que sólo se guardarán waypoints lo suficientemente cerca del track al guardar como carrera. Los waypoints no se guardarán al guardar como actividad.</translation>
+        <translation>QMapShack no sap en quin format vols desar el track <b>%1</b> . <b>El vols desar com a camí o com a activitat ? </b>Si el deseu com a camí, sols es desaran les fites molt properes al track. Si el deseu com a activitat les fites no es desaran.</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
         <source>Failed to create file '%1'</source>
-        <translation>Fallo al crear el archivo '%1'</translation>
+        <translation>Ha fallat la creació del fitxer '%1'</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
         <source>Failed to write file '%1'</source>
-        <translation>Fallo al escribir en el archivo '%1'</translation>
+        <translation>Error en escriure al fitxer '%1'</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="435"/>
         <location filename="../gis/tcx/CTcxProject.cpp" line="454"/>
         <source>Saving GIS data failed...</source>
-        <translation>Error al guardar datos GIS</translation>
+        <translation>Error desant dades GIS...</translation>
     </message>
 </context>
 <context>
@@ -4613,12 +4970,12 @@ línea %2, columna %3.
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
         <source>choose one...</source>
-        <translation>elige una...</translation>
+        <translation>Escolliu-ne un...</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
         <source>Hiking Tour Summary (built-in)</source>
-        <translation>Datos de la actividad (genérico)</translation>
+        <translation>Resum del Recorregut de Senderisme (intern)</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
@@ -4628,17 +4985,17 @@ línea %2, columna %3.
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
         <source>Template path...</source>
-        <translation>Ruta de las Plantillas...</translation>
+        <translation>Cami de les Plantilles...</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
         <source>Failed to read template file %1.</source>
-        <translation>Fallo al leer la plantilla %1.</translation>
+        <translation>No s'ha pogut llegir el fitxer de plantilla %1.</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
         <source>Preview...</source>
-        <translation>Previsualizar...</translation>
+        <translation>Previsualització...</translation>
     </message>
 </context>
 <context>
@@ -4651,7 +5008,7 @@ línea %2, columna %3.
     <message>
         <location filename="../widgets/CTextEditWidget.cpp" line="117"/>
         <source>Reset format</source>
-        <translation>Restablecer formato</translation>
+        <translation>Reinicia format</translation>
     </message>
 </context>
 <context>
@@ -4659,12 +5016,12 @@ línea %2, columna %3.
     <message>
         <location filename="../helpers/CToolBarSetupDialog.cpp" line="43"/>
         <source>Available Actions</source>
-        <translation>Acciones disponibles</translation>
+        <translation>Accions Disponibles</translation>
     </message>
     <message>
         <location filename="../helpers/CToolBarSetupDialog.cpp" line="44"/>
         <source>Selected Actions</source>
-        <translation>Acciones seleccionadas</translation>
+        <translation>Accions Seleccionades</translation>
     </message>
 </context>
 <context>
@@ -4686,25 +5043,25 @@ línea %2, columna %3.
         <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
         <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Failed to open %1.</source>
-        <translation>Fallo al abrir %1.</translation>
+        <translation>Error en obrir %1.</translation>
     </message>
     <message>
         <location filename="../gis/tnv/CTwoNavProject.cpp" line="160"/>
         <source>Save GIS data to...</source>
-        <translation>Guardar los datos GIS en...</translation>
+        <translation>Desa les dades GIS a...</translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="588"/>
         <location filename="../gis/tnv/serialization.cpp" line="599"/>
         <source>Only support lon/lat WGS 84 format.</source>
-        <translation>Solamente soporta formato lon/lat WGS84.</translation>
+        <translation>Sols s'admet lon/lat en format WGS 84.</translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="617"/>
         <location filename="../gis/tnv/serialization.cpp" line="645"/>
         <location filename="../gis/tnv/serialization.cpp" line="719"/>
         <source>Failed to read data.</source>
-        <translation>Fallo al leer los datos.</translation>
+        <translation>Error en llegir les dades.</translation>
     </message>
 </context>
 <context>
@@ -4712,7 +5069,7 @@ línea %2, columna %3.
     <message>
         <location filename="../helpers/CWptIconDialog.cpp" line="161"/>
         <source>Path to user icons...</source>
-        <translation>Carpeta de iconos de usuario...</translation>
+        <translation>Camí a les icones de l'usuari...</translation>
     </message>
 </context>
 <context>
@@ -4720,82 +5077,82 @@ línea %2, columna %3.
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
         <source>Form</source>
-        <translation>Ficha</translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
         <source>Participants</source>
-        <translation>Participantes</translation>
+        <translation>Participants</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
         <source>Weather</source>
-        <translation>Meteo</translation>
+        <translation>Meteorologia</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
         <source>rain</source>
-        <translation>lluvia</translation>
+        <translation>pluja</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
         <source>sunny</source>
-        <translation>sol</translation>
+        <translation>assolellat</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
         <source>snow</source>
-        <translation>nieve</translation>
+        <translation>neu</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
         <source>clouds</source>
-        <translation>nubes</translation>
+        <translation>nuvols</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
         <source>windy</source>
-        <translation>viento</translation>
+        <translation> ventades</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
         <source>hot</source>
-        <translation>caluroso</translation>
+        <translation>càlid</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
         <source>warm</source>
-        <translation>templado</translation>
+        <translation>temperat</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
         <source>cold</source>
-        <translation>frío</translation>
+        <translation>fred</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
         <source>freezing</source>
-        <translation>bajo cero</translation>
+        <translation>gelades</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
         <source>foggy</source>
-        <translation>niebla</translation>
+        <translation>boira</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
         <source>humid</source>
-        <translation>humedad</translation>
+        <translation>humitat</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
         <source>Character</source>
-        <translation>Carácter</translation>
+        <translation>Caràcter</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
         <source>easy hiking</source>
-        <translation>Excursión fácil</translation>
+        <translation>caminada fàcil</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
@@ -4805,102 +5162,102 @@ línea %2, columna %3.
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
         <source>alpine</source>
-        <translation>Actividad alpina</translation>
+        <translation>alpí</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
         <source>large ascend</source>
-        <translation>gran desnivel</translation>
+        <translation>pujada llarga</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
         <source>long distance</source>
-        <translation>larga distancia</translation>
+        <translation>llarga distància</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
         <source>via ferrata</source>
-        <translation>ferrata</translation>
+        <translation>via ferrada</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
         <source>hail/soft hail</source>
-        <translation>granizo</translation>
+        <translation>calamarsa/calamarsa suau</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
         <source>Rating</source>
-        <translation>Calificación</translation>
+        <translation> Valoració</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
         <source>Rating 5 stars</source>
-        <translation>***** Excepcional</translation>
+        <translation>Valoració 5 estrelles</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
         <source>Rating 4 stars</source>
-        <translation>**** Muy buena</translation>
+        <translation>Valoració 4 estrelles</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
         <source>Rating 3 stars</source>
-        <translation>*** Buena</translation>
+        <translation>Valoració 3 estrelles</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
         <source>Rating 2 stars</source>
-        <translation>** Regular</translation>
+        <translation>Valoració 2 estrelles</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
         <source>Rating 1 star</source>
-        <translation>* Mala</translation>
+        <translation>Valoració 1 estrella</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
         <source>aborted</source>
-        <translation>Intento frustrado</translation>
+        <translation>Interromput</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
         <source>Equipment</source>
-        <translation>Material</translation>
+        <translation>Equipament</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
         <source>ferrata gear</source>
-        <translation>ferrata</translation>
+        <translation>equip per a vies ferrades</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
         <source>night gear</source>
-        <translation>iluminación</translation>
+        <translation>equipació nocturna</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
         <source>snow shoes</source>
-        <translation>raquetas</translation>
+        <translation>sabates de neu</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
         <source>climbing gear</source>
-        <translation>escalada</translation>
+        <translation>equip d'escalada</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
         <source>ski</source>
-        <translation>ski</translation>
+        <translation>esquí</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
         <source>camping gear</source>
-        <translation>acampada / vivac</translation>
+        <translation>equip de càmping</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
         <source>Details</source>
-        <translation>Detalles</translation>
+        <translation>Detalls</translation>
     </message>
 </context>
 <context>
@@ -4908,12 +5265,12 @@ línea %2, columna %3.
     <message>
         <location filename="../IAbout.ui" line="14"/>
         <source>About....</source>
-        <translation>Acerca de...</translation>
+        <translation>Quant a....</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="55"/>
         <source><b>QMapShack</b>, Version</source>
-        <translation><b>QMapShack</b>, Versión</translation>
+        <translation><b>QMapShack</b>, Versió</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="62"/>
@@ -4922,7 +5279,7 @@ línea %2, columna %3.
         <location filename="../IAbout.ui" line="141"/>
         <location filename="../IAbout.ui" line="155"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="106"/>
@@ -4942,124 +5299,126 @@ línea %2, columna %3.
     <message>
         <location filename="../IAbout.ui" line="148"/>
         <source>Routino</source>
-        <translation></translation>
+        <translation>Routino</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="179"/>
         <source>Czech:</source>
-        <translation>checo:</translation>
+        <translation>Txec:</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="189"/>
+        <source>Pavel Fric</source>
+        <translation>Pavel Fric</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="202"/>
         <source>German:</source>
-        <translation>Alemán:</translation>
+        <translation>Alemany:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="212"/>
         <source>Oliver Eichler</source>
-        <translation></translation>
+        <translation>Oliver Eichler</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="225"/>
         <source>Dutch:</source>
-        <translation>holandés:</translation>
+        <translation>Holandes:</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="235"/>
+        <source>Harrie Klomp</source>
+        <translation>Harrie Klomp</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="248"/>
         <source>French:</source>
-        <translation>Francés:</translation>
+        <translation>Francès:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="258"/>
         <source>Rainer Unseld </source>
-        <translation></translation>
+        <translation>Rainer Unseld </translation>
     </message>
     <message>
-        <location filename="../IAbout.ui" line="295"/>
-        <source>Russian:</source>
-        <translation>Ruso:</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="302"/>
-        <source>Wolfgang Thämelt</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="428"/>
-        <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
-        <translation></translation>
+        <location filename="../IAbout.ui" line="265"/>
+        <source>Jose Luis Domingo Lopez</source>
+        <translation>Jose Luis Domingo Lopez</translation>
     </message>
     <message>
-        <location filename="../IAbout.ui" line="189"/>
-        <source>Pavel Fric</source>
-        <translation></translation>
+        <location filename="../IAbout.ui" line="278"/>
+        <source>Spanish:</source>
+        <translation>Espanyol:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="288"/>
         <source><b>Translation:</b></source>
-        <translation><b>Traducción:</b></translation>
+        <translation><b>Traducció:</b></translation>
     </message>
     <message>
-        <location filename="../IAbout.ui" line="235"/>
-        <source>Harrie Klomp</source>
-        <translation></translation>
+        <location filename="../IAbout.ui" line="295"/>
+        <source>Russian:</source>
+        <translation>Rus:</translation>
     </message>
     <message>
-        <location filename="../IAbout.ui" line="278"/>
-        <source>Spanish:</source>
-        <translation>Español:</translation>
+        <location filename="../IAbout.ui" line="302"/>
+        <source>Wolfgang Thämelt</source>
+        <translation>Wolfgang Thämelt</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="326"/>
         <source>Win64:</source>
-        <translation></translation>
+        <translation>Win64:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="342"/>
         <source>OS X:</source>
-        <translation></translation>
+        <translation>OS X:</translation>
     </message>
     <message>
-        <location filename="../IAbout.ui" line="366"/>
-        <source><b>Binaries:</b></source>
-        <translation><b>Binarios:</b></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="395"/>
-        <source><b>Contributors:</b></source>
-        <translation><b>Colaboradores:</b></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="265"/>
-        <source>Jose Luis Domingo Lopez</source>
-        <translation>Jose Luis Domingo, Javi Segovia</translation>
+        <location filename="../IAbout.ui" line="352"/>
+        <source>Helmut Schmidt</source>
+        <translation>Helmut Schmidt</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="359"/>
         <source>Ivo Kronenberg</source>
-        <translation></translation>
+        <translation>Ivo Kronenberg</translation>
     </message>
     <message>
-        <location filename="../IAbout.ui" line="352"/>
-        <source>Helmut Schmidt</source>
-        <translation></translation>
+        <location filename="../IAbout.ui" line="366"/>
+        <source><b>Binaries:</b></source>
+        <translation><b>Binaris:</b></translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="375"/>
         <source>...and thanks to all Linux binary maintainers for doing a great job. Special thanks to Dan Horák and Bas Couwenberg for showing presence on the mailing list to discuss distribution related topics.</source>
-        <translation>... y gracias a todos los mantenedores  de Linux por hacer un gran trabajo. Agradecimientos especiales a Dan Horák y Bas Couwenberg por estar presentes en la lista de correo para discutir temas relacionados con la distribución</translation>
+        <translation>...I molted gràcies a tots els mantenidors dels binaris Linux pel gran treball que fan. Agraïments especials a Dan Horák i Bas Couwenberg per la seva presencia a les llistes de discusió de temes relacionats amb les distribucions.</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="395"/>
+        <source><b>Contributors:</b></source>
+        <translation><b>Col·laboradors:</b></translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="402"/>
         <source>Christian Eichler (qms at christian-eichler.de)
 Ivo Kronenberg
 Norbert Truchsess (norbert.truchsess at t-online.de)</source>
-        <translation></translation>
+        <translation>Christian Eichler (qms at christian-eichler.de)
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="421"/>
         <source>This software is licensed under GPL3 or any later version</source>
-        <translation>Este software esta bajo licencia GPL3 o posterior</translation>
+        <translation>Aquest programari es distribueix sota llicència GPL3 o qualsevol altre versió posterior</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="428"/>
+        <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
+        <translation>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</translation>
     </message>
 </context>
 <context>
@@ -5067,12 +5426,12 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../canvas/ICanvasSetup.ui" line="14"/>
         <source>Setup Map View...</source>
-        <translation>Configurar Vista de Mapa...</translation>
+        <translation>Configurar la Vista Mapa...</translation>
     </message>
     <message>
         <location filename="../canvas/ICanvasSetup.ui" line="22"/>
         <source>Projection & Datum</source>
-        <translation>Proyección y Datum</translation>
+        <translation>Projecció & Datum</translation>
     </message>
     <message>
         <location filename="../canvas/ICanvasSetup.ui" line="32"/>
@@ -5082,17 +5441,17 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../canvas/ICanvasSetup.ui" line="53"/>
         <source>Scales</source>
-        <translation>Escalas</translation>
+        <translation>Escales</translation>
     </message>
     <message>
         <location filename="../canvas/ICanvasSetup.ui" line="59"/>
         <source>Logarithmic</source>
-        <translation>Logarítmica</translation>
+        <translation>Logarítmic</translation>
     </message>
     <message>
         <location filename="../canvas/ICanvasSetup.ui" line="66"/>
         <source>Square (optimized for TMS and WMTS tiles)</source>
-        <translation>Cuadrada (optimizada para teselas TMS y WMTS)</translation>
+        <translation>Quadrat (optimitzat per tesel·les TMS i WMTS)</translation>
     </message>
 </context>
 <context>
@@ -5100,7 +5459,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../widgets/IColorChooser.ui" line="14"/>
         <source>Dialog</source>
-        <translation>Diálogo</translation>
+        <translation> Diàleg</translation>
     </message>
 </context>
 <context>
@@ -5108,12 +5467,12 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="14"/>
         <source>Combine Tracks...</source>
-        <translation>Combinar Tracks...</translation>
+        <translation>Unir Tracks...</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
         <source>Available Tracks</source>
-        <translation>Tracks disponibles</translation>
+        <translation>Tracks Disponibles</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
@@ -5126,7 +5485,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
         <source>Combined Tracks</source>
-        <translation>Tracks combinados</translation>
+        <translation>Tracks units</translation>
     </message>
 </context>
 <context>
@@ -5134,22 +5493,22 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../units/ICoordFormatSetup.ui" line="14"/>
         <source>Coordinate Format...</source>
-        <translation>Formato de coordenadas...</translation>
+        <translation>Format de les coordenades...</translation>
     </message>
     <message>
-        <location filename="../units/ICoordFormatSetup.ui" line="36"/>
-        <source>N48° 53.660 E013° 31.113</source>
-        <translation type="unfinished"></translation>
+        <location filename="../units/ICoordFormatSetup.ui" line="22"/>
+        <source>N48° 53' 39.6" E13° 31' 6.78"</source>
+        <translation>N48° 53' 39.6" E13° 31' 6.78"</translation>
     </message>
     <message>
         <location filename="../units/ICoordFormatSetup.ui" line="29"/>
         <source>N48.8943° E013.51855°</source>
-        <translation type="unfinished"></translation>
+        <translation>N48.8943° E013.51855°</translation>
     </message>
     <message>
-        <location filename="../units/ICoordFormatSetup.ui" line="22"/>
-        <source>N48° 53' 39.6" E13° 31' 6.78"</source>
-        <translation type="unfinished"></translation>
+        <location filename="../units/ICoordFormatSetup.ui" line="36"/>
+        <source>N48° 53.660 E013° 31.113</source>
+        <translation>N48° 53.660 E013° 31.113</translation>
     </message>
 </context>
 <context>
@@ -5157,7 +5516,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../gis/rte/ICreateRouteFromWpt.ui" line="14"/>
         <source>Create Route from Waypoints</source>
-        <translation>Crear rutas con los waypoints</translation>
+        <translation>Crear una ruta des de fites.</translation>
     </message>
     <message>
         <location filename="../gis/rte/ICreateRouteFromWpt.ui" line="30"/>
@@ -5171,27 +5530,27 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="14"/>
         <source>Cut Track</source>
-        <translation>Dividir track</translation>
+        <translation>Tallar el Track</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="20"/>
         <source>Delete first part of the track and keep second one</source>
-        <translation>Borrar primera parte del track y conservar la segunda</translation>
+        <translation>Suprimir la primera part del track i mantenir la segona </translation>
     </message>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="30"/>
         <source>Keep both parts of the track</source>
-        <translation>Mantener ambas partes del track</translation>
+        <translation>Mantenir les dues parts del track</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="43"/>
         <source>Keep first part of the track and delete second one</source>
-        <translation>Conservar primera parte del track y borrar la segunda</translation>
+        <translation>Mantenir la primera part del track i suprimir la segona </translation>
     </message>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="55"/>
         <source>Cut Mode:</source>
-        <translation>Modo de división</translation>
+        <translation>Mode de Tall:</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="136"/>
@@ -5200,16 +5559,16 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
 If you keep both parts of the track you have to create new ones. 
 
 If you want to keep just one half you can simply remove the points, or check this to create a new track.</source>
-        <translation>Compruebe esto para almacenar el resultado en un nuevo track.
+        <translation>Marca això si voleu guardar el resultat en un track nou. 
 
-Si mantiene ambas partes del track, tiene que crear otros nuevos.
+Si manteniu totes dues parts del track n'heu de crear de noves. 
 
-Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marcar esto para crear un nuevo track</translation>
+Si sols voleu mantenir una part suprimiu els punts, o marqueu això per a crear un track nou.</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="143"/>
         <source>Create a new track</source>
-        <translation>Crear nuevo track</translation>
+        <translation>Crea un nou track</translation>
     </message>
 </context>
 <context>
@@ -5217,22 +5576,22 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/db/IDB.cpp" line="60"/>
         <source>The internal database format of '%1' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
-        <translation>El formato interno de base de datos de  '%1' ha cambiado. QMapShack hará la conversión de tu base de datos ahora.Después de esta conversión la nueva base de datos no puede utilizarse en versiones más antiguas de QMapShack. Se recomienda hacer una copia de seguridad antes de comenzar.</translation>
+        <translation>Ha canviat el format de base de dades pròpi de '%1'. QMapShack migrarà ara la teva base de dades. Després de la migració no es podrà utilitzar la base de dades amb versions antigues de QMapShack. Es recomana fer una còpia de la base de dades abans d'iniciar la operació.</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="64"/>
         <source>Migrate database...</source>
-        <translation>Migrar base de datos.</translation>
+        <translation>Migrar base de dades...</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="69"/>
         <source>Migration aborted by user</source>
-        <translation>Migracion cancelada por el usuario</translation>
+        <translation>L'usuari ha interromput la migració</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="75"/>
         <source>Failed to migrate '%1'.</source>
-        <translation>Fallo al migrar '%1'.</translation>
+        <translation>Error en la migració de '%1'.</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="77"/>
@@ -5243,32 +5602,32 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/db/IDB.cpp" line="81"/>
         <source>Migration failed</source>
-        <translation>La migración falló</translation>
+        <translation>Error en la migració</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="88"/>
         <source>The database version of '%1' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
-        <translation>La versión de base de datos '%1' Está más avanzado que el entendido por su instalación de QMapShack. Esto no funcionará.</translation>
+        <translation>La version de la base de dades '%1' és més moderna que la instal·lada a QMapShack. No funcionarà.</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="110"/>
         <source>Initialization failed</source>
-        <translation>Inicializacion fallida</translation>
+        <translation>Error en la inicialització</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="91"/>
         <source>Wrong database version...</source>
-        <translation>Versión errónea de la base de datos</translation>
+        <translation>Versió incorrecte de la base de dades...</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="95"/>
         <source>Database created by newer version of QMapShack</source>
-        <translation>Base de datos creada por la nueva versión de QMapShack</translation>
+        <translation>S'ha creat la base de dades amb la versió més recent de QMapShack</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="104"/>
         <source>Failed to initialize '%1'.</source>
-        <translation>Fallo al iniciar '%1'.</translation>
+        <translation>Error en la inicialització de '%1'.</translation>
     </message>
 </context>
 <context>
@@ -5276,17 +5635,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password...</source>
-        <translation>Contraseña...</translation>
+        <translation>Contrasenya...</translation>
     </message>
     <message>
         <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password for database '%1':</source>
-        <translation>Contraseña de la base de datos '%1':</translation>
+        <translation>Contrasenya de la base de dades '%1':</translation>
     </message>
     <message>
         <location filename="../gis/db/IDBMysql.cpp" line="222"/>
         <source>Update to database version 5. Migrate all GIS items.</source>
-        <translation>Actualizar a versión 5 de base de datos. Migrar todos los elementos GIS.</translation>
+        <translation>Actualitzar la base de dades a la versió 5. Migrar tots els elements GIS.</translation>
     </message>
 </context>
 <context>
@@ -5294,17 +5653,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/db/IDBSqlite.cpp" line="306"/>
         <source>Update to database version 3. Migrate all GIS items.</source>
-        <translation>Actualizar base de datos a versión 3. Migrar todos los elementos GIS</translation>
+        <translation>Actualitzar la base de dades a la versió 3. Migrar tots els elements GIS.</translation>
     </message>
     <message>
         <location filename="../gis/db/IDBSqlite.cpp" line="375"/>
         <source>Update to database version 5. Migrate all GIS items.</source>
-        <translation>Actualizar base de datos a versión 5. Migrar todos los elementos GIS</translation>
+        <translation>Actualitzar la base de dades a la versió 5. Migrar tots els elements GIS.</translation>
     </message>
     <message>
         <location filename="../gis/db/IDBSqlite.cpp" line="449"/>
         <source>Update to database version 6. Migrate all GIS items.</source>
-        <translation>Actualizar base de datos a versión 6. Migrar todos los elementos GIS</translation>
+        <translation>Actualitzar la base de dades a la versió 6. Migrar tots els elements GIS.</translation>
     </message>
 </context>
 <context>
@@ -5312,7 +5671,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../dem/IDemPathSetup.ui" line="14"/>
         <source>Setup DEM file paths</source>
-        <translation>Configurar carpeta de archivos DEM</translation>
+        <translation>Configurar els camins als fitxers DEM</translation>
     </message>
     <message>
         <location filename="../dem/IDemPathSetup.ui" line="31"/>
@@ -5331,17 +5690,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="14"/>
         <source>Form</source>
-        <translation>ficha</translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="35"/>
         <source><html><head/><body><p>Change opacity of map</p></body></html></source>
-        <translation><html><head/><body><p>Cambiar la opacidad del mapa</p></body></html></translation>
+        <translation><html><head/><body><p>Canvia l'opacitat del mapa</p></body></html></translation>
     </message>
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="50"/>
         <source><html><head/><body><p>Click to use current scale as minimum scale to display the map.</p></body></html></source>
-        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala mínima a la que mostrar el mapa.</p></body></html></translation>
+        <translation><html><head/><body><p>Click per utilitzar l'escala actual com a escala mínima per a visualitzar el mapa.</p></body></html></translation>
     </message>
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="53"/>
@@ -5352,22 +5711,22 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="74"/>
         <source><html><head/><body><p>Control the range of scale the map is displayed. Use the two buttons left and right to define the actual scale as either minimum or maximum scale.</p></body></html></source>
-        <translation><html><head/><body><p>Controle el rango de escalas para las cuales desea que se muestre el mapa. Use los dos botones a izquierda y derecha para definir la escala actual como  la escala mínima o máxima para el mapa.</p></body></html></translation>
+        <translation><html><head/><body><p>Controla els intervals de l'escala en que es mostra el mapa. Utilitza els botons esquerra i dreta per a definir l'escala actual i el màxim i mínim de l'escala.</p></body></html></translation>
     </message>
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="87"/>
         <source><html><head/><body><p>Click to use current scale as maximum scale to display the map.</p></body></html></source>
-        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala máxima a la que mostrar el mapa</p></body></html></translation>
+        <translation><html><head/><body><p>Click per utilitzar l'escala actual com a escala màxima per a visualitzar el mapa.</p></body></html></translation>
     </message>
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="118"/>
         <source>Hillshading</source>
-        <translation>Sombreado</translation>
+        <translation>Relleu ombrejat</translation>
     </message>
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="144"/>
         <source>Slope </source>
-        <translation>Pendiente</translation>
+        <translation>Pendent</translation>
     </message>
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="226"/>
@@ -5376,7 +5735,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
         <location filename="../dem/IDemPropSetup.ui" line="494"/>
         <location filename="../dem/IDemPropSetup.ui" line="578"/>
         <source>°</source>
-        <translation>º</translation>
+        <translation>°</translation>
     </message>
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="229"/>
@@ -5385,7 +5744,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
         <location filename="../dem/IDemPropSetup.ui" line="497"/>
         <location filename="../dem/IDemPropSetup.ui" line="581"/>
         <source>> </source>
-        <translation></translation>
+        <translation>> </translation>
     </message>
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="251"/>
@@ -5394,7 +5753,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
         <location filename="../dem/IDemPropSetup.ui" line="438"/>
         <location filename="../dem/IDemPropSetup.ui" line="522"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
 </context>
 <context>
@@ -5402,47 +5761,47 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../dem/IDemList.ui" line="14"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="118"/>
+        <location filename="../dem/IDemList.ui" line="112"/>
         <source>To add files with elevation data use <b>File->Setup DEM Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
-        <translation>Para añadir archivos con datos de altitud <b>File->configure rutas de DEM</b>.  O clic <a href='setup'><b>aqui</b></a></translation>
+        <translation>Per afegir fitxers amb dades d'elevació feu <b>Fitxer->Configurar camins DEM</b>.  O feu clic <a href='setup'><b>aquí</b></a></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="131"/>
+        <location filename="../dem/IDemList.ui" line="125"/>
         <source>Use the context menu (right mouse button click on entry) to activate a file. Use drag-n-drop to move the activated file in the process order. </source>
-        <translation>Use el menú contextual (botón derecho del ratón y seleccione) para activar un archivo. Use arrastrar y soltar para mover el archivo activado en el orden de procesamiento.</translation>
+        <translation>Utilitza el menú contextual (clic al botó dret del ratolí o entrada) per activar un fitxer. Utilitzar arrossega I deixa anar per a moure el fitxer activat en el procés de selecció. </translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="156"/>
+        <location filename="../dem/IDemList.ui" line="150"/>
         <source>Activate</source>
         <translation>Activar</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="165"/>
+        <location filename="../dem/IDemList.ui" line="159"/>
         <source>Move Up</source>
-        <translation>Subir</translation>
+        <translation>Mou amunt</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="168"/>
+        <location filename="../dem/IDemList.ui" line="162"/>
         <source>Hide DEM behind previous one</source>
-        <translation>Ocultar DEM detrás del anterior</translation>
+        <translation>Amagar DEM darrere de l'anterior</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="177"/>
+        <location filename="../dem/IDemList.ui" line="171"/>
         <source>Move down</source>
-        <translation>Bajar</translation>
+        <translation>Mou avall</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="180"/>
+        <location filename="../dem/IDemList.ui" line="174"/>
         <source>Show DEM on top of next one</source>
-        <translation>Mostrar DEM encima del siguiente</translation>
+        <translation>Mostra el DEM a sobre del següent</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="189"/>
+        <location filename="../dem/IDemList.ui" line="183"/>
         <source>Reload DEM</source>
-        <translation>Recargar DEM's</translation>
+        <translation>Tornar a carregar DEM</translation>
     </message>
 </context>
 <context>
@@ -5450,7 +5809,12 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="20"/>
         <source>Dialog</source>
-        <translation>Diálogo</translation>
+        <translation> Diàleg</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="40"/>
+        <source>Position:</source>
+        <translation>Posició:</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="47"/>
@@ -5469,29 +5833,19 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="267"/>
-        <source>about:blank</source>
-        <translation>about:blank</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="40"/>
-        <source>Position:</source>
-        <translation>Posición:</translation>
-    </message>
-    <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="60"/>
         <source>Difficulty</source>
-        <translation>Dificultad</translation>
+        <translation>Dificultat</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="138"/>
         <source>Terrain</source>
-        <translation>Terreno</translation>
+        <translation>Terreny</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="214"/>
         <source>Update spoilers</source>
-        <translation>Actualizar spoilers</translation>
+        <translation>Actualitzar spoilers</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="217"/>
@@ -5500,14 +5854,19 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="267"/>
+        <source>about:blank</source>
+        <translation>about:blank</translation>
+    </message>
+    <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="293"/>
         <source>Hint:</source>
-        <translation>Consejo:</translation>
+        <translation>Consell:</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="324"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
 </context>
 <context>
@@ -5515,17 +5874,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="14"/>
         <source>Dialog</source>
-        <translation>Diálogo</translation>
+        <translation> Diàleg</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
         <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation>El área se importó a QMapShack y se cambió. Ya no muestra los datos originales. Consulte el historial de cambios</translation>
+        <translation>Aquesta àrea s'ha importat a QMapShack I ha estat modificada. Ja no es poden mostrar les dades originals. Si us plau, mireu el historial per veure les modificacions. </translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="148"/>
         <source>Toggle read only mode. You have to open the lock to edit the item.</source>
-        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
+        <translation>Commuta el mode de només lectura. S'ha de desbloquejar l'element per a editar-lo.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="151"/>
@@ -5540,37 +5899,37 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="202"/>
         <source>Border width</source>
-        <translation>Ancho del borde</translation>
+        <translation>Amplada de la vora</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="216"/>
         <source>Style</source>
-        <translation>Estilo</translation>
+        <translation>Estil</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="235"/>
         <source>Opacity</source>
-        <translation>Opacidad</translation>
+        <translation>Opacitat</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="248"/>
         <source>Info</source>
-        <translation>Información</translation>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="277"/>
         <source>Points</source>
-        <translation>Puntos</translation>
+        <translation>Punts</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="304"/>
         <source>Position</source>
-        <translation>Posición</translation>
+        <translation>Possició</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="313"/>
         <source>Hist.</source>
-        <translation>Historial</translation>
+        <translation>Hist.</translation>
     </message>
 </context>
 <context>
@@ -5578,7 +5937,12 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="14"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="43"/>
+        <source>Keywords:</source>
+        <translation>Paraules clau:</translation>
     </message>
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="50"/>
@@ -5587,41 +5951,36 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
-        <source>Print diary</source>
-        <translation>Imprimir diario</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="71"/>
         <source>Keep order of project</source>
-        <translation>Mantenga el orden del proyecto</translation>
+        <translation>Mantenir l'ordre del projecte</translation>
     </message>
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
         <source>Sort along track (multiple)</source>
-        <translation>Ordenar a lo largo del track (múltiples)</translation>
+        <translation>Ordena al llarg del track (diversos)</translation>
     </message>
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
         <source>Sort along track (single)</source>
-        <translation>Ordenar a lo largo del track (único)</translation>
+        <translation>Ordena al llarg del track (un de sol)</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
-        <source>Rebuild diary.</source>
-        <translation>Recargar diario.</translation>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="43"/>
-        <source>Keywords:</source>
-        <translation>Etiquetas:</translation>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
+        <source>Print diary</source>
+        <translation>Imprimir diari</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
+        <source>Rebuild diary.</source>
+        <translation>Reconstrueix el diari.</translation>
     </message>
 </context>
 <context>
@@ -5629,22 +5988,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/rte/IDetailsRte.ui" line="36"/>
         <source>Info</source>
-        <translation>Información</translation>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
         <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation>La ruta se importó a QMapShack y se cambió. Ya no muestra los datos originales. Consulte el historial de cambios.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IDetailsRte.ui" line="205"/>
-        <source>-</source>
-        <translation>-</translation>
+        <translation>Aquesta ruta s'ha importat a QMapShack I ha estat modificada. Ja no es poden mostrar les dades originals. Si us plau, mireu el historial per veure les modificacions. </translation>
     </message>
     <message>
         <location filename="../gis/rte/IDetailsRte.ui" line="170"/>
         <source>Toggle read only mode. You have to open the lock to edit the item.</source>
-        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
+        <translation>Commuta el mode de només lectura. S'ha de desbloquejar l'element per a editar-lo.</translation>
     </message>
     <message>
         <location filename="../gis/rte/IDetailsRte.ui" line="173"/>
@@ -5652,9 +6006,14 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../gis/rte/IDetailsRte.ui" line="205"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
         <location filename="../gis/rte/IDetailsRte.ui" line="229"/>
         <source>Hist.</source>
-        <translation>Historial</translation>
+        <translation>Hist.</translation>
     </message>
 </context>
 <context>
@@ -5662,7 +6021,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="14"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="81"/>
@@ -5673,77 +6032,9 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
 -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
-        <source>Use/edit user defined visibility of arrows for this track</source>
-        <translation>Utilizar / editar la visibilidad definida por el usuario de las flechas de este track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="480"/>
-        <source>Use/edit system's visibility of arrows for all tracks</source>
-        <translation>Utilizar / editar la visibilidad definida por el usuario de las flechas de todos los track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="689"/>
-        <source>Use/edit user defined scale factor for this track</source>
-        <translation>Utilizar / editar el factor de escala de este track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="718"/>
-        <source>Use/edit system's default factor for all tracks</source>
-        <translation>Utilice / edite el factor predeterminado del sistema para todas los tracks</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
-        <source>max.</source>
-        <translation>max.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="994"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1001"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1015"/>
-        <source>min.</source>
-        <translation>min.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="545"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1047"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1144"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1241"/>
-        <source>User defined limits for this track</source>
-        <translation>Límites definidos por el usuario para este track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1076"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1173"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1270"/>
-        <source>Automatic limits</source>
-        <translation>Límites automáticos</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
-        <source>User defined limits for all tracks</source>
-        <translation>Límites definidos por el usuario para todos los track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1495"/>
-        <source>Speed</source>
-        <translation>Velocidad</translation>
-    </message>
-    <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="287"/>
         <source>Toggle read only mode. You have to open the lock to edit the item.</source>
-        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
+        <translation>Commuta el mode de només lectura. S'ha de desbloquejar l'element per a editar-lo.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="290"/>
@@ -5767,51 +6058,117 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="387"/>
         <source>Style</source>
-        <translation>Estilo</translation>
+        <translation>Estil</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="429"/>
         <source>Source</source>
-        <translation>Atributo</translation>
+        <translation>Origen</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="634"/>
         <source>Maximum</source>
-        <translation>Máximo</translation>
+        <translation>Màxim</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
+        <source>Use/edit user defined visibility of arrows for this track</source>
+        <translation>Utilitza/edita mostrar fletxes de direcció en el track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="480"/>
+        <source>Use/edit system's visibility of arrows for all tracks</source>
+        <translation>Utilitza/edita mostrar fletxes de direcció en tots els tracks</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="774"/>
         <source>Minimum</source>
-        <translation>Mínimo</translation>
+        <translation>Mínim</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
+        <source>Graphs</source>
+        <translation>Gràfics</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
+        <source>Profile</source>
+        <translation>Perfil</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
+        <source>Width</source>
+        <translation>Amplada</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="689"/>
+        <source>Use/edit user defined scale factor for this track</source>
+        <translation>Utilitza/edita l'escala del track definida per l'usuari</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="718"/>
+        <source>Use/edit system's default factor for all tracks</source>
+        <translation>Utilitza/edita el valor per defecte de l'escala a tots els tracks</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
+        <source>with arrows</source>
+        <translation>amb fletxes</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
         <source>x </source>
-        <translation>x </translation>
+        <translation>x</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="545"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1047"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1144"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1241"/>
+        <source>User defined limits for this track</source>
+        <translation>Límits d'aquest track definits per l'usuari </translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
         <source>-
 -
 -</source>
-        <translation type="unfinished"></translation>
+        <translation>-
+-
+-</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
         <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation>El track se ha importado a QMapShack y se ha editado. No muestra los datos originales. Consulte el historial de cambios.</translation>
+        <translation>Aquest track s'ha importat a QMapShack I ha estat modificat. Ja no es poden mostrar les dades originals. Si us plau, mireu el historial per veure les modificacions. </translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
-        <source>Width</source>
-        <translation>Anchura</translation>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1076"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1173"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1270"/>
+        <source>Automatic limits</source>
+        <translation>Límits automàtics</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
-        <source>with arrows</source>
-        <translation>Con flechas</translation>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
+        <source>User defined limits for all tracks</source>
+        <translation>Límits per a tots els tracks definits per l'usuari </translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
@@ -5819,89 +6176,93 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
         <translation>Color</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
-        <source>Graphs</source>
-        <translation>Gráficos</translation>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
+        <source>max.</source>
+        <translation>màx.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="994"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1001"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1015"/>
+        <source>min.</source>
+        <translation>min.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
         <source>Activity</source>
-        <translation>Actividad</translation>
+        <translation>Activitat</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
         <source>Set Track Activity</source>
-        <translation>Establecer actividad del track</translation>
+        <translation>Assigna una Activitat al Track</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1400"/>
         <source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
-        <translation>Para diferenciar las estadísticas seleccione una actividad de la lista para todo el track,o bien, seleccione una parte para asignar una actividad.</translation>
+        <translation>Per a tenir estadístiques dels tracks, seleccionar de la llista una activitat per a tot el track. O assigneu una activitat a una part del track.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1427"/>
         <source>Points</source>
-        <translation>Puntos</translation>
+        <translation>Punts</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
         <source>Time</source>
-        <translation>Tiempo</translation>
+        <translation>Temps</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
         <source>Ele.</source>
-        <translation>Altitud.</translation>
+        <translation>Alt.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
-        <source>Delta</source>
-        <translation>Delta</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
-        <source>Dist.</source>
-        <translation>Distancia</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1500"/>
-        <source>Slope</source>
-        <translation>Pendiente</translation>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
+        <source>Delta</source>
+        <translation>Delta</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1515"/>
-        <source>Position</source>
-        <translation>Posición</translation>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
+        <source>Dist.</source>
+        <translation>Dist.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
-        <source>Info</source>
-        <translation>Información</translation>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1495"/>
+        <source>Speed</source>
+        <translation>Velocitat</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1500"/>
+        <source>Slope</source>
+        <translation>Pendent</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1505"/>
         <source>Ascent</source>
-        <translation>Ascenso</translation>
+        <translation>Ascens</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1510"/>
         <source>Descent</source>
-        <translation>Descenso</translation>
+        <translation>Descens</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1515"/>
+        <source>Position</source>
+        <translation>Possició</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1524"/>
         <source>Filter</source>
-        <translation>Filtro</translation>
+        <translation>Filtre</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1561"/>
         <source>Hist.</source>
-        <translation>Historial</translation>
+        <translation>Hist.</translation>
     </message>
 </context>
 <context>
@@ -5909,35 +6270,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="14"/>
         <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
-        <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation>El waypoint se importó a QMapShack y se cambió. Ya no muestra los datos originales. Consulte el historial de cambios.</translation>
+        <translation> Diàleg</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="284"/>
-        <source>Toggle read only mode. You have to open the lock to edit the item.</source>
-        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="287"/>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="342"/>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="362"/>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="394"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="43"/>
+        <source>Info</source>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="77"/>
         <source>Position:</source>
-        <translation>Posición:</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="43"/>
-        <source>Info</source>
-        <translation>Información</translation>
+        <translation>Possició:</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="84"/>
@@ -5950,40 +6293,58 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="97"/>
         <source>Ele.</source>
-        <translation>Altitud.</translation>
+        <translation>Alt.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="123"/>
         <source>Proximity:</source>
-        <translation>Proximidad:</translation>
+        <translation>Proximitat:</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="413"/>
-        <source>Hist.</source>
-        <translation>Historial</translation>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
+        <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+        <translation>La fita es va importar a QMapShack i es va modificar. Ja no es poden mostrar les dades originals. Vegeu l'historial de canvis. </translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="284"/>
+        <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+        <translation>Commuta el mode de només lectura. S'ha de desbloquejar l'element per a editar-lo.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="287"/>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="342"/>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="362"/>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="394"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="321"/>
+        <source>Date/Time:</source>
+        <translation>Data/Hora:</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="339"/>
         <source>Add images.</source>
-        <translation>Añadir imagenes.</translation>
+        <translation>Afegir imatges.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="359"/>
         <source>Delete selected image.</source>
-        <translation>Eliminar imagen seleccionada.</translation>
+        <translation>Suprimeix la imatge seleccionada.</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="321"/>
-        <source>Date/Time:</source>
-        <translation>Fecha/Hora:</translation>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="413"/>
+        <source>Hist.</source>
+        <translation>Hist.</translation>
     </message>
 </context>
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="292"/>
+        <location filename="../device/IDevice.cpp" line="314"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
-        <translation>Hay otro proyecto con el mismo nombre. Si pulsa 'ok'será eliminado y reemplazado.</translation>
+        <translation>Ja existeix un projecte amb el mateix nom. Si premeu el botó 'ok' el suprimireu i el substituireu pel nou.</translation>
     </message>
 </context>
 <context>
@@ -5991,12 +6352,12 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../helpers/IElevationDialog.ui" line="14"/>
         <source>Edit elevation...</source>
-        <translation>Editar altitud...</translation>
+        <translation>Editar elevació...</translation>
     </message>
     <message>
         <location filename="../helpers/IElevationDialog.ui" line="22"/>
         <source>Elevation</source>
-        <translation>Altitud</translation>
+        <translation>Altura</translation>
     </message>
     <message>
         <location filename="../helpers/IElevationDialog.ui" line="32"/>
@@ -6006,7 +6367,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../helpers/IElevationDialog.ui" line="39"/>
         <source>Get elevation from active digital elevation model.</source>
-        <translation>Obtener la altitud desde el DEM activo.</translation>
+        <translation>Obtenir l'elevació del model d'elevació digital actiu</translation>
     </message>
     <message>
         <location filename="../helpers/IElevationDialog.ui" line="42"/>
@@ -6019,7 +6380,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="14"/>
         <source>Export database to GPX...</source>
-        <translation>Exportar base de datos a GPX</translation>
+        <translation>Exportar base de dades a GPX...</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="22"/>
@@ -6029,7 +6390,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="33"/>
         <source>Export Path:</source>
-        <translation>Carpeta de exportación</translation>
+        <translation>Exportar Camí:</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="46"/>
@@ -6039,22 +6400,22 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="55"/>
         <source>GPX 1.1 without extensions</source>
-        <translation>GPX 1.1 sin extensiones</translation>
+        <translation>GPX 1.1 sense extensions</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="83"/>
         <source>Start</source>
-        <translation>Comenzar</translation>
+        <translation>Inici</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="93"/>
         <source>Abort</source>
-        <translation>Cancelar</translation>
+        <translation>Aborta</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="100"/>
         <source>Close</source>
-        <translation>Cerrar</translation>
+        <translation>Tancar</translation>
     </message>
 </context>
 <context>
@@ -6062,17 +6423,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterDelete.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDelete.ui" line="51"/>
         <source><b>Remove Track Points</b></source>
-        <translation><b>Eliminar puntos del Track</b></translation>
+        <translation><b>Suprimeix Punts del Track</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDelete.ui" line="63"/>
         <source>Remove all hidden track points permanently.</source>
-        <translation>Eliminar todos los puntos ocultos del track definitavamente.</translation>
+        <translation>Suprimeix definitivament els punts amagats del track. </translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDelete.ui" line="70"/>
@@ -6085,22 +6446,22 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="51"/>
         <source><b>Remove Extension from all Track Points</b></source>
-        <translation><b>Eliminar extensión para todos los puntos del track</b></translation>
+        <translation><b>Suprimir l'extensió de tots els Punts del Track</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="63"/>
         <source>Remove </source>
-        <translation>Eliminar</translation>
+        <translation>Suprimeix</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="83"/>
         <source>from all Track Points</source>
-        <translation>de todos los puntos del track</translation>
+        <translation>desde tots els Punts del Track</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="103"/>
@@ -6113,17 +6474,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="45"/>
         <source><b>Hide Points (Douglas Peuker)</b></source>
-        <translation><b>Ocultar Puntos (Douglas Peuker)</b></translation>
+        <translation><b>Amagar Punts (Douglas Peuker)</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="57"/>
         <source>Hide track points if the distance to a line between neighboring points is less than</source>
-        <translation>Ocultar puntos del track si la distancia a una linea entre puntos vecinos es menor que</translation>
+        <translation>Amagar els punts del track que estiguin a una distància d'un altre inferior a</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="70"/>
@@ -6133,7 +6494,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="93"/>
         <source>Apply filter now.</source>
-        <translation>Aplicar filtro ahora.</translation>
+        <translation>Aplica ara el filtre.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="96"/>
@@ -6146,27 +6507,27 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="51"/>
         <source><b>Interpolate Elevation Data</b></source>
-        <translation><b>Interpolar datos de altitud</b></translation>
+        <translation><b>Interpolar Dades d'Elevació</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="69"/>
         <source>Replace elevation of track points with interpolated data.</source>
-        <translation>Sustituir la altitud de los puntos del track con datos interpolados.</translation>
+        <translation>Substitueix l'elevació dels punts del track amb dades interpolades</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="76"/>
         <source>Quality</source>
-        <translation>Calidad</translation>
+        <translation>Qualitat</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="105"/>
         <source>Preview</source>
-        <translation>Vista previa</translation>
+        <translation>Previsualització</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="112"/>
@@ -6179,17 +6540,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterInvalid.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInvalid.ui" line="41"/>
         <source>Hide Invalid Points</source>
-        <translation>Ocultar puntos inválidos</translation>
+        <translation>Amagar Punts Invàlids</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInvalid.ui" line="56"/>
         <source>Hide points with invalid data.</source>
-        <translation>Ocultar puntos con datos no válidos.</translation>
+        <translation>Amagar punts amb dades invàlides.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInvalid.ui" line="63"/>
@@ -6202,22 +6563,22 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterMedian.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterMedian.ui" line="51"/>
         <source><b>Smooth Profile (Median Method)</b></source>
-        <translation><b>Suavizar Perfil (Mediana)</b></translation>
+        <translation><b>Perfil Suau (Median Mètode)</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterMedian.ui" line="63"/>
         <source>Smooth deviation of the track points elevation with a Median filter of size </source>
-        <translation>Suavizar el desvio de la altitud de los puntos del track con la Mediana de</translation>
+        <translation>Desplaçament suau dels punts d'elevació del track utilitzant un filtre de Mitjana de mida</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterMedian.ui" line="76"/>
         <source>points</source>
-        <translation>puntos</translation>
+        <translation>punts</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterMedian.ui" line="105"/>
@@ -6230,22 +6591,22 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterNewDate.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterNewDate.ui" line="35"/>
         <source><b>Change Time</b></source>
-        <translation><b>Cambiar Fecha/hora</b></translation>
+        <translation><b>Canviar l'Hora</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterNewDate.ui" line="44"/>
         <source>Change start of track to </source>
-        <translation>Modificar el inicio del track a </translation>
+        <translation>Caviar l'inici del track a</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterNewDate.ui" line="51"/>
         <source>dd.MM.yy HH:mm:ss</source>
-        <translation type="unfinished"></translation>
+        <translation>dd.MM.aa HH:mm:ss</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterNewDate.ui" line="61"/>
@@ -6263,27 +6624,27 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="45"/>
         <source><b>Obscure Timestamps</b></source>
-        <translation><b>Ocultar Marcas de tiempo</b></translation>
+        <translation><b>Marques horàries inhabituals</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="54"/>
         <source>Increase timestamp by</source>
-        <translation>Incrementar marca de tiempo en</translation>
+        <translation>Incrementa la marca horària en</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="61"/>
         <source> sec.</source>
-        <translation></translation>
+        <translation>seg.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="68"/>
         <source>with each track point. 0 sec. will remove timestamps.</source>
-        <translation>con cada punto del track. ( 0 sec. eliminará las marcas de tiempo).</translation>
+        <translation>amb cada punt del track. 0 sec. es suprimiran les marques horàries.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="88"/>
@@ -6296,22 +6657,22 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="51"/>
         <source><b>Offset Elevation</b></source>
-        <translation><b>Desplazar altitud</b></translation>
+        <translation><b>Desplaçament de la Elevació</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="69"/>
         <source>Add offset of</source>
-        <translation>Añadir corrección de </translation>
+        <translation>Afegir un desplaçament de</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="95"/>
         <source>to track points elevation.</source>
-        <translation>a la altitud de los puntos del track.</translation>
+        <translation>a les elevacions dels punts del track.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="115"/>
@@ -6324,17 +6685,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="51"/>
         <source><b>Replace Elevation Data</b></source>
-        <translation><b>Reemplazar Datos de altitud</b></translation>
+        <translation><b>Substitueix les Dades d'Elevació</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="63"/>
         <source>Replace elevation of track points with the values from loaded DEM files.</source>
-        <translation>Reemplazar altitud de los puntos del track utilizando los valores del fichero DEM cargado.</translation>
+        <translation>Substitueix l'elevació dels punts del track amb els valors carregats des dels fitxers DEM.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="70"/>
@@ -6347,17 +6708,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterReset.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterReset.ui" line="35"/>
         <source><b>Reset Hidden Track Points</b></source>
-        <translation><b>Restaurar Puntos Ocultos del Track</b></translation>
+        <translation><b>Reinicia els Punts Amagats del Track</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterReset.ui" line="47"/>
         <source>Make all trackpoints visible again.</source>
-        <translation>Hacer visibles de nuevo todos los puntos del track.</translation>
+        <translation>Tornar a mostrar tots els punts del track</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterReset.ui" line="54"/>
@@ -6370,22 +6731,22 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterSpeed.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSpeed.ui" line="35"/>
         <source><b>Change Speed</b></source>
-        <translation><b>Modificar Velocidad</b></translation>
+        <translation><b>Canviar Velocitat</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSpeed.ui" line="44"/>
         <source>Set speed to </source>
-        <translation>Ajustar velocidad a </translation>
+        <translation>Estableix la velocitat a</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSpeed.ui" line="51"/>
         <source> km/h</source>
-        <translation></translation>
+        <translation> km/h</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSpeed.ui" line="102"/>
@@ -6398,17 +6759,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="51"/>
         <source><html><head/><body><p><span style=" font-weight:600;">Split Segments into Tracks</span></p></body></html></source>
-        <translation><html><head/><body><p><span style=" font-weight:600;">Dividir el track en segmentos</span></p></body></html></translation>
+        <translation><html><head/><body><p><span style=" font-weight:600;">Divideix els segments en Tracks</span></p></body></html></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="63"/>
         <source>Creates a new track for every segment within this track.</source>
-        <translation>Crea un nuevo track por cada segmento de este track.</translation>
+        <translation>Crea un nou track per a cada un dels segments existents al track.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="70"/>
@@ -6421,17 +6782,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="35"/>
         <source><b>Convert track subpoints to points</b></source>
-        <translation><b>Convertir subpuntos de track en puntos</b></translation>
+        <translation><b>Convertir a punts els subpunts del track</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="47"/>
         <source>Convert subpoints obtained from routing to ordinary track points </source>
-        <translation>Convierta subpuntos obtenidos por el enrutamiento a puntos de track ordinarios</translation>
+        <translation>Convertir els subpunts obtinguts d'un itinerari a punts de track normals</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="54"/>
@@ -6444,17 +6805,17 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="51"/>
         <source><b>Calculate Terrain Slope</b></source>
-        <translation><b>Calcular pendiente del terreno</b></translation>
+        <translation><b>Calcular el Pendent del Terreny</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="63"/>
         <source>Calculate slope of the terrain based on loaded DEM files.</source>
-        <translation>Calcular pendiente del terreno en base a los DEM cargados.</translation>
+        <translation>Calcular el pendent d'un terrent basant-se en fitxers DEM carregats.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="70"/>
@@ -6467,221 +6828,238 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
     <message>
         <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="31"/>
         <source>FIT decoding error: Decoder not in correct state %1 after last data byte in file.</source>
-        <translation>Error decodificando FIT: El decodificador no está en el estado correcto %1 después del último byte de datos en el archivo.</translation>
+        <translation>Error decodificant FIT: L'estat del decodificador no és correcte %1 després del darrer byte del fitxer.</translation>
     </message>
     <message>
         <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="124"/>
         <source>FIT decoding error: a development field with the field_definition_number %1 already exists.</source>
-        <translation>Error decodificando FIT: Ya existe un campo con el número de definición %1.</translation>
+        <translation>Error decodificant FIT: ja existeix un camp de desenvolupament amb field_definition_number %1.</translation>
+    </message>
+</context>
+<context>
+    <name>IGisDatabase</name>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="59"/>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="64"/>
+        <source>Age</source>
+        <translation>Edat</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="97"/>
+        <source>To add a database do a right click on the database list above.</source>
+        <translation>Per afegir una base de dades feu clic en el botó dret sobre la llista de bases de dades.</translation>
     </message>
 </context>
 <context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="44"/>
+        <location filename="../gis/IGisItem.cpp" line="45"/>
         <source>[no name]</source>
-        <translation>[sin nombre]</translation>
+        <translation>[sense nom]</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>The item is not part of the project in the database.</source>
-        <translation>El elemento no forma parte del proyecto en la base de datos.</translation>
+        <translation>L'element no forma part del projecte a la base de dades.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="317"/>
+        <location filename="../gis/IGisItem.cpp" line="318"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation>
-Es un elemento nuevo o ha sido eliminado en la base de datos por otra persona</translation>
+Es tracta d'un element nou o bé algú l'ha esborrat de la base de dades.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="323"/>
+        <location filename="../gis/IGisItem.cpp" line="324"/>
         <source>The item is not in the database.</source>
-        <translation>El elemento no está en la base de datos</translation>
+        <translation>L'element no existeix a la base de dades.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="329"/>
+        <location filename="../gis/IGisItem.cpp" line="330"/>
         <source>The item might need to be saved</source>
-        <translation>Es posible que deba guardar el elemento</translation>
+        <translation>És possible que s'hagi de desar l'element</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="413"/>
+        <location filename="../gis/IGisItem.cpp" line="414"/>
         <source>Initial version.</source>
-        <translation>Versión inicial</translation>
+        <translation>Versió inicial.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="529"/>
+        <location filename="../gis/IGisItem.cpp" line="534"/>
+        <source>Never ask again.</source>
+        <translation>No tornar-ho a preguntar.</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="535"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
-        <translation><h3>%1</h3> Posiblemente este elemento es de sólo lectura porque no lo creó QMapShack. Por lo general no es conveniente cambiar los datos importados. Pero si piensa que esta bien, presione 'Ok'.</translation>
+        <translation><h3>%1</h3> Aquest element probablement és sols de lectura perquè no es va crear amb QMapShack. Normalment no voldreu canviar les dades importades. Però si ho heu de fer premeu 'Ok'.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="530"/>
+        <location filename="../gis/IGisItem.cpp" line="536"/>
         <source>Read Only Mode...</source>
-        <translation>Modo Sólo Lectura...</translation>
+        <translation>Mode de només lectura...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="700"/>
-        <location filename="../gis/IGisItem.cpp" line="753"/>
+        <location filename="../gis/IGisItem.cpp" line="713"/>
+        <location filename="../gis/IGisItem.cpp" line="766"/>
         <source><h4>Description:</h4></source>
-        <translation><h4>Descripción:</h4></translation>
+        <translation><h4>Descripció:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="703"/>
-        <location filename="../gis/IGisItem.cpp" line="756"/>
+        <location filename="../gis/IGisItem.cpp" line="716"/>
+        <location filename="../gis/IGisItem.cpp" line="769"/>
         <source><p>--- no description ---</p></source>
-        <translation><p>---sin descripción---</p></translation>
+        <translation><p>--- sense descripció ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="714"/>
+        <location filename="../gis/IGisItem.cpp" line="727"/>
         <source><h4>Comment:</h4></source>
-        <translation><h4>Comentario:</h4></translation>
+        <translation><h4>Comentari:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="717"/>
+        <location filename="../gis/IGisItem.cpp" line="730"/>
         <source><p>--- no comment ---</p></source>
-        <translation><p>--- Sin comentario ---</p></translation>
+        <translation><p>--- sense comentari ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="728"/>
-        <location filename="../gis/IGisItem.cpp" line="767"/>
+        <location filename="../gis/IGisItem.cpp" line="741"/>
+        <location filename="../gis/IGisItem.cpp" line="780"/>
         <source><h4>Links:</h4></source>
-        <translation><h4>Enlaces:</h4></translation>
+        <translation><h4>Enllaços:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="731"/>
-        <location filename="../gis/IGisItem.cpp" line="770"/>
+        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="783"/>
         <source><p>--- no links ---</p></source>
-        <translation><p>--- sin enlaces ---</p></translation>
+        <translation><p>--- sense enllaços ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Edit name...</source>
-        <translation>Editar nombre...</translation>
+        <translation>Edita el nom...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Enter new %1 name.</source>
-        <translation>Introducir nuevo nombre de %1</translation>
+        <translation>Introduir el Nou nom per a %1.</translation>
     </message>
 </context>
 <context>
     <name>IGisProject</name>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source>Save project?</source>
-        <translation>¿Guardar proyecto?</translation>
+        <translation>Desar el projecte?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source><h3>%1</h3>The project was changed. Save before closing it?</source>
-        <translation><h3>%1</h3>Ha habido cambios en el proyecto. ¿Guardar antes de cerrar?</translation>
+        <translation><h3>%1</h3>El projecte ha canviat. El voleu desar abans de tancar-lo?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="356"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="375"/>
         <source>%1: Correlate tracks and waypoints.</source>
-        <translation>%1: Correlacionar tracks y waypoints</translation>
+        <translation>%1: Correlacionar tracks i fites.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="366"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="385"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
-        <translation><h3>%1</h3>¿Desea omitir la correlación de pistas y waypoints para este proyecto en el futuro?</translation>
+        <translation><h3>%1</h3>Va ser massa llarg per a tu? Per a d'altres cops, vols ometre en aquest projecte la correlació dels tracks i les fites?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="367"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="386"/>
         <source>Canceled correlation...</source>
-        <translation>Correlación cancelada</translation>
+        <translation>Correlació cancel·lada...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="412"/>
-        <location filename="../gis/prj/IGisProject.cpp" line="469"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="431"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="488"/>
         <source>Save "%1" to...</source>
-        <translation>Guardar "%1" como...</translation>
+        <translation>Desa "%1" a...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="554"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="573"/>
         <source><br/>
 Filename: %1</source>
         <translation><br/>
-Nombre de archivo %1</translation>
+Nom del fitxer: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="559"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="578"/>
         <source>Waypoints: %1</source>
-        <translation>Waypoints: %1</translation>
+        <translation>Fites: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="563"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="582"/>
         <source>Tracks: %1</source>
         <translation>Tracks: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="567"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="586"/>
         <source>Routes: %1</source>
-        <translation>Rutas: %1</translation>
+        <translation>Itineraris: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="571"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="590"/>
         <source>Areas: %1</source>
-        <translation>Áreas: %1</translation>
+        <translation>Àrees: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="691"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="733"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
-        <translation>¿Desea realmente eliminar '%1' del proyecto '%2'?</translation>
+        <translation>Esteu segur que voleu suprimir '%1' del projecte '%2'?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="692"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="734"/>
         <source>Delete...</source>
-        <translation>Borrar...</translation>
+        <translation>Suprimir...</translation>
     </message>
 </context>
 <context>
-    <name>IGisWidget</name>
+    <name>IGisWorkspace</name>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="14"/>
+        <location filename="../gis/IGisWorkspace.ui" line="14"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="43"/>
+        <location filename="../gis/IGisWorkspace.ui" line="43"/>
         <source>Opacity</source>
-        <translation>Opacidad</translation>
+        <translation>Opacitat</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="50"/>
+        <location filename="../gis/IGisWorkspace.ui" line="50"/>
         <source>Change the opacity of all GIS Items on the map.</source>
-        <translation>Cambiar opacidad para todos los elementos GIS del mapa</translation>
+        <translation>Canvia l'opacitat de tots els elements GIS del kapa.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="66"/>
+        <location filename="../gis/IGisWorkspace.ui" line="66"/>
         <source>Filter</source>
-        <translation>Filtro</translation>
+        <translation>Filtre</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="116"/>
-        <location filename="../gis/IGisWidget.ui" line="146"/>
+        <location filename="../gis/IGisWorkspace.ui" line="116"/>
         <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="151"/>
-        <source>Age</source>
-        <translation>Edad</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="185"/>
-        <source>To add a database do a right click on the database list above.</source>
-        <translation>Para añadir una base de datos haga click-derecho en el espacio superior.  </translation>
+        <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="205"/>
+        <location filename="../gis/IGisWorkspace.ui" line="129"/>
         <source>Clear Filter</source>
-        <translation>Borrar filtro</translation>
+        <translation>Neteja el Filtre</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <location filename="../gis/IGisWorkspace.ui" line="138"/>
         <source>Setup Filter</source>
-        <translation>Configurar filtro</translation>
+        <translation>Configura el Filtre</translation>
     </message>
 </context>
 <context>
@@ -6689,17 +7067,17 @@ Nombre de archivo %1</translation>
     <message>
         <location filename="../grid/IGridSetup.ui" line="14"/>
         <source>Setup Grid...</source>
-        <translation>Configurar Malla...</translation>
+        <translation>Configurar Graella...</translation>
     </message>
     <message>
         <location filename="../grid/IGridSetup.ui" line="22"/>
         <source>Projection</source>
-        <translation>Proyección</translation>
+        <translation>Projecció</translation>
     </message>
     <message>
         <location filename="../grid/IGridSetup.ui" line="37"/>
         <source>restore default</source>
-        <translation>restaurar valores predeterminados</translation>
+        <translation>restaura valor per defecte</translation>
     </message>
     <message>
         <location filename="../grid/IGridSetup.ui" line="40"/>
@@ -6712,22 +7090,22 @@ Nombre de archivo %1</translation>
     <message>
         <location filename="../grid/IGridSetup.ui" line="63"/>
         <source>Get projection from current map.</source>
-        <translation>Obtener la proyección desde el mapa actual.</translation>
+        <translation>Obtenir la projecció del mapa actual.</translation>
     </message>
     <message>
         <location filename="../grid/IGridSetup.ui" line="89"/>
         <source>projection wizzard</source>
-        <translation>asistente de proyección</translation>
+        <translation>assistent de projecció</translation>
     </message>
     <message>
         <location filename="../grid/IGridSetup.ui" line="130"/>
         <source>Grid color</source>
-        <translation>Color de la malla</translation>
+        <translation>Color de la Graella</translation>
     </message>
     <message>
         <location filename="../grid/IGridSetup.ui" line="143"/>
         <source>setup grid color</source>
-        <translation>Configurar el color de la malla</translation>
+        <translation>configurar el color de la graella</translation>
     </message>
 </context>
 <context>
@@ -6735,12 +7113,18 @@ Nombre de archivo %1</translation>
     <message>
         <location filename="../tool/IImportDatabase.ui" line="14"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <location filename="../tool/IImportDatabase.ui" line="22"/>
+        <location filename="../tool/IImportDatabase.ui" line="63"/>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../tool/IImportDatabase.ui" line="45"/>
         <source>Source Database:</source>
-        <translation>Origen de Base de datos:</translation>
+        <translation>Base de Dades origen:</translation>
     </message>
     <message>
         <location filename="../tool/IImportDatabase.ui" line="52"/>
@@ -6749,20 +7133,14 @@ Nombre de archivo %1</translation>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../tool/IImportDatabase.ui" line="22"/>
-        <location filename="../tool/IImportDatabase.ui" line="63"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../tool/IImportDatabase.ui" line="86"/>
         <source>Target Database:</source>
-        <translation>Destino de Base de Datos:</translation>
+        <translation>Base de Dades destí:</translation>
     </message>
     <message>
         <location filename="../tool/IImportDatabase.ui" line="102"/>
         <source>Start</source>
-        <translation>Comenzar</translation>
+        <translation>Inici</translation>
     </message>
 </context>
 <context>
@@ -6770,20 +7148,20 @@ Nombre de archivo %1</translation>
     <message>
         <location filename="../helpers/IInputDialog.ui" line="14"/>
         <source>Edit...</source>
-        <translation>Editar...</translation>
+        <translation>Edita...</translation>
     </message>
     <message>
         <location filename="../helpers/IInputDialog.ui" line="20"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
 </context>
 <context>
     <name>ILineOp</name>
     <message>
-        <location filename="../mouse/line/ILineOp.cpp" line="212"/>
+        <location filename="../mouse/line/ILineOp.cpp" line="279"/>
         <source>Routing</source>
-        <translation>Enrutamiento</translation>
+        <translation>Enrutament</translation>
     </message>
 </context>
 <context>
@@ -6791,17 +7169,17 @@ Nombre de archivo %1</translation>
     <message>
         <location filename="../helpers/ILinksDialog.ui" line="14"/>
         <source>Links...</source>
-        <translation>Enlaces...</translation>
+        <translation>Enllaços...</translation>
     </message>
     <message>
         <location filename="../helpers/ILinksDialog.ui" line="23"/>
         <source>Type</source>
-        <translation>Tipo</translation>
+        <translation>Tipus</translation>
     </message>
     <message>
         <location filename="../helpers/ILinksDialog.ui" line="28"/>
         <source>Text</source>
-        <translation>Texto</translation>
+        <translation>Text</translation>
     </message>
     <message>
         <location filename="../helpers/ILinksDialog.ui" line="33"/>
@@ -6825,386 +7203,401 @@ Nombre de archivo %1</translation>
     <message>
         <location filename="../IMainWindow.ui" line="63"/>
         <source>File</source>
-        <translation>Archivo</translation>
+        <translation>Fitxer</translation>
     </message>
     <message>
         <location filename="../IMainWindow.ui" line="80"/>
         <source>View</source>
-        <translation>Ver</translation>
+        <translation>Vista</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="103"/>
+        <location filename="../IMainWindow.ui" line="104"/>
         <source>Window</source>
-        <translation>Ventana</translation>
+        <translation>Finestra</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="113"/>
+        <location filename="../IMainWindow.ui" line="114"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="121"/>
-        <source>Project</source>
-        <translation>Proyecto</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="132"/>
+        <location filename="../IMainWindow.ui" line="133"/>
         <source>Tool</source>
-        <translation>Herramientas</translation>
+        <translation>Eina</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="157"/>
+        <location filename="../IMainWindow.ui" line="152"/>
         <source>Maps</source>
-        <translation>Mapas</translation>
+        <translation>Mapes</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="200"/>
+        <location filename="../IMainWindow.ui" line="189"/>
         <source>Dig. Elev. Model (DEM)</source>
-        <translatorcomment>la traducción literal "Modelo Digital del Terreno " es demasiado larga para el titulo de las pestaña, y hace que se oculten otras pestañas. Por ello  se ha sustituido por su abreviatura "MDT" de uso frecuente, y también empleada por el IGN</translatorcomment>
-        <translation>MDT (DEM)</translation>
+        <translation>Model Dig. Elev. (DEM)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="239"/>
-        <source>Data</source>
-        <translation>Datos</translation>
+        <location filename="../IMainWindow.ui" line="122"/>
+        <location filename="../IMainWindow.ui" line="222"/>
+        <source>Workspace</source>
+        <translation>Espai de treball</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="257"/>
-        <source>Route</source>
-        <translation>Ruta</translation>
+        <location filename="../IMainWindow.ui" line="231"/>
+        <source>Toolbar</source>
+        <translation>Barra d'eines</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="287"/>
-        <source>Toolbar</source>
-        <translation>Barra de herramientas</translation>
+        <location filename="../IMainWindow.ui" line="257"/>
+        <source>Routing</source>
+        <translation>Enrutament</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="302"/>
-        <location filename="../IMainWindow.ui" line="305"/>
+        <location filename="../IMainWindow.ui" line="276"/>
+        <location filename="../IMainWindow.ui" line="279"/>
         <source>Add Map View</source>
-        <translation>Añadir Vista de Mapa</translation>
+        <translation>Afegir Vista de Mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="308"/>
+        <location filename="../IMainWindow.ui" line="282"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="323"/>
+        <location filename="../IMainWindow.ui" line="297"/>
         <source>Show Scale</source>
-        <translation>Mostrar Escala</translation>
+        <translation>Mostra l'Escala</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="335"/>
+        <location filename="../IMainWindow.ui" line="309"/>
         <source>Setup Map Font</source>
-        <translation>Configurar Fuente del Mapa</translation>
+        <translation>Configurar el Tipus de Lletra del Mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="350"/>
+        <location filename="../IMainWindow.ui" line="324"/>
         <source>Show Grid</source>
-        <translation>Mostrar Malla</translation>
+        <translation>Mostra la Graella</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="353"/>
+        <location filename="../IMainWindow.ui" line="327"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="365"/>
+        <location filename="../IMainWindow.ui" line="339"/>
         <source>Setup Grid</source>
-        <translation>Configurar Malla</translation>
+        <translation>Configurar Graella</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="368"/>
+        <location filename="../IMainWindow.ui" line="342"/>
         <source>Ctrl+Alt+G</source>
         <translation>Ctrl+Alt+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="383"/>
+        <location filename="../IMainWindow.ui" line="357"/>
         <source>Flip Mouse Wheel</source>
-        <translation>Invertir la Rueda del Ratón</translation>
+        <translation>Gira la Roda del Ratolí</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="395"/>
-        <location filename="../IMainWindow.ui" line="398"/>
+        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="372"/>
         <source>Setup Map Paths</source>
-        <translation>Configurar Rutas de Mapas</translation>
+        <translation>Configurar els Camins a Mapes</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="413"/>
+        <location filename="../IMainWindow.ui" line="387"/>
         <source>POI Text</source>
-        <translation>Texto del POI</translation>
+        <translation>Text del PI</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="428"/>
+        <location filename="../IMainWindow.ui" line="402"/>
         <source>Night / Day</source>
-        <translation>Noche / Día</translation>
+        <translation>Nit / Dia</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="443"/>
+        <location filename="../IMainWindow.ui" line="417"/>
         <source>Map Tool Tip</source>
-        <translation>Mostrar descripción emergente en los Mapas</translation>
+        <translation>Consell Eina Mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="446"/>
+        <location filename="../IMainWindow.ui" line="420"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="458"/>
+        <location filename="../IMainWindow.ui" line="432"/>
         <source>Setup DEM Paths</source>
-        <translation>Configurar Rutas a los DEM</translation>
+        <translation>Configurar els Camins a DEM</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="470"/>
+        <location filename="../IMainWindow.ui" line="444"/>
         <source>About</source>
-        <translation>Acerca de</translation>
+        <translation>Quant a</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="482"/>
+        <location filename="../IMainWindow.ui" line="456"/>
         <source>Help</source>
-        <translation>Ayuda</translation>
+        <translation>Ajuda</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="485"/>
+        <location filename="../IMainWindow.ui" line="459"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="497"/>
-        <location filename="../IMainWindow.ui" line="500"/>
+        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="474"/>
         <source>Setup Map View</source>
-        <translation>Configurar Vista de Mapa</translation>
+        <translation>Configurar la Vista Mapa</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="486"/>
+        <source>Load GIS Data</source>
+        <translation>Carregar Dades GIS</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="489"/>
+        <source>Load projects from file</source>
+        <translation>Carregar projectes des d'un fitxer</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="492"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="504"/>
+        <source>Save All GIS Data</source>
+        <translation>Desa totes les dades GIS</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="507"/>
+        <source>Save all projects in the workspace</source>
+        <translation>Desa tots els projectes existents a l'espai de treball</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="510"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="522"/>
+        <source>Setup Time Zone</source>
+        <translation>Configurar la Zona Horària</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="534"/>
+        <source>Add empty project</source>
+        <translation>Afegir un projecte buit</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="549"/>
+        <source>Search Google</source>
+        <translation>Cerca a Google</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="561"/>
+        <source>Close all projects</source>
+        <translation>Tancar tots els projectes</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="564"/>
+        <source>F8</source>
+        <translation>F8</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="576"/>
+        <source>Setup Units</source>
+        <translation>Configurar Unitats</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="588"/>
+        <source>Setup Workspace</source>
+        <translation>Configuració de l'espai de treball</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="591"/>
+        <source>Setup save on exit.</source>
+        <translation>Desa la configuració en sortir.</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="603"/>
+        <source>Import Database from QLandkarte</source>
+        <translation>Importar Base de Dades de QLandkarte</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="606"/>
+        <source>Import QLandkarte GT database</source>
+        <translation>Importar base de dades QLandkarte GT</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="644"/>
+        <location filename="../IMainWindow.ui" line="618"/>
         <source>VRT Builder</source>
-        <translation>Asistente VRT</translation>
+        <translation>Creador de VRT</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="647"/>
+        <location filename="../IMainWindow.ui" line="621"/>
         <source>GUI front end to gdalbuildvrt</source>
-        <translation>GUI front end para gdalbuildvrt</translation>
+        <translation>Frontal GUI per a gdalbuildvrt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="659"/>
+        <location filename="../IMainWindow.ui" line="633"/>
         <source>Store Map View</source>
-        <translation>Guardar vista de mapa</translation>
+        <translation>Desa la Vista Mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="662"/>
+        <location filename="../IMainWindow.ui" line="636"/>
         <source>Write current active map and DEM list including the properties to a file</source>
-        <translation>Guardar en un archivo el mapa activo actual y la lista de DEM's incluyendo sus propiedades</translation>
+        <translation>Escriu a un fitxer el mapa actual i la llista de DEM, incloent les propietats</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="674"/>
+        <location filename="../IMainWindow.ui" line="648"/>
         <source>Load Map View</source>
-        <translation>Cargar vista de mapa</translation>
+        <translation>Carregar Vista Mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="677"/>
+        <location filename="../IMainWindow.ui" line="651"/>
         <source>Restore view with active map and DEM list including the properties from a file</source>
-        <translation>Restaurar vista de mapa activo y lista de DEM's incluyendo sus propiedades desde un archivo</translation>
+        <translation>Restaura d'un fitxer la vista activa amb el mapa actual i la llista de DEM, incloent les propietats</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="692"/>
+        <location filename="../IMainWindow.ui" line="666"/>
         <source>Ext. Profile</source>
-        <translation>Perfil en ventana externa</translation>
+        <translation>Perfil Ext.</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="695"/>
+        <location filename="../IMainWindow.ui" line="669"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="707"/>
+        <location filename="../IMainWindow.ui" line="681"/>
         <source>Close</source>
-        <translation>Cerrar</translation>
+        <translation>Tanca</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="710"/>
+        <location filename="../IMainWindow.ui" line="684"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="722"/>
+        <location filename="../IMainWindow.ui" line="696"/>
         <source>Clone Map View</source>
-        <translation>Duplicar vista de mapa</translation>
+        <translation>Clona la Vista Mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="725"/>
+        <location filename="../IMainWindow.ui" line="699"/>
         <source>Ctrl+Shift+T</source>
         <translation>Ctrl+Shift+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="737"/>
+        <location filename="../IMainWindow.ui" line="711"/>
         <source>Create Routino Database</source>
-        <translation>Crear base de datos de Routino</translation>
+        <translation>Crea una Base de Dades Routino</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="749"/>
+        <location filename="../IMainWindow.ui" line="723"/>
         <source>Save(Print) Map Screenshot</source>
-        <translation>Guardar/Imprimir captura de pantalla de mapa</translation>
+        <translation>Desa(Imprimeix) la captura de pantalla</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="752"/>
+        <location filename="../IMainWindow.ui" line="726"/>
         <source>Print a selected area of the map</source>
-        <translation>Imprimir area seleccionada del mapa</translation>
+        <translation>Imprimir l'brea seleccionada del mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="755"/>
+        <location filename="../IMainWindow.ui" line="729"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="767"/>
+        <location filename="../IMainWindow.ui" line="741"/>
         <source>Setup Coord. Format</source>
-        <translation>Configurar formato de coordenadas</translation>
+        <translation>Configurar el Format de Coord.</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="770"/>
+        <location filename="../IMainWindow.ui" line="744"/>
         <source>Change the format coordinates are displayed</source>
-        <translation>Cambiar el formato de coordenadas que se muestran</translation>
+        <translation>Canviar el format en que es mostren les coordenades</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="782"/>
+        <location filename="../IMainWindow.ui" line="756"/>
         <source>Setup Map Background</source>
-        <translation>Configuración del Mapa de Fondo</translation>
+        <translation>Configurar el Fons del Mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="794"/>
+        <location filename="../IMainWindow.ui" line="768"/>
         <source>Setup Waypoint Icons</source>
-        <translation>Configurar iconos de Waypoint</translation>
+        <translation>Configura les Icones de les Fites</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="797"/>
+        <location filename="../IMainWindow.ui" line="771"/>
         <source>Setup path to custom icons</source>
-        <translation>Configurar ruta de iconos personalizados</translation>
+        <translation>Configurar el Camí a les Icones Personalitzades</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="806"/>
+        <location filename="../IMainWindow.ui" line="780"/>
         <source>Close Tab</source>
-        <translation>Cerrar pestaña</translation>
+        <translation>Tanca la Pestanya</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="809"/>
+        <location filename="../IMainWindow.ui" line="783"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="818"/>
+        <location filename="../IMainWindow.ui" line="792"/>
         <source>Quickstart Help</source>
-        <translation>Guia de inicio rápido</translation>
+        <translation> Ajuda d'inici ràpid</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="827"/>
+        <location filename="../IMainWindow.ui" line="801"/>
         <source>Setup Toolbar</source>
-        <translation>Configurar barra de herramientas</translation>
+        <translation>Configurar la Barra d'Eines</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="839"/>
+        <location filename="../IMainWindow.ui" line="813"/>
         <source>Toggle Docks</source>
-        <translation>Panel de herramientas</translation>
+        <translation>Commuta Acoblador</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="842"/>
+        <location filename="../IMainWindow.ui" line="816"/>
         <source>Toggle visibility of dockable windows</source>
-        <translation>Ver panel de herramientas</translation>
+        <translation>Commutar la visivilitat de la finestra acoblable</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="845"/>
+        <location filename="../IMainWindow.ui" line="819"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="854"/>
+        <location filename="../IMainWindow.ui" line="828"/>
         <source>Full Screen</source>
         <translation>Pantalla Completa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="857"/>
+        <location filename="../IMainWindow.ui" line="831"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="512"/>
-        <source>Load GIS Data</source>
-        <translation>Cargar Datos GIS</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="515"/>
-        <source>Load projects from file</source>
-        <translation>Cargar proyectos desde archivo</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="518"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="530"/>
-        <source>Save All GIS Data</source>
-        <translation>Guardar todos los Datos GIS</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="533"/>
-        <source>Save all projects in the workspace</source>
-        <translation>Guardar todos los proyectos del espacio de trabajo</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="536"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="548"/>
-        <source>Setup Time Zone</source>
-        <translation>Configurar Zona Horaria</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="560"/>
-        <source>Add empty project</source>
-        <translation>Añadir proyecto vacío</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="575"/>
-        <source>Search Google</source>
-        <translation>Buscar en Google</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="587"/>
-        <source>Close all projects</source>
-        <translation>Cerrar todos los proyectos</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="590"/>
-        <source>F8</source>
-        <translation>F8</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="602"/>
-        <source>Setup Units</source>
-        <translation>Configurar Unidades</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="614"/>
-        <source>Setup Workspace</source>
-        <translation>Configurar Espacio de trabajo</translation>
+        <location filename="../IMainWindow.ui" line="843"/>
+        <source>Min./Max. Track Values</source>
+        <translation>Mín./Màx. Valors del Track</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="617"/>
-        <source>Setup save on exit.</source>
-        <translation>Guardar configuración al salir.</translation>
+        <location filename="../IMainWindow.ui" line="846"/>
+        <source>Show the minimum and maximum values of the track properties along the track in the map view.</source>
+        <translation>En la vista de mapa, al llarg de tot el track, mostrar els valors màxims i mínims de les propietats del track.</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="629"/>
-        <source>Import Database from QLandkarte</source>
-        <translation>Importar base de datos de Qlandkarte</translation>
+        <location filename="../IMainWindow.ui" line="849"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="632"/>
-        <source>Import QLandkarte GT database</source>
-        <translation>Importar base de datos de QLandKarteGT</translation>
+        <location filename="../IMainWindow.ui" line="245"/>
+        <source>Database</source>
+        <translation>Base de Dades</translation>
     </message>
 </context>
 <context>
@@ -7212,24 +7605,24 @@ Nombre de archivo %1</translation>
     <message>
         <location filename="../map/IMapList.ui" line="14"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="103"/>
         <source>To add maps use <b>File->Setup Map Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
-        <translation>Para añadir mapas haga<b>Archivo->Configurar rutas de mapas</b>.  O haga clic <a href='setup'><b>aqui</b></a></translation>
+        <translation>Per afegir mapes feu <b>Fitxer->Configurar Camins a Mapes</b>.  O feu clic <a href='setup'><b>aquí</b></a></translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="116"/>
         <source>Use the context menu (right mouse button click on entry) to activate a map. Use drag-n-drop to move the activated map in the draw order. </source>
-        <translation>Use el menú contextual (botón derecho del ratón, y seleccione) para activar un mapa. Use arrastrar y soltar para mover el mapa activado en el orden de dibujado. </translation>
+        <translation>Utilitza el menú contextual (clic al botó dret del ratolí o entrada) per activar un mapa. Utilitzar arrossega I deixa anar per a moure el mapa activat en el procés de dibuix. </translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="129"/>
         <source>Help! I want maps!
 I don't want to read the documentation!</source>
-        <translation>Quiero mapas
-No quiero leer la documentación!</translation>
+        <translation>Ajuda! Vull mapes!
+No vull llegir la documentació!</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="149"/>
@@ -7239,27 +7632,27 @@ No quiero leer la documentación!</translation>
     <message>
         <location filename="../map/IMapList.ui" line="158"/>
         <source>Move Up</source>
-        <translation>Subir</translation>
+        <translation>Mou amunt</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="161"/>
         <source>Hide map behind previous map</source>
-        <translation>Ocultar mapa detrás del anterior</translation>
+        <translation>Amagar mapa darrere del mapa anterior</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="170"/>
         <source>Move down</source>
-        <translation>Bajar</translation>
+        <translation>Mou avall</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="173"/>
         <source>Show map on top of next map</source>
-        <translation>Mostrar mapa encima del siguiente</translation>
+        <translation>Mostra el mapa a sobre del següent mapa</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="182"/>
         <source>Reload Maps</source>
-        <translation>Recargar mapas</translation>
+        <translation>Tornar a carregar Mapes</translation>
     </message>
 </context>
 <context>
@@ -7267,7 +7660,7 @@ No quiero leer la documentación!</translation>
     <message>
         <location filename="../map/IMapOnline.cpp" line="41"/>
         <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
-        <translation>Este mapa requiere soporte de OpenSSL. Sin embargo, debido a restricciones legales en algunos países, OpenSSL no se incluye con QMapShack. Puede consultar la página < a href = < https: //www.openssl.org/community/binaries.html '> OpenSSL Homepage</a> Para binarios. Tienes que copiar libeay32.dll y ssleay32.dll en el directorio del programa QMapShack.</translation>
+        <translation>Aquest mapa requereix suport OpenSSL. Tanmateix donades les restriccions legals existents en alguns païssos, OpenSSL no és al paquet de QMapShack. Heu de cercar els binaris a la <a href='https://www.openssl.org/community/binaries.html'>Pàgina inicial de OpenSSL </a>. S'han de copiar a la carpeta del programa QMapShack els fitxers libeay32.dll i ssleay32.dll.</translation>
     </message>
     <message>
         <location filename="../map/IMapOnline.cpp" line="47"/>
@@ -7277,7 +7670,7 @@ No quiero leer la documentación!</translation>
     <message>
         <location filename="../map/IMapOnline.cpp" line="98"/>
         <source><b>%1</b>: %2 tiles pending<br/></source>
-        <translation><b>%1</b>: %2 teselas pendientes<br/></translation>
+        <translation><b>%1</b>: %2 tesel·les pendents<br/></translation>
     </message>
 </context>
 <context>
@@ -7285,12 +7678,18 @@ No quiero leer la documentación!</translation>
     <message>
         <location filename="../map/IMapPathSetup.ui" line="14"/>
         <source>Setup map paths</source>
-        <translation>Configurar rutas de mapas</translation>
+        <translation>Configurar els Camins a Mapes</translation>
     </message>
     <message>
         <location filename="../map/IMapPathSetup.ui" line="20"/>
         <source>Root path of tile cache for online maps:</source>
-        <translation>Carpeta para la caché de mapas online</translation>
+        <translation>Camí arrel de la memòria cau per a les tessel·les dels mapes en línia:</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPathSetup.ui" line="29"/>
+        <location filename="../map/IMapPathSetup.ui" line="154"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
         <location filename="../map/IMapPathSetup.ui" line="36"/>
@@ -7303,14 +7702,8 @@ No quiero leer la documentación!</translation>
         <location filename="../map/IMapPathSetup.ui" line="185"/>
         <source>Help! I want maps!
 I don't want to read the documentation!</source>
-        <translation>¡Quiero mapas!
-¡No quiero ver la documentación!</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPathSetup.ui" line="29"/>
-        <location filename="../map/IMapPathSetup.ui" line="154"/>
-        <source>-</source>
-        <translation>-</translation>
+        <translation>Ajuda! Vull mapes!
+No vull llegir la documentació!</translation>
     </message>
 </context>
 <context>
@@ -7318,17 +7711,17 @@ I don't want to read the documentation!</source>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="14"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="35"/>
         <source><html><head/><body><p>Change opacity of map</p></body></html></source>
-        <translation><html><head/><body><p>Cambiar la opacidad del mapa</p></body></html></translation>
+        <translation><html><head/><body><p>Canvia l'opacitat del mapa</p></body></html></translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="50"/>
         <source><html><head/><body><p>Click to use current scale as minimum scale to display the map.</p></body></html></source>
-        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala mínima a la que mostrar el mapa.</p></body></html></translation>
+        <translation><html><head/><body><p>Click per utilitzar l'escala actual com a escala mínima per a visualitzar el mapa.</p></body></html></translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="53"/>
@@ -7341,32 +7734,42 @@ I don't want to read the documentation!</source>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="74"/>
         <source><html><head/><body><p>Control the range of scale the map is displayed. Use the two buttons left and right to define the actual scale as either minimum or maximum scale.</p></body></html></source>
-        <translation><html><head/><body><p>Controle el rango de escalas para las cuales desea que se muestre el mapa. Use los dos botones a izquierda y derecha para definir la escala actual como bien la escala mínima o máxima para el mapa.</p></body></html></translation>
+        <translation><html><head/><body><p>Controla els intervals de l'escala en que es mostra el mapa. Utilitza els botons esquerra i dreta per a definir l'escala actual i el màxim i mínim de l'escala.</p></body></html></translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="87"/>
         <source><html><head/><body><p>Click to use current scale as maximum scale to display the map.</p></body></html></source>
-        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala máxima a la que mostrar el mapa.</p></body></html></translation>
+        <translation><html><head/><body><p>Click per utilitzar l'escala actual com a escala màxima per a visualitzar el mapa. </p></body></html></translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="139"/>
         <source>Areas</source>
-        <translation>Áreas</translation>
+        <translation>Àrees</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="146"/>
         <source>Lines</source>
-        <translation>Líneas</translation>
+        <translation>Línies</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="153"/>
         <source>Points</source>
-        <translation>Puntos</translation>
+        <translation>Punts</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="170"/>
         <source>Details</source>
-        <translation>Detalle</translation>
+        <translation>Detalls</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="227"/>
+        <source>Cache Size (MB)</source>
+        <translation>Mida de la memòria cau (MB)</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="247"/>
+        <source>Expiration (Days)</source>
+        <translation>Venciment (Dies)</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="264"/>
@@ -7376,32 +7779,22 @@ I don't want to read the documentation!</source>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="271"/>
         <source>Cache Path</source>
-        <translation>Carpeta Caché</translation>
+        <translation>Camí a la Memòria Cau</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="353"/>
         <source>Type File:</source>
-        <translation>Archivo TYP:</translation>
+        <translation>Tipus de fitxer:</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="367"/>
         <source>Forget external type file and use internal types.</source>
-        <translation>Olvidar TYP externo y utilizar el interno.</translation>
+        <translation>Oblida els tipus de fitxer externs i utilitza els propis.</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="381"/>
         <source>Load an external type file.</source>
-        <translation>Cargar un archivo TYP externo.</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="227"/>
-        <source>Cache Size (MB)</source>
-        <translation>Tamaño de Caché (MiB)</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="247"/>
-        <source>Expiration (Days)</source>
-        <translation>Caducidad (Días)</translation>
+        <translation>Carregar un tipus de fitxer extern.</translation>
     </message>
 </context>
 <context>
@@ -7409,51 +7802,59 @@ I don't want to read the documentation!</source>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="14"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
         <source>Advanced Options</source>
-        <translation>Opciones Avanzadas</translation>
+        <translation>Opcions Avançades</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
         <source>Source No Data (-srcnodata)</source>
-        <translation>No Data origen (-srcnodata)</translation>
+        <translation>Sense font de Dades (-srcnodata)</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="46"/>
         <source>Target No Data (-vrtnodata)</source>
-        <translation>No Data salida  (-vrtnodata)</translation>
+        <translation>Sense Dades Destí (-vrtnodata)</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="56"/>
         <source>Target Projection (-a_srs)</source>
-        <translation>Proyección/Datum (-a_srs)</translation>
+        <translation>Projecció Objectiu (-a_srs)</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="63"/>
         <source>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</source>
-        <translation>Estas opciones son para casos particulares y normalmente se dejan en blanco. Consulta la <a href='http://www.gdal.org/gdalbuildvrt.html'>ayuda</a> de GDAL para más información.</translation>
+        <translation>Aquestes opcions s'utilitzen en casos molt puntuals, normalment s'han de deixar en blanc. Veure GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Ajuda</a> per a obtenir més informació.</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
-        <source>1. Select one or multiple source files.
-2. Select a file name for the target VRT file.
-3. Press "Start" button.
+        <source><ol>
+<li>Select one or multiple source files.</li>
+<li>Select a file name for the target VRT file.</li>
+<li>Press "Start" button.</li>
+</ol>
 
 Tip:
-* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
-* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
-* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
-        <translation>1. Selecciona uno o varios ficheros de origen
-2. Selecciona el nombre y la ubicación para el fichero VRT de salida 
-3. Pulsa en "Comenzar"
+<ul>
+<li>If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.</li>
+<li>Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.</li>
+<li>The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</li>
+</ul></source>
+        <translation><ol>
+<li>Selecciona una o múltiples fonts de fitxers *.pbf .</li>
+<li>Selecciona un nom per al fitxer VRT destí.</li>
+<li>Prem el botó "Inicia".</li>
+</ol>
 
-Notas:
-* Es posible mantener los ficheros de origen en una subcarpeta y generar el fichero VRT de salida en otra carpeta diferente, como tu carpeta raíz de mapas.
-* Usa las opciones avanzadas  para asignar un valor "no data" si los ficheros de origen carecen del mismo y no forman un área rectangular. Las áreas no cubiertas por el mapa se harán transparentes.
-* La opción avanzada "-a_srs" sirve para asignar una Proyección/Datum cuando el fichero de origen carece de ella, ...pero NO reproyecta los datos.</translation>
+Consell:
+<ul>
+<li>Si tens diversos fitxers posa'ls en una subcarpeta del camí a la carpeta de mapes. Crea el fitxer VRT al camí a la carpeta de mapes.</li>
+<li>Utilitza les opcions avançades per afegir un valor "sense dades" si els fitxers origen no tenen dades o no tenen una forma de mapa rectangular. Les àrees sense fitxer de mapa es veuran transparents.</li>
+<li>Les opcions "-a_srs" s'utilitzen per assignar una Projecció/Datum si els fitxers origen no en tenen. Aquestes opcions NO re-projecten les dades.</li>
+</ul></translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
@@ -7464,12 +7865,12 @@ Notas:
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="156"/>
         <source>Select source files:</source>
-        <translation>Seleccionar ficheros de origen:</translation>
+        <translation>Selecciona els fitxers origen:</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="121"/>
         <source>Target Filename:</source>
-        <translation>Fichero VRT de salida:</translation>
+        <translation>Fitxer Destí:</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="128"/>
@@ -7479,7 +7880,7 @@ Notas:
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="20"/>
         <source>Start</source>
-        <translation>Comenzar</translation>
+        <translation>Inici</translation>
     </message>
 </context>
 <context>
@@ -7487,67 +7888,67 @@ Notas:
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="249"/>
         <source><b>New Line</b><br/>Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.<br/></source>
-        <translation><b>Nuevo trazado</b><br/>Mueva el ratón y pulse el botón izquierdo para crear puntos. Puede alternar el modo de dibujo con los botones de herraminetas (O,A,V) sin interrumpir el trazado. Para terminar pulse botón derecho del ratón.<br/></translation>
+        <translation><b>Nova Línia</b><br/>Mou el ratolí, utilitzar el botó de l'esquerra per a crear punts. Un cop fet fes clic al botó esquerra del ratolí per a finalitzar.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="289"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="300"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
-        <translation><b>Borrar punto</b><br/>Mueva el ratón hasta un punto y pulse el botón izquierdo para eliminarlo.<br/></translation>
+        <translation><b>Suprimir punt</b><br/>Moure el ratolí a prop d'un punt i fer clic al botó esquerra per suprimir-lo.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="297"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="308"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
-        <translation><b>Seleccionar Rango de Puntos</b><br/>Seleccione el punto inicial con el botón izquierdo del raton. Fije el punto final con una segunda pulsacion y elija entre las opciones. El rango seleccionado se marca en verde. Utilice el botón derecho del ratón para cancelar.<br/></translation>
+        <translation><b>Selecció d'un Interval de Punts</b><br/>Inicia la selecció fent clic al botó esquerra sobre el primer punt. Finalitza la selecció fent clic al botó esquerra sobre el segon punt, selecciona les opcions. Per a cancel·lar fes clic al botó dret del ratolí.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="305"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="316"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
-        <translation><b>Mover punto</b><br/>Seleccione el punto con el botón izquierdo del raton y arrastrelo hasta la nueva posición. Suelte el punto con una segunda pulsacion. Utilice el botón derecho del ratón para cancelar.<br/></translation>
+        <translation><b>Moure Punt</b><br/>Mou el ratolí prop del punt i prem el botó esquerra per adherir-l'ho al cursor. Mou el ratolí per a moure el punt. Deixa anar el punt fent clic al botó esquerra. Fes clic al botó dret del ratolí per a cancel·lar.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="313"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
-        <translation><b>Añadir punto</b><br/>Mueva el ratón cerca de una línea y presione el botón izquierdo para agregar un punto. El punto se pegará al cursor y se puede mover.Suelte el punto en la posición deseada con una segunda pulsacion. Utilice el botón derecho del ratón para cancelar..<br/></translation>
+        <translation><b>Afegir Punt</b><br/>Per afegir un punt, mou el ratolí prop de la línia del segment i prem el botó esquerra. El punt s'adherirà al cursor i el podràs moure. Deixa anar el punt fent clic al botó esquerra. Fes clic al botó dret del ratolí per a cancel·lar.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="321"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
-        <translation><b>Sin enrutamiento ni ajuste vectorial</b><br/>Todos los puntos se conectarán con una línea recta.<br/></translation>
+        <translation><b>Sense Enrutament</b><br/>Tots els punts han d'ester connectats amb una línia recte.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="327"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
-        <translation><b>Enrutamiento automático</b><br/>El trazado entre los puntos se calcula automáticamente atendiendo a la configuración actual del enrutador. <b>Nota:</b> El enrutador seleccionado debe ser capaz de trabajar al vuelo,por lo general, solo son capaces de hacerlo los instalados localmente.<br/></translation>
+        <translation><b>Enrutament Automàtic</b><br/>La configuració actual de l'enrutador s'utiliza per a definir una ruta entre punts. <b>Nota:</b> L'enrutador seleccionat permet definir una ruta sobre la marxa. Els enrutadors Sense Connexió normalment permeten fer-ho, els enrutadors en línia no ho permeten.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="343"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
-        <translation><b>Ajuste vectorial</b><br/> El trazado se dibuja ajustandose automáticamente a las lineas de un mapa vectorial.<br/></translation>
+        <translation><b>Enrutament Vectorial</b><br/>Si es possible, connecta punts amb una línia en un mapa vectorial carregat, .<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="504"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="515"/>
         <source><b>%1 Metrics</b></source>
-        <translation><b>Datos %1 </b></translation>
+        <translation><b>%1 Mètrica</b></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="507"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="518"/>
         <source>Distance:</source>
-        <translation>Distancia:</translation>
+        <translation>Distància:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="509"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="520"/>
         <source>Ascent:</source>
-        <translation>Ascenso:</translation>
+        <translation>Ascens:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="511"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="522"/>
         <source>Descent:</source>
-        <translation>Descenso:</translation>
+        <translation>Descens:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.h" line="135"/>
+        <location filename="../mouse/line/IMouseEditLine.h" line="137"/>
         <source><br/><b>Move the map</b><br/>If you keep the left mouse button pressed and move the mouse, you will move the map.<br/><br/></source>
-        <translation><br/><b>Mover el mapa</b><br/>Mantega pulsado el botón izquierdo mientras mueve el ratón, y moverá el mapa.<br/><br/></translation>
+        <translation><br/><b>Moure el mapa</b><br/>Manteniu premut el botó esquerra del ratolí i podreu moure el mapa.<br/><br/></translation>
     </message>
 </context>
 <context>
@@ -7555,7 +7956,7 @@ Notas:
     <message>
         <location filename="../widgets/IPhotoAlbum.ui" line="20"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../widgets/IPhotoAlbum.ui" line="50"/>
@@ -7569,44 +7970,44 @@ Notas:
     <message>
         <location filename="../plot/IPlot.cpp" line="94"/>
         <source>Reset Zoom</source>
-        <translation>Restablecer zoom</translation>
+        <translation>Reinicia Zoom</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="95"/>
         <source>Stop Range</source>
-        <translation>Rango de parada</translation>
+        <translation>Final de l'Interval</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="96"/>
         <source>Save...</source>
-        <translation>Guardar...</translation>
+        <translation>Desa...</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="98"/>
         <source>Add Waypoint</source>
-        <translation>Añadir Waypoint</translation>
+        <translation>Afegir Fita</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="99"/>
         <source>Cut...</source>
-        <translation>Cortar.</translation>
+        <translation>Talla...</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="542"/>
         <source>Hold CTRL key for vertical zoom, only.
 Hold ALT key for horizontal zoom, only.</source>
-        <translation>Pulse tecla CTRL para zoom vertical unicamente.
-Pulse tecla ALT para zoom horizontal unicamente</translation>
+        <translation>Mantenir premuda la tecla CTRL només per zoom vertical.
+Mantenir premuda la tecla ALT només per zoom horitzontal.</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="697"/>
         <source>No or bad data.</source>
-        <translation>Datos incorrectos o inexistentes.</translation>
+        <translation>No hi ha dades o són incorrectes.</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="1298"/>
         <source>Select output file</source>
-        <translation>Seleccione archivo de salida</translation>
+        <translation>Selecciona el fitter de sortida</translation>
     </message>
 </context>
 <context>
@@ -7614,12 +8015,12 @@ Pulse tecla ALT para zoom horizontal unicamente</translation>
     <message>
         <location filename="../helpers/IPositionDialog.ui" line="14"/>
         <source>Position ...</source>
-        <translation>Posición ...</translation>
+        <translation>Posició ...</translation>
     </message>
     <message>
         <location filename="../helpers/IPositionDialog.ui" line="20"/>
         <source>Enter new position</source>
-        <translation>Introduzca la nueva posición</translation>
+        <translation>Introduir la nova posició</translation>
     </message>
     <message>
         <location filename="../helpers/IPositionDialog.ui" line="30"/>
@@ -7627,10 +8028,10 @@ Pulse tecla ALT para zoom horizontal unicamente</translation>
 "[N|S] ddd mm.sss [W|E] ddd mm.sss"
 or
 "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
-        <translation>Formato de posición incorrecto. Debe ser: 
-"[N|S] ggg mm.sss [W|E] ggg mm.sss"
+        <translation>Format amb possicions incorrectes. Ha de ser: 
+"[N|S] ddd mm.sss [W|E] ddd mm.sss"
 o
-"[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
+"[N|S] ddd.ddd [W|E] ddd.ddd"</translation>
     </message>
 </context>
 <context>
@@ -7640,27 +8041,27 @@ o
         <source>Print map...</source>
         <translation>Imprimir mapa...</translation>
     </message>
-    <message>
-        <location filename="../print/IPrintDialog.ui" line="79"/>
-        <source>When printing online maps make sure that the map has been loaded into the cache for the extent to be printed.</source>
-        <translation>Al imprimir mapas en línea asegúrese de que se haya cargado previamente en la memoria caché el mapa correspondiente a la extensión que desea imprimir.</translation>
+    <message>
+        <location filename="../print/IPrintDialog.ui" line="37"/>
+        <source>When saving online maps make sure that the map has been loaded into the cache for the extent to be saved.</source>
+        <translation>En desar mapes en línia, assegureu-vos que tota l'extensió del mapa que vulgueu desar s'ha carregat a la memòria cau.</translation>
     </message>
     <message>
         <location filename="../print/IPrintDialog.ui" line="60"/>
         <source>Save</source>
-        <translation>Guardar</translation>
+        <translation>Desa</translation>
     </message>
     <message>
-        <location filename="../print/IPrintDialog.ui" line="37"/>
-        <source>When saving online maps make sure that the map has been loaded into the cache for the extent to be saved.</source>
-        <translation>Al guardar mapas en línea asegúrese de que el mapa se ha cargado en la memoria caché en la medida en la que desea guardarlo.</translation>
+        <location filename="../print/IPrintDialog.ui" line="79"/>
+        <source>When printing online maps make sure that the map has been loaded into the cache for the extent to be printed.</source>
+        <translation>En imprimir mapes en línia, assegurat que tots els mapes que s'han d'imprimir s'han carregat a la memòria cau.</translation>
     </message>
     <message>
         <location filename="../print/IPrintDialog.ui" line="89"/>
         <location filename="../print/IPrintDialog.ui" line="102"/>
         <location filename="../print/IPrintDialog.ui" line="151"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
     <message>
         <location filename="../print/IPrintDialog.ui" line="118"/>
@@ -7673,13 +8074,13 @@ o
     <message>
         <location filename="../helpers/IProgressDialog.ui" line="14"/>
         <source>Please wait...</source>
-        <translation>Por favor,espere...</translation>
+        <translation>Si us plau, espereu...</translation>
     </message>
     <message>
         <location filename="../helpers/IProgressDialog.ui" line="20"/>
         <location filename="../helpers/IProgressDialog.ui" line="27"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
 </context>
 <context>
@@ -7687,7 +8088,7 @@ o
     <message>
         <location filename="../grid/IProjWizard.ui" line="14"/>
         <source>Proj4 Wizzard</source>
-        <translation>Asistente de Proj4</translation>
+        <translation>Auxiliar Proj4</translation>
     </message>
     <message>
         <location filename="../grid/IProjWizard.ui" line="29"/>
@@ -7707,7 +8108,7 @@ o
     <message>
         <location filename="../grid/IProjWizard.ui" line="82"/>
         <source>user defined</source>
-        <translation>definido por el usuario</translation>
+        <translation>definit per l'usuari</translation>
     </message>
     <message>
         <location filename="../grid/IProjWizard.ui" line="94"/>
@@ -7717,27 +8118,27 @@ o
     <message>
         <location filename="../grid/IProjWizard.ui" line="104"/>
         <source>World Mercator (OSM)</source>
-        <translation>World Mercator (OSM)</translation>
+        <translation>Mercator Mundial (OSM)</translation>
     </message>
     <message>
         <location filename="../grid/IProjWizard.ui" line="124"/>
         <source>Result:</source>
-        <translation>Resultado:</translation>
+        <translation>Resultat:</translation>
     </message>
     <message>
         <location filename="../grid/IProjWizard.ui" line="138"/>
         <source>UPS North (North Pole)</source>
-        <translation>UPS Norte (Polo Norte)</translation>
+        <translation>UPS Nord (Pol Nord)</translation>
     </message>
     <message>
         <location filename="../grid/IProjWizard.ui" line="145"/>
         <source>UPS South (South Pole)</source>
-        <translation>UPS Sur (Polo Sur)</translation>
+        <translation>UPS Sud (Pol Sud)</translation>
     </message>
     <message>
         <location filename="../grid/IProjWizard.ui" line="152"/>
         <source>Projection</source>
-        <translation>Proyección</translation>
+        <translation>Projecció</translation>
     </message>
 </context>
 <context>
@@ -7745,7 +8146,7 @@ o
     <message>
         <location filename="../gis/wpt/IProjWpt.ui" line="14"/>
         <source>Waypoint Projection</source>
-        <translation>Proyección del Waypoint</translation>
+        <translation>Projecció de Fites</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IProjWpt.ui" line="22"/>
@@ -7760,7 +8161,7 @@ o
     <message>
         <location filename="../gis/wpt/IProjWpt.ui" line="54"/>
         <source>Clone waypoint and move by:</source>
-        <translation>Duplicar el waypoint y moverlo:</translation>
+        <translation>Clona la fita i ves-hi:</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IProjWpt.ui" line="66"/>
@@ -7770,7 +8171,7 @@ o
     <message>
         <location filename="../gis/wpt/IProjWpt.ui" line="76"/>
         <source>°</source>
-        <translation>º</translation>
+        <translation>°</translation>
     </message>
 </context>
 <context>
@@ -7778,7 +8179,7 @@ o
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
@@ -7793,7 +8194,7 @@ o
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
         <source>display selected routing profile</source>
-        <translation>Mostrar el perfil de enrutamiento seleccionado</translation>
+        <translation>mostrar el perfil d'itineraris seleccionat</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="67"/>
@@ -7805,7 +8206,7 @@ o
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
         <source>on-the-fly routing</source>
-        <translation>Enrutamiento al vuelo</translation>
+        <translation>enrutament al vol</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
@@ -7815,27 +8216,42 @@ o
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
         <source>not running</source>
-        <translation>Parado</translation>
+        <translation>no s'està executant</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
         <source>start/stop BRouter</source>
-        <translation>iniciar/parar Brouter</translation>
+        <translation>iniciar/parar BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
         <source>show BRouter console</source>
-        <translation>Mostrar consola de BRouter</translation>
+        <translation>Mostra la consola de BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
         <source>Setup</source>
-        <translation>Configuración</translation>
+        <translation>Configurar</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="181"/>
         <source>Caution! BRouter is listening on all ports for connections.</source>
-        <translation>¡Precaución! BRouter está escuchando en todos los puertos para las conexiones.</translation>
+        <translation>Precaució! BRouter està mirant a tots els ports cercant connexions.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="217"/>
+        <source><p><a href="http://brouter.de/brouter/" target="_blank">BRouter</a> © <a href="https://github.com/abrensch/brouter/blob/master/LICENSE" target="_blank">ABrensch, Licence GPLv3</a></p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="227"/>
+        <source><p>Directions Courtesy of <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="237"/>
+        <source><p>Routing data <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a> contributors</p></source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7843,12 +8259,12 @@ o
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
         <source>BRouter Profile</source>
-        <translation>Perfil de BRouter</translation>
+        <translation>Perfil BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
 </context>
 <context>
@@ -7856,37 +8272,37 @@ o
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
         <source>BRouter Setup</source>
-        <translation>Configuración de BRouter</translation>
+        <translation>Configurar BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="48"/>
         <source>choose which BRouter to use</source>
-        <translation>Elija que BRouter usar</translation>
+        <translation>escollir quin BRouter s'utilitzarà</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
         <source>BRouter-Web (online)</source>
-        <translation>BRouter-Web (online)</translation>
+        <translation>BRouter-Web (connectat)</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
         <source>local Installation</source>
-        <translation>Instalación local</translation>
+        <translation>instal·lació local</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
         <source>Expert Mode</source>
-        <translation>Modo experto</translation>
+        <translation>Mode Expert</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
         <source>local BRouter Installation directory:</source>
-        <translation>Carpeta de instalación de BRouter local:</translation>
+        <translation>Directori de la instal·lació local de BRouter:</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
         <source>select installation directory</source>
-        <translation>Seleccionar carpeta de instalación</translation>
+        <translation>selecciona el directori d'instal·lació</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
@@ -7901,32 +8317,32 @@ o
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="119"/>
         <source>labelLocalDirResult</source>
-        <translation type="unfinished"></translation>
+        <translation>labelLocalDirResult</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
         <source>create or update installation</source>
-        <translation>Crear o actualizar instalacion</translation>
+        <translation>crea o modifica la instal·lació</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
         <source>Java Executable</source>
-        <translation>Ejecutable Java</translation>
+        <translation>Java Executable</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
         <source>labelLocalJavaResult</source>
-        <translation type="unfinished"></translation>
+        <translation>labelLocalJavaResult</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
         <source>search for installed java</source>
-        <translation>Buscando Java instalado</translation>
+        <translation>cerca el java instal·lat</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="241"/>
         <source>Download and install BRouter Version</source>
-        <translation>Descargar e instalar BRouter</translation>
+        <translation>Baixar i Instal·lar la Versió BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
@@ -7936,37 +8352,37 @@ o
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
         <source>File to install</source>
-        <translation>Archivo para instalar</translation>
+        <translation>Fitxer a instal·lar</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
         <source>Download and Install</source>
-        <translation>Descargar e instalar</translation>
+        <translation>Baixar i Instal·lar</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
         <source>available Profiles</source>
-        <translation>Perfiles disponibles </translation>
+        <translation>Perfils Disponibles</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
         <source>install profile</source>
-        <translation>Instalar perfil</translation>
+        <translation>Instal·lar perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
         <source>remove profile</source>
-        <translation>Eliminar perfil</translation>
+        <translation>suprimir perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
         <source>installed Profiles</source>
-        <translation>Perfiles instalados</translation>
+        <translation>Perfils instal·lats</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
         <source>content of profile</source>
-        <translation>Contenido del perfil</translation>
+        <translation>contingut del perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
@@ -7976,7 +8392,7 @@ o
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
         <source>Service-URL</source>
-        <translation>Servicio-URL</translation>
+        <translation>Servei-URL</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
@@ -7986,47 +8402,47 @@ o
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
         <source>Hostname</source>
-        <translation>Nombre de Host</translation>
+        <translation>Nom d'amfitrió</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
         <source>Port</source>
-        <translation>Puerto</translation>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
         <source>Profile directory</source>
-        <translation>Carpeta de perfiles</translation>
+        <translation>Directori del Perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
         <source>Segments directory</source>
-        <translation>Carpeta de segmentos</translation>
+        <translation>Directori dels segments</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
         <source>Custom Profiles dir</source>
-        <translation>Carpeta de perfiles personalizados</translation>
+        <translation>Perfils Personalitzats dir</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
         <source>Max Runtime</source>
-        <translation>Tiempo máximo de ejecución </translation>
+        <translation>Màx Temps d'execució</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="621"/>
         <source>Number Threads</source>
-        <translation>Número de hilos</translation>
+        <translation>Nombre de Subprocessos</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
         <source>Java Options</source>
-        <translation>Opciones de Java</translation>
+        <translation>Opcions de Java</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
         <source>Profiles Url</source>
-        <translation>URL de perfiles</translation>
+        <translation>Perfils Url</translation>
     </message>
 </context>
 <context>
@@ -8034,12 +8450,12 @@ o
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="22"/>
         <source>Highways</source>
-        <translation>Autopistas</translation>
+        <translation>Autopistes</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="29"/>
@@ -8049,12 +8465,12 @@ o
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="36"/>
         <source>Language</source>
-        <translation>Lenguaje</translation>
+        <translation>Idioma</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="43"/>
         <source>Country Border</source>
-        <translation>Fronteras</translation>
+        <translation>Frontera Internacional</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="53"/>
@@ -8069,22 +8485,22 @@ o
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="67"/>
         <source>Ferry</source>
-        <translation>Ferry</translation>
+        <translation>Transbordador</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="74"/>
         <source>Toll Road</source>
-        <translation>Carreteras de peaje</translation>
+        <translation>Carretera de peatge</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="84"/>
         <source>Unpaved</source>
-        <translation>Sin pavimentar</translation>
+        <translation>Sense asfaltar</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="106"/>
         <source><p>Directions Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> </p></source>
-        <translation><p>Direcciones cortesía de <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> </p></translation>
+        <translation><p>Direccions Cortesia de <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> </p></translation>
     </message>
 </context>
 <context>
@@ -8092,7 +8508,7 @@ o
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="31"/>
@@ -8102,17 +8518,17 @@ o
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="38"/>
         <source>Mode</source>
-        <translation>Modo</translation>
+        <translation>Mode</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="45"/>
         <source>Database</source>
-        <translation>Base de datos</translation>
+        <translation>Base de Dades</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="52"/>
         <source>Add paths with Routino database.</source>
-        <translation>Añadir carpeta con base de datos de Routino.</translation>
+        <translation>Afegir camins a la base de dades Routino.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="55"/>
@@ -8122,12 +8538,12 @@ o
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="66"/>
         <source>Language</source>
-        <translation>Lenguaje</translation>
+        <translation>idioma</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="131"/>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="118"/>
         <source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path. You can create your own routing data with <b>Tool->Create Routino Database</b>.</source>
-        <translation>Para utilizar el enrutamiento sin conexión es necesario definir rutas de acceso a los datos de enrutamiento locales. Utilice el botón de la herramienta de configuración para indicar una carpeta. Puede crear sus propios datos de enrutamiento con la  <b>herramienta->Crear base de datos de Routino</b>.</translation>
+        <translation>Per a utilitzar itineraris fora de línia cal definir el camí a les dades locals d'itineraris. Utilitza el boto configurar per a enregistrar un camí. Pots crear les teves dades locals d'itineraris fent <b>Eina->Crea Routino Base de Dades</b>.</translation>
     </message>
 </context>
 <context>
@@ -8135,7 +8551,7 @@ o
     <message>
         <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
         <source>Setup Routino database...</source>
-        <translation>Configurar base de datos de Routino...</translation>
+        <translation>Configurar la base de dades Routino...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="27"/>
@@ -8154,7 +8570,7 @@ o
     <message>
         <location filename="../gis/rte/router/IRouterSetup.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
 </context>
 <context>
@@ -8162,28 +8578,28 @@ o
     <message>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="22"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="25"/>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="63"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="39"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="42"/>
         <source>Select source files:</source>
-        <translation>Seleccionar ficheros de origen:</translation>
+        <translation>Selecciona els fitxers origen:</translation>
     </message>
     <message>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="54"/>
         <source>Start</source>
-        <translation>Comenzar</translation>
+        <translation>Inici</translation>
     </message>
     <message>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="86"/>
         <source>Target Path:</source>
-        <translation>Carpeta de destino:</translation>
+        <translation>Camí Destinació:</translation>
     </message>
     <message>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="93"/>
@@ -8193,7 +8609,26 @@ o
     <message>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="100"/>
         <source>File Prefix</source>
-        <translation>Prefijo del archivo</translation>
+        <translation>Prefix del Fitxer</translation>
+    </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="133"/>
+        <source><p>To create a Routino routing database you need to download *pbf files from <a href='http://download.geofabrik.de/'>GeoFabrik</a>. The process of creating a Routino database is quite slow and the resulting files quite large. Therefore it's recommended not to download whole continents. Limit your download to those countries you really need. However as Routino can't route over several databases you have to include all countries that ar [...]
+
+<ol>
+<li>Select one or multiple source *.pbf files.</li>
+<li>Select a path for your Routino database.</li>
+<li>Select a prefix. The database will be listed by this prefix.</li>
+<li>Press "Start" button.</li>
+</ol></source>
+        <translation><p>Per a crear una base de dades d'itineraris Routino s'han de baixar tots els fitxers *pbf de <a href='http://download.geofabrik.de/'>GeoFabrik</a>. El procés de creació d'una base de dades d'itineraris Routino és força lent i els fitxers resultants força grans. Per tot això es recomana que no baixeu tots els continents. Limiteu la baixada als països que realment necessiteu. No obstant, Routino no pot crear itineraris  [...]
+
+<ol>
+<li>Selecciona una o múltiples fonts de fitxers *.pbf .</li>
+<li>Selecciona el camí de la vostre base de dades Routino.</li>
+<li>Selecciona un prefixe. La base de dades apareixerà a la llista amb aquest prefix.</li>
+<li>Prem el botó "Inicia".</li>
+</ol></translation>
     </message>
 </context>
 <context>
@@ -8201,27 +8636,37 @@ o
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="32"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="40"/>
         <source>Save to original</source>
-        <translation>Guardar al original</translation>
+        <translation>Desa a l'original</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="47"/>
         <source>Save as new</source>
-        <translation>Guardar como nuevo...</translation>
+        <translation>Desar com a nou</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="54"/>
         <source>Abort</source>
-        <translation>Cancelar</translation>
+        <translation>Interrompre</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="89"/>
         <source>Move points. (Ctrl+M)</source>
-        <translation>Mover puntos. (Ctrl+M)</translation>
+        <translation>Moure punts. (Ctrl+M)</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="92"/>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="118"/>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="141"/>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="164"/>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="300"/>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="317"/>
+        <source>...</source>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="99"/>
@@ -8231,7 +8676,7 @@ o
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="115"/>
         <source>Add new points. (Ctrl++)</source>
-        <translation>Añadir puntos. (Ctrl++)</translation>
+        <translation>Afegir nous punts. (Ctrl++)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="125"/>
@@ -8241,7 +8686,7 @@ o
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="138"/>
         <source>Select a range of points. (Ctrl+R)</source>
-        <translation>Seleccionar rango de puntos. (Ctrl+R)</translation>
+        <translation>Selecciona un interval de punts. (Ctrl+R)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="148"/>
@@ -8249,9 +8694,24 @@ o
         <translation>Ctrl+R</translation>
     </message>
     <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
+        <source>Delete a point. (Ctrl+-)</source>
+        <translation>Suprimir un punt. (Ctrl+-)</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
+        <source>Ctrl+-</source>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="215"/>
         <source>No auto-routing or line snapping (Ctrl+O)</source>
-        <translation>Dibuja libremente. Sin enrutamiento automático ni ajuste vectorial (Ctrl + O)</translation>
+        <translation>No utilitzar ni auto-enrutament ni ajust de línia (Ctrl+O)</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
+        <source>0</source>
+        <translation>0</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="225"/>
@@ -8261,7 +8721,12 @@ o
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="238"/>
         <source>Use auto-routing to between points. (Ctrl+A)</source>
-        <translation>Dibuja usando el enrutamiento automático entre puntos. (Ctrl+A)</translation>
+        <translation>Utilitzar l'auto-enrutament entre punts. (Ctrl+A)</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="241"/>
+        <source>A</source>
+        <translation>A</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="248"/>
@@ -8271,37 +8736,7 @@ o
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="261"/>
         <source>Snap line along lines of a vector map. (Ctrl+V)</source>
-        <translation>Dibuja ajustandose a las lineas de un mapa vectorial. (Ctrl+V)</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="92"/>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="118"/>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="141"/>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="164"/>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="300"/>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="317"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
-        <source>Delete a point. (Ctrl+-)</source>
-        <translation>Borrar un punto. (Ctrl+-)</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
-        <source>Ctrl+-</source>
-        <translation>Ctrl+-</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
-        <source>0</source>
-        <translation>0</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="241"/>
-        <source>A</source>
-        <translation>A</translation>
+        <translation>Ajustar la línia amb les línies d'un mapa vectorial. (Ctrl+V)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="264"/>
@@ -8316,12 +8751,12 @@ o
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="297"/>
         <source>Undo last change</source>
-        <translation>Deshacer</translation>
+        <translation>Desfés el darrer canvi</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="314"/>
         <source>Redo last change</source>
-        <translation>Rehacer</translation>
+        <translation>Refès l'últim canvi</translation>
     </message>
 </context>
 <context>
@@ -8329,12 +8764,12 @@ o
     <message>
         <location filename="../gis/ovl/IScrOptOvlArea.ui" line="14"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IScrOptOvlArea.ui" line="40"/>
         <source>View details and edit.</source>
-        <translation>Ver detalles y editar.</translation>
+        <translation>Veure els detalls i editar.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IScrOptOvlArea.ui" line="43"/>
@@ -8347,22 +8782,22 @@ o
     <message>
         <location filename="../gis/ovl/IScrOptOvlArea.ui" line="54"/>
         <source>Copy area into another project.</source>
-        <translation>Copiar área en otro proyecto.</translation>
+        <translation>Copia l'àrea a un altre projecte.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IScrOptOvlArea.ui" line="68"/>
         <source>Delete area from project.</source>
-        <translation>Eliminar área de este proyecto</translation>
+        <translation>Suprimir àrea del projecte.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IScrOptOvlArea.ui" line="89"/>
         <source>Edit shape of the area.</source>
-        <translation>Editar el contorno del área.</translation>
+        <translation>Editar la forma de l'àrea.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IScrOptOvlArea.ui" line="121"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
 </context>
 <context>
@@ -8370,12 +8805,12 @@ o
     <message>
         <location filename="../mouse/IScrOptPrint.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptPrint.ui" line="35"/>
         <source>Save selected area as image.</source>
-        <translation>Guardar el área seleccionada como imagen.</translation>
+        <translation>Desa l'àrea seleccionada com a imatge</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptPrint.ui" line="38"/>
@@ -8386,7 +8821,7 @@ o
     <message>
         <location filename="../mouse/IScrOptPrint.ui" line="55"/>
         <source>Print selected area.</source>
-        <translation>Imprimir área seleccionada.</translation>
+        <translation>Imprimir l'àrea seleccionada</translation>
     </message>
 </context>
 <context>
@@ -8394,12 +8829,12 @@ o
     <message>
         <location filename="../mouse/line/IScrOptRangeLine.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptRangeLine.ui" line="32"/>
         <source>Delete all points between the first and last one.</source>
-        <translation>Borre todos los puntos entre el primero y el último.</translation>
+        <translation>Suprimir tots els punts entre el primer i l'últim</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptRangeLine.ui" line="35"/>
@@ -8410,7 +8845,7 @@ o
     <message>
         <location filename="../mouse/line/IScrOptRangeLine.ui" line="46"/>
         <source><html><head/><body><p>Calculate a route between the first and last selected point.</p></body></html></source>
-        <translation><html><head/><body><p>Calcular una ruta entre el primero y el último punto seleccionado.</p></body></html></translation>
+        <translation><html><head/><body><p>Calcular una ruta entre el primer i el darrer punt seleccionats.</p></body></html></translation>
     </message>
 </context>
 <context>
@@ -8418,12 +8853,12 @@ o
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="40"/>
         <source>Hide all points.</source>
-        <translation>Ocultar todos los puntos.</translation>
+        <translation>Amaga tots els punts.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="43"/>
@@ -8436,22 +8871,22 @@ o
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="54"/>
         <source>Show all points.</source>
-        <translation>Mostrar todos los puntos.</translation>
+        <translation>Mostra tots els punts.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
         <source>Set an activity for the selected range.</source>
-        <translation>Asigna una Actividad para el rango seleccionado.</translation>
+        <translation>Assigna una Activitat per a l'interval seleccionat.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
         <source>Copy track points as new track.</source>
-        <translation>Copiar los puntos del track como un nuevo track.</translation>
+        <translation>Copia els punts del track a un nou track.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="117"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
 </context>
 <context>
@@ -8459,7 +8894,12 @@ o
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IScrOptRte.ui" line="40"/>
+        <source>View details and edit.</source>
+        <translation>Veure els detalls i editar.</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="43"/>
@@ -8476,42 +8916,37 @@ o
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="54"/>
         <source>Copy route into another project.</source>
-        <translation>Copiar ruta en otro proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IScrOptRte.ui" line="40"/>
-        <source>View details and edit.</source>
-        <translation>Ver detalles y editar.</translation>
+        <translation>Copia la ruta a un altre projecte.</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="68"/>
         <source>Delete route from project.</source>
-        <translation>Borrar ruta del proyecto.</translation>
+        <translation>Suprimeix itinerari del projecte.</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="103"/>
         <source>Calculate route.</source>
-        <translation>Calcular ruta.</translation>
+        <translation>Calcula la ruta.</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="117"/>
         <source>Reset route calculation.</source>
-        <translation>Reiniciar cálculo de ruta.</translation>
+        <translation>Reinicia el càlcul de la ruta.</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="131"/>
         <source>Move route points.</source>
-        <translation>Mover puntos de ruta.</translation>
+        <translation>Moure els punts de l'itinerari.</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="145"/>
         <source>Convert route to track</source>
-        <translation>Convertir ruta en track</translation>
+        <translation>Converteix la ruta a track</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="174"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
 </context>
 <context>
@@ -8519,12 +8954,12 @@ o
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="59"/>
         <source>Copy all selected items to a project.</source>
-        <translation>Copiar todos los elementos seleccionados a un proyecto.</translation>
+        <translation>Copia els elements seleccionats a un altre projecte.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="62"/>
@@ -8545,57 +8980,57 @@ o
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="79"/>
         <source>Create a route from selected waypoints.</source>
-        <translation>Crear ruta con los waypoints seleccionados.</translation>
+        <translation>Crear una ruta des de les fites seleccionades.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="99"/>
         <source>Change the icon of all selected waypoints.</source>
-        <translation>Cambiar el icono a los waypoints seleccionados.</translation>
+        <translation>Canvia la icona de totes les fites seleccionades.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="119"/>
         <source>Combine all selected tracks to a new one.</source>
-        <translation>Combinar todos los tracks seleccionadas en uno nuevo.</translation>
+        <translation>Unir tots els tracks seleccionats en un de nou.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="139"/>
         <source>Set an activity for all selected tracks.</source>
-        <translation>Asigna una Actividad para todos los tracks seleccionados.</translation>
+        <translation>Assigna una Activitat per a tots els Tracks seleccionats.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="153"/>
         <source>Delete all selected items.</source>
-        <translation>Borrar los elementos seleccionados.</translation>
+        <translation>Esborrar tots els elements seleccionats</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="207"/>
         <source>Select all items that intersect the selected area.</source>
-        <translation>Seleccione los elementos que interseccionan el área seleccionada.</translation>
+        <translation>Selecciona tots els elements que intersecten amb l'àrea seleccionada.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="236"/>
         <source>Select all items that are completely inside the selected area.</source>
-        <translation>Seleccione los elementos que estan dentro del area seleccionada. </translation>
+        <translation>Selecciona tots els elements que es troben de forma integra dins l'àrea seleccionada.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="296"/>
         <source>Add tracks to selection.</source>
-        <translation>Añadir tracks a la selección.</translation>
+        <translation>Afegeix tracks a la selecció.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="323"/>
         <source>Add waypoints to selection.</source>
-        <translation>Añadir waypoints a la selección.</translation>
+        <translation>Afegeix fites a la selecció.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="350"/>
         <source>Add routes to selection.</source>
-        <translation>Añadir rutas a selección.</translation>
+        <translation>Afegeix itineraris a la selecció.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="377"/>
         <source>Add areas to selection.</source>
-        <translation>Añadir áreas a la selección.</translation>
+        <translation>Afegir àrees a la selecció.</translation>
     </message>
 </context>
 <context>
@@ -8603,22 +9038,12 @@ o
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="89"/>
-        <source>Show on-screen profile and detailed information about points.</source>
-        <translation>Mostrar el perfil en pantalla e información detallada de los puntos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="120"/>
-        <source>Edit position of track points.</source>
-        <translation>Editar la posición de los puntos del track.</translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="40"/>
         <source>View details and edit properties of track.</source>
-        <translation>Ver detalles y editar propiedades del track. </translation>
+        <translation>Veure detalls del track I editar les propietats.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="43"/>
@@ -8638,17 +9063,27 @@ o
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="54"/>
         <source>Copy track into another project.</source>
-        <translation>Copiar track en otro proyecto.</translation>
+        <translation>Copia el track a un altre projecte.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="68"/>
         <source>Delete track from project.</source>
-        <translation>Eliminar track del proyecto.</translation>
+        <translation>Suprimeix track del projecte.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="89"/>
+        <source>Show on-screen profile and detailed information about points.</source>
+        <translation>Mostra a la pantalla el perfil i informació detallada sobre els punts.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="106"/>
         <source>Select a range of points.</source>
-        <translation>Seleccionar un rango de puntos.</translation>
+        <translation>Selecciona un interval de punts.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="120"/>
+        <source>Edit position of track points.</source>
+        <translation>Editar la posició dels punts del track.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="134"/>
@@ -8668,27 +9103,27 @@ o
 * use the track parts to plan a new tour
 * cut a long track into stages
 </source>
-        <translation>Dividir el track por el punto seleccionado. Puede usar esto para:
+        <translation>Retalla el track en el punt seleccionat. Es pot utilizar per:
 
-* Eliminar puntos erróneos del principio o del final
-* Utilizar partes del track al planificar un nuevo recorrido
-* Dividir un track muy largo en varias etapas
+* suprimir punts sobrants a l'inici o al final del track
+* utilitzar parts del track per a planificar un nou recorregut
+* retallar un track molt llarg en vàries etapes
 </translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
         <source>Set an activity for the complete track.</source>
-        <translation>Asigna una Actividad al track completo.</translation>
+        <translation>Assigna una Activitat per a tot el Track</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
         <source>Copy track together with all attached waypoints into another project.</source>
-        <translation>Copiar track junto con todos los waypoints conectados en otro proyecto.</translation>
+        <translation>Copia el track i totes les fites adjuntes a un altre projecte.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="224"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
 </context>
 <context>
@@ -8696,12 +9131,12 @@ o
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="20"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="49"/>
         <source>View details and edit.</source>
-        <translation>Ver detalles y editar.</translation>
+        <translation>Veure els detalls i editar.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="52"/>
@@ -8710,38 +9145,90 @@ o
         <location filename="../gis/wpt/IScrOptWpt.ui" line="101"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="118"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="132"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="153"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="170"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="63"/>
         <source>Copy waypoint into another project.</source>
-        <translation>Copiar waypoint en otro proyecto.</translation>
+        <translation>Copia la fita a un altre projecte.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="77"/>
         <source>Delete waypoint from project.</source>
-        <translation>Eliminar waypoint del proyecto.</translation>
+        <translation>Suprimeix fites del projecte.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="98"/>
         <source>Show content as static bubble.</source>
-        <translation>Mostrar contenido en globo de texto.</translation>
+        <translation>Mostra el contingut en una bombolla estàtica.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="115"/>
         <source>Move waypoint to a new location.</source>
-        <translation>Mover el waypoint a una nueva ubicación.</translation>
+        <translation>Mou fites a una nova ubicació.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="129"/>
         <source>Clone waypoint and move clone a given distance and angle.</source>
-        <translation>Duplicar el waypoint y mover la copia a una distancia y un ángulo dados.</translation>
+        <translation>Clona la fita i mou el clon a la distància i angle que diguis.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="150"/>
+        <source>edit radius of circular area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="167"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="185"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="232"/>
+        <source>TextLabel</source>
+        <translation>EtiquetaDeText</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptWptRadius</name>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulari</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="49"/>
+        <source>edit radius of circular area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="52"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="66"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="84"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="63"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="81"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="176"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="128"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation type="unfinished">EtiquetaDeText</translation>
     </message>
 </context>
 <context>
@@ -8749,29 +9236,29 @@ o
     <message>
         <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
         <source>Search...</source>
-        <translation>Buscar...</translation>
+        <translation>Cerca...</translation>
     </message>
     <message>
         <location filename="../gis/db/ISearchDatabase.ui" line="34"/>
         <source>Type the word you want to search for and press the search button. 
 If you enter 'word' a search with an exact match is done. If you enter 'word*', 'word' has to be at the beginning of a string.</source>
-        <translation>Escriba la palabra que desea buscar y pulse botón de busqueda. 
-Si introduce la 'palabra' entre apóstrofes se busca una coincidencia exacta . Si introduce 'palabra*', la 'palabra' se busca al principio de una cadena.</translation>
+        <translation>Escriu la paraula que vols cercar i prem el botó de cerca. 
+Si introduïu 'word' es fa una cerca de la paraula exacte. Si introduïu 'word*', la paraula 'word' ha d'estar a l'inici de la cadena de text.</translation>
     </message>
     <message>
         <location filename="../gis/db/ISearchDatabase.ui" line="51"/>
         <source>Name</source>
-        <translation>Nombre</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location filename="../gis/db/ISearchDatabase.ui" line="79"/>
         <source>Search</source>
-        <translation>Buscar</translation>
+        <translation>Cerca</translation>
     </message>
     <message>
         <location filename="../gis/db/ISearchDatabase.ui" line="86"/>
         <source>Close</source>
-        <translation>Cerrar</translation>
+        <translation>Tanca</translation>
     </message>
 </context>
 <context>
@@ -8779,7 +9266,7 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../gis/ISelDevices.ui" line="14"/>
         <source>Select devices...</source>
-        <translation>Seleccionar dispositivos...</translation>
+        <translation>Selecciona els dispositius...</translation>
     </message>
 </context>
 <context>
@@ -8787,7 +9274,7 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../gis/trk/ISelectActivityColor.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
 </context>
 <context>
@@ -8795,12 +9282,12 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../helpers/ISelectCopyAction.ui" line="14"/>
         <source>Copy item...</source>
-        <translation>Copiar elemento...</translation>
+        <translation>Copia l'element...</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectCopyAction.ui" line="29"/>
         <source>Replace existing item</source>
-        <translation>Sustituir el elemento existente</translation>
+        <translation>Substituir l'element existent</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectCopyAction.ui" line="36"/>
@@ -8808,37 +9295,37 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
         <location filename="../helpers/ISelectCopyAction.ui" line="79"/>
         <location filename="../helpers/ISelectCopyAction.ui" line="89"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectCopyAction.ui" line="72"/>
         <source>Do not copy item</source>
-        <translation>No copiar el elemento</translation>
+        <translation>No copiïs l'element...</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectCopyAction.ui" line="115"/>
         <source>Create a clone</source>
-        <translation>Crear un duplicado</translation>
+        <translation>Crea un clon</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectCopyAction.ui" line="122"/>
         <source>Replace with:</source>
-        <translation>Sustituir por:</translation>
+        <translation>Substituir amb:</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectCopyAction.ui" line="129"/>
         <source>Keep item:</source>
-        <translation>Mantener:</translation>
+        <translation>Mantenir l'element:</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectCopyAction.ui" line="136"/>
         <source>The clone's name will be appended with '_Clone'</source>
-        <translation>Se añadirá el sufijo '_Clone' al nombre del duplicado</translation>
+        <translation>Al nom del clon s'hi afegirà '_Clone'</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectCopyAction.ui" line="153"/>
         <source>And for all other items, too.</source>
-        <translation>Hacer igual para todos los elementos.</translation>
+        <translation>I també per a tots els altres elements.</translation>
     </message>
 </context>
 <context>
@@ -8846,12 +9333,12 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../gis/db/ISelectDBFolder.ui" line="14"/>
         <source>Select Parent Folder...</source>
-        <translation type="unfinished">Seleccione la carpeta principal...</translation>
+        <translation>Selecciona Carpeta Superior...</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectDBFolder.ui" line="26"/>
         <source>Name</source>
-        <translation>Nombre</translation>
+        <translation>Nom</translation>
     </message>
 </context>
 <context>
@@ -8859,7 +9346,7 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="22"/>
@@ -8869,27 +9356,27 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="46"/>
         <source>Add to selected items</source>
-        <translation>Añadir a los elementos seleccionados</translation>
+        <translation>Afegir als elements seleccionats</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="60"/>
         <source>Remove from selected items</source>
-        <translation>Eliminar de los elementos seleccionados</translation>
+        <translation>Suprimir dels elements seleccionats</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="78"/>
         <source>Selected</source>
-        <translation>Seleccionado</translation>
+        <translation>Seleccionat</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="102"/>
         <source>Move selected items up</source>
-        <translation>Mover los elementos seleccionados arriba</translation>
+        <translation>Mou els elements seleccionats amunt</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="116"/>
         <source>Move selected items down</source>
-        <translation>Mover los elementos seleccionados abajo</translation>
+        <translation>Mou els elements seleccionats avall</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="49"/>
@@ -8905,22 +9392,22 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="14"/>
         <source>Select a project...</source>
-        <translation>Seleccionar un proyecto...</translation>
+        <translation>Selecciona un projecte...</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="20"/>
         <source>Select project from list or enter new project name.</source>
-        <translation>Seleccione un proyecto de la lista, o introduzca un nuevo nombre de proyecto.</translation>
+        <translation>Selecciona un projecte de la llista o introdueix un nom de projecte nou.</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="33"/>
         <source>New project's name</source>
-        <translation>Nombre del nuevo proyecto</translation>
+        <translation>Nom del nou projecte</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="43"/>
         <source>New project is created as:</source>
-        <translation>El nuevo proyecto se creará como:</translation>
+        <translation>S'ha creat un nou projecte com:</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="93"/>
@@ -8935,7 +9422,7 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="110"/>
         <source>Database</source>
-        <translation>Base de datos</translation>
+        <translation>Base de dades</translation>
     </message>
 </context>
 <context>
@@ -8943,27 +9430,12 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="20"/>
         <source>Copy item...</source>
-        <translation>Copiar elemento...</translation>
+        <translation>Copia l'element...</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="35"/>
         <source>Replace existing item</source>
-        <translation>Sustituir el elemento existente</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="87"/>
-        <source>Add a clone</source>
-        <translation>Añadir duplicado</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="100"/>
-        <source>The clone's name will be appended with '_Clone'</source>
-        <translation>Se añadirá el sufijo '_Clone' al nombre del duplicado</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="171"/>
-        <source>Replace with:</source>
-        <translation>Sustituir por:</translation>
+        <translation>Substituir l'element existent</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="42"/>
@@ -8971,22 +9443,37 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
         <location filename="../gis/db/ISelectSaveAction.ui" line="130"/>
         <location filename="../gis/db/ISelectSaveAction.ui" line="140"/>
         <source>TextLabel</source>
-        <translation>Denominación</translation>
+        <translation>EtiquetaDeText</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="61"/>
         <source>Do not replace item</source>
-        <translation>No sustituir elemento</translation>
+        <translation>No substituir l'element</translation>
     </message>
     <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="123"/>
-        <source>Use item:</source>
-        <translation>Utilizar elemento:</translation>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="87"/>
+        <source>Add a clone</source>
+        <translation>Afegir un clon</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="100"/>
+        <source>The clone's name will be appended with '_Clone'</source>
+        <translation>Al nom del clon s'hi afegirà '_Clone'</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="116"/>
         <source>And for all other items, too.</source>
-        <translation>Hacer igual para todos los elementos.</translation>
+        <translation>I també per a tots els altres elements.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="123"/>
+        <source>Use item:</source>
+        <translation>Utilitza l'element:</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="171"/>
+        <source>Replace with:</source>
+        <translation>Substituir amb:</translation>
     </message>
 </context>
 <context>
@@ -8994,37 +9481,12 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="14"/>
         <source>Add database...</source>
-        <translation>Añadir Base de Datos...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="68"/>
-        <source>-</source>
-        <translation>-</translation>
+        <translation>Afegir base de dades...</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="25"/>
         <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="252"/>
-        <source><p align="justify"><span style=" font-weight:600;">Caution!</span> It is recommended to leave the password blank, as QMapShack will store it as plain text. If you don't give a password you will be asked for it on each startup.</p></source>
-        <translation><p align="justify"><span style=" font-weight:600;">Precaución</span> Se recomienda dejar la contraseña en blanco, ya que QMapShack lo almacenará como texto sin formato. Si no introduce una contraseña, se le pedirá en cada inicio.</p></translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="239"/>
-        <source>Do not use a password.</source>
-        <translation>No usar contraseña.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="153"/>
-        <source>SQLite</source>
-        <translation>SQLite</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="115"/>
-        <source>MySQL</source>
-        <translation>MySQL</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="181"/>
@@ -9034,37 +9496,52 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="193"/>
         <source>Port</source>
-        <translation>Puerto</translation>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="206"/>
         <source>00000</source>
-        <translation type="unfinished">00000</translation>
+        <translation>00000</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="215"/>
         <source>User</source>
-        <translation>Usuario</translation>
+        <translation>Usuari</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="225"/>
         <source>Password</source>
-        <translation>Contraseña</translation>
+        <translation>Contrasenya</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="252"/>
+        <source><p align="justify"><span style=" font-weight:600;">Caution!</span> It is recommended to leave the password blank, as QMapShack will store it as plain text. If you don't give a password you will be asked for it on each startup.</p></source>
+        <translation><p align="justify"><span style=" font-weight:600;">Atenció!</span> Es recomanable deixar la contrasenya en blanc ja que QMapShack l'emmagatzema sense xifrar. En cas de deixar-la en blanc es demanara a cada arrancada.</p></translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="275"/>
         <source><b>Port:</b> Leave the port field empty to use the default port.</source>
-        <translation><b>Puerto:</b> Dejar vacio para usar el puerto predeterminado.</translation>
+        <translation><b>Port:</b> Deixar el camp port buit si es vol utilizar el port per defecte.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="239"/>
+        <source>Do not use a password.</source>
+        <translation>No utilitzeu una contrasenya</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="61"/>
         <source>File:</source>
-        <translation>Archivo:</translation>
+        <translation>Fitxer:</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="68"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="75"/>
         <source>Add new database.</source>
-        <translation>Añadir nueva base de datos.</translation>
+        <translation>Afegir una nova base de dades.</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="78"/>
@@ -9075,7 +9552,17 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="89"/>
         <source>Open existing database.</source>
-        <translation>Abrir base de datos existente.</translation>
+        <translation>Obrir una base de dades existent.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="115"/>
+        <source>MySQL</source>
+        <translation>MySQL</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="153"/>
+        <source>SQLite</source>
+        <translation>SQLite</translation>
     </message>
 </context>
 <context>
@@ -9083,22 +9570,22 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../gis/ISetupFilter.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulari</translation>
     </message>
     <message>
         <location filename="../gis/ISetupFilter.ui" line="38"/>
         <source>Apply filter to</source>
-        <translation>Aplicar filtro a</translation>
+        <translation>Aplica el filtre a</translation>
     </message>
     <message>
         <location filename="../gis/ISetupFilter.ui" line="45"/>
         <source>name only</source>
-        <translation>Solo nombre</translation>
+        <translation>només el nom</translation>
     </message>
     <message>
         <location filename="../gis/ISetupFilter.ui" line="52"/>
         <source>complete text</source>
-        <translation>Texto completo</translation>
+        <translation>text complet</translation>
     </message>
 </context>
 <context>
@@ -9106,27 +9593,27 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="14"/>
         <source>Database Folder...</source>
-        <translation>Carpeta de base de datos</translation>
+        <translation>Carpeta de les Bases de Dades...</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="20"/>
         <source>Folder name</source>
-        <translation>Nombre de la carpeta</translation>
+        <translation>Nom de la carpeta</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="30"/>
         <source>Group</source>
-        <translation>Grupo</translation>
+        <translation>Grup</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="41"/>
         <source>Project</source>
-        <translation>Proyecto</translation>
+        <translation>Projecte</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="55"/>
         <source>Other</source>
-        <translation>Otros</translation>
+        <translation>Altres</translation>
     </message>
 </context>
 <context>
@@ -9134,12 +9621,12 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="14"/>
         <source>New Waypoint...</source>
-        <translation>Nuevo waypoint.</translation>
+        <translation>Nova Fita...</translation>
     </message>
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="22"/>
         <source>Symbol</source>
-        <translation>Símbolo</translation>
+        <translation>Símbol</translation>
     </message>
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="29"/>
@@ -9149,12 +9636,12 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="39"/>
         <source>Position</source>
-        <translation>Posición</translation>
+        <translation>Posició</translation>
     </message>
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="49"/>
         <source>Name</source>
-        <translation>Nombre</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="59"/>
@@ -9162,10 +9649,10 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
 "[N|S] ddd mm.sss [W|E] ddd mm.sss"
 or
 "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
-        <translation>Formato de posición incorrecto. Debe ser: 
-"[N|S] ggg mm.sss [W|E] ggg mm.sss"
+        <translation>Format amb possicions incorrectes. Ha de ser: 
+"[N|S] ddd mm.sss [W|E] ddd mm.sss"
 o
-"[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
+"[N|S] ddd.ddd [W|E] ddd.ddd"</translation>
     </message>
 </context>
 <context>
@@ -9173,27 +9660,27 @@ o
     <message>
         <location filename="../gis/db/ISetupWorkspace.ui" line="14"/>
         <source>Setup workspace...</source>
-        <translation>Configurar espacio de trabajo...</translation>
+        <translation>Configuració de l'espai de treball...</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupWorkspace.ui" line="35"/>
         <source>save workspace on exit, and every</source>
-        <translation>guardar el espacio de trabajo al salir, y cada</translation>
+        <translation>A la sortida desa l'espai de treball, i tota la resta</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupWorkspace.ui" line="45"/>
         <source>minutes</source>
-        <translation>minutos</translation>
+        <translation>minuts</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupWorkspace.ui" line="56"/>
         <source>listen for database changes from other instances of QMapShack. On port</source>
-        <translation>Escuchar los cambios en la base de datos de otras instancias de QMapShack en puerto</translation>
+        <translation>mirant canvis a la base de dades fets per d'altres instàncies de QMapShack. Al port</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupWorkspace.ui" line="63"/>
         <source>00000</source>
-        <translation type="unfinished">00000</translation>
+        <translation>00000</translation>
     </message>
 </context>
 <context>
@@ -9201,17 +9688,17 @@ o
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="14"/>
         <source>Insert Template...</source>
-        <translation>Insertar plantilla...</translation>
+        <translation>Insereix la Plantilla...</translation>
     </message>
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="32"/>
         <source>Templates</source>
-        <translation>Plantillas</translation>
+        <translation>Plantilles</translation>
     </message>
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="42"/>
         <source>Select a path with your own templates.</source>
-        <translation>Selecciona una ruta con tus propias plantillas</translation>
+        <translation>Selecciona el camí de les vostres plantilles.</translation>
     </message>
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="45"/>
@@ -9221,7 +9708,7 @@ o
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="77"/>
         <source>Preview</source>
-        <translation>Vista previa</translation>
+        <translation>Previsualització</translation>
     </message>
 </context>
 <context>
@@ -9229,13 +9716,13 @@ o
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="14"/>
         <source>Edit text...</source>
-        <translation>Editar texto...</translation>
+        <translation>Edita el text...</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="45"/>
         <location filename="../widgets/ITextEditWidget.ui" line="351"/>
         <source>Undo</source>
-        <translation>Deshacer</translation>
+        <translation>Desfés</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="354"/>
@@ -9246,18 +9733,18 @@ o
         <location filename="../widgets/ITextEditWidget.ui" line="58"/>
         <location filename="../widgets/ITextEditWidget.ui" line="363"/>
         <source>Redo</source>
-        <translation>Rehacer</translation>
+        <translation>Refès</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="366"/>
         <source>Ctrl+Shift+Z</source>
-        <translation>Ctrl+Shift+Z</translation>
+        <translation>Ctrl+Maj+Z</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="71"/>
         <location filename="../widgets/ITextEditWidget.ui" line="375"/>
         <source>Cut</source>
-        <translation>Cortar</translation>
+        <translation>Talla</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="378"/>
@@ -9268,7 +9755,7 @@ o
         <location filename="../widgets/ITextEditWidget.ui" line="84"/>
         <location filename="../widgets/ITextEditWidget.ui" line="387"/>
         <source>Copy</source>
-        <translation>Copiar</translation>
+        <translation>Copia</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="390"/>
@@ -9279,97 +9766,97 @@ o
         <location filename="../widgets/ITextEditWidget.ui" line="97"/>
         <location filename="../widgets/ITextEditWidget.ui" line="395"/>
         <source>Paste</source>
-        <translation>Pegar</translation>
+        <translation>Enganxa</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="25"/>
         <source>Templ.</source>
-        <translation>Plantilla.</translation>
+        <translation>Plant.</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="120"/>
         <source>A:L</source>
-        <translation type="unfinished"></translation>
+        <translation>A:L</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="133"/>
         <source>A:C</source>
-        <translation type="unfinished"></translation>
+        <translation>A:C</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="146"/>
         <source>A:R</source>
-        <translation type="unfinished"></translation>
+        <translation>A:R</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="159"/>
         <source>A:B</source>
-        <translation type="unfinished"></translation>
+        <translation>A:B</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="192"/>
         <source>B</source>
-        <translation type="unfinished"></translation>
+        <translation>B</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="205"/>
         <source>I</source>
-        <translation type="unfinished"></translation>
+        <translation>I</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="218"/>
         <source>U</source>
-        <translation type="unfinished"></translation>
+        <translation>U</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="238"/>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="285"/>
         <source>Standard</source>
-        <translation type="unfinished"></translation>
+        <translation>Estàndard</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="290"/>
         <source>Bullet List (Disc)</source>
-        <translation>Lista de viñetas (Disco)</translation>
+        <translation>Llists de Pics (Disc)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="295"/>
         <source>Bullet List (Circle)</source>
-        <translation>Lista de viñetas (círculos)</translation>
+        <translation>Llists de Pics (Cercle)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="300"/>
         <source>Bullet List (Square)</source>
-        <translation>Lista de viñetas(cuadrados)</translation>
+        <translation>Llists de Pics (Quadrat)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="305"/>
         <source>Ordered List (Decimal)</source>
-        <translation>Lista ordenada(decimal)</translation>
+        <translation>Llista ordenada (Decimal)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="310"/>
         <source>Ordered List (Alpha lower)</source>
-        <translation>Lista ordenada (alfabético descendente)</translation>
+        <translation>Llista ordenada (Minúscules llatines)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="315"/>
         <source>Ordered List (Alpha upper)</source>
-        <translation>Lista ordenada (alfabético ascendente)</translation>
+        <translation>Llista ordenada (Majúscules llatines)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="320"/>
         <source>Ordered List (Roman lower)</source>
-        <translation>Lista ordenada (números romanos descendente)</translation>
+        <translation>Llista ordenada (Minúscules romanes)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="325"/>
         <source>Ordered List (Roman upper)</source>
-        <translation>Lista ordenada (números romanos ascendente)</translation>
+        <translation>Llista ordenada (Majúscules romanes)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="398"/>
@@ -9379,7 +9866,7 @@ o
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="410"/>
         <source>Align Left</source>
-        <translation>Alinear a la Izquierda</translation>
+        <translation>Alinea a l'esquerra</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="413"/>
@@ -9389,7 +9876,7 @@ o
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="425"/>
         <source>Align Right</source>
-        <translation>Alinear a la Derecha</translation>
+        <translation>Alinea a la dreta</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="428"/>
@@ -9399,7 +9886,7 @@ o
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="440"/>
         <source>Align Center</source>
-        <translation>Alinear al Centro</translation>
+        <translation>Alinea al centre</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="443"/>
@@ -9409,7 +9896,7 @@ o
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="455"/>
         <source>Align Block</source>
-        <translation>Alinear Bloque</translation>
+        <translation>Alinea el Bloc</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="458"/>
@@ -9419,7 +9906,7 @@ o
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="470"/>
         <source>Underline</source>
-        <translation>Subrayar</translation>
+        <translation>Subratllat</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="473"/>
@@ -9429,7 +9916,7 @@ o
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="485"/>
         <source>Bold</source>
-        <translation>Negrita</translation>
+        <translation>Negreta</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="488"/>
@@ -9439,7 +9926,7 @@ o
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="500"/>
         <source>Italic</source>
-        <translation>Cursiva</translation>
+        <translation>Itàlica</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="503"/>
@@ -9449,18 +9936,18 @@ o
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="515"/>
         <source>Plain</source>
-        <translation>Plano</translation>
+        <translation>Normal</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="518"/>
         <source>Reset the text's format before pasting</source>
-        <translation>Restablecer el formato del texto antes del pegado</translation>
+        <translation>Reinicia el format del text abans d'enganxar</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="523"/>
         <location filename="../widgets/ITextEditWidget.ui" line="526"/>
         <source>Select All</source>
-        <translation>Seleccionar todo</translation>
+        <translation>Selecciona-ho Tot</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="529"/>
@@ -9471,19 +9958,19 @@ o
         <location filename="../widgets/ITextEditWidget.ui" line="534"/>
         <location filename="../widgets/ITextEditWidget.ui" line="537"/>
         <source>Delete</source>
-        <translation>Borrar</translation>
+        <translation>Suprimir</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="542"/>
         <location filename="../widgets/ITextEditWidget.ui" line="545"/>
         <source>Reset Font</source>
-        <translation>Restablecer fuente</translation>
+        <translation>Reinicia Típus de Lletra</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="550"/>
         <location filename="../widgets/ITextEditWidget.ui" line="553"/>
         <source>Reset Layout</source>
-        <translation>Restablecer diseño</translation>
+        <translation>Reinicia Disseny</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="565"/>
@@ -9493,17 +9980,17 @@ o
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="568"/>
         <source>Paste without resetting the text's format</source>
-        <translation>Pegar sin restablecer el formato del texto</translation>
+        <translation>Enganxa sense reiniciar el format del text</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="577"/>
         <source>Insert From Template</source>
-        <translation>Insertar desde plantilla</translation>
+        <translation>Insereix des d'un Plantilla</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="580"/>
         <source>Create text from template.</source>
-        <translation>Crear texto desde plantilla.</translation>
+        <translation>Crea text utilitzant una plantilla.</translation>
     </message>
 </context>
 <context>
@@ -9511,32 +9998,32 @@ o
     <message>
         <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="55"/>
         <source>B</source>
-        <translation type="unfinished"></translation>
+        <translation>B</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="68"/>
         <source>I</source>
-        <translation type="unfinished"></translation>
+        <translation>I</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="81"/>
         <source>U</source>
-        <translation type="unfinished"></translation>
+        <translation>U</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="101"/>
         <source>Cut</source>
-        <translation>Cortar</translation>
+        <translation>Retalla</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="114"/>
         <source>Copy</source>
-        <translation>Copiar</translation>
+        <translation>Còpia</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="127"/>
         <source>Paste</source>
-        <translation>Pegar</translation>
+        <translation>Enganxa</translation>
     </message>
 </context>
 <context>
@@ -9544,7 +10031,7 @@ o
     <message>
         <location filename="../units/ITimeZoneSetup.ui" line="14"/>
         <source>Setup Time Zone ...</source>
-        <translation>Configurar la Zona Horaria.</translation>
+        <translation>Configura la zona horaria ...</translation>
     </message>
     <message>
         <location filename="../units/ITimeZoneSetup.ui" line="22"/>
@@ -9559,22 +10046,27 @@ o
     <message>
         <location filename="../units/ITimeZoneSetup.ui" line="42"/>
         <source>Automatic</source>
-        <translation>Automático</translation>
+        <translation>Automàtic</translation>
     </message>
     <message>
         <location filename="../units/ITimeZoneSetup.ui" line="75"/>
         <source>Print date/time in </source>
-        <translation>Imprimir fecha y hora en</translation>
+        <translation>Imprimir data/hora a </translation>
     </message>
     <message>
         <location filename="../units/ITimeZoneSetup.ui" line="82"/>
         <source>long format, or</source>
-        <translation>Formato largo, o</translation>
+        <translation>format llarg, o</translation>
     </message>
     <message>
         <location filename="../units/ITimeZoneSetup.ui" line="92"/>
         <source>short format</source>
-        <translation>formato corto</translation>
+        <translation>format curt</translation>
+    </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="123"/>
+        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
+        <translation><b>Nota:</b> En caviar algun dels elements GUI, les unitats no tindran efecte fins que no es reinicií QMapShack.</translation>
     </message>
 </context>
 <context>
@@ -9582,12 +10074,12 @@ o
     <message>
         <location filename="../helpers/IToolBarSetupDialog.ui" line="14"/>
         <source>Setup Toolbar</source>
-        <translation>Configuración de barra de herramientas</translation>
+        <translation>Configurar la Barra d'Eines</translation>
     </message>
     <message>
         <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
         <source>Toolbar is visible in Fullscreen-mode</source>
-        <translation>Barra de herramientas visible en modo Pantalla Completa</translation>
+        <translation>La Barra d'Eines és visible en mode Pantalla Sencera</translation>
     </message>
 </context>
 <context>
@@ -9595,58 +10087,61 @@ o
     <message>
         <location filename="../tool/IToolShell.cpp" line="46"/>
         <source>Execution of external program `%1` failed: </source>
-        <translation>La ejecución del programa externo %1 falló:</translation>
+        <translation>Error en l'execució del programa extern `%1`:</translation>
     </message>
     <message>
         <location filename="../tool/IToolShell.cpp" line="50"/>
         <source>Process cannot be started.
 </source>
-        <translation>No se puede iniciar el proceso.
+        <translation>El procés no es pot iniciar.
 </translation>
     </message>
     <message>
         <location filename="../tool/IToolShell.cpp" line="51"/>
         <source>Make sure the required packages are installed, `%1` exists and is executable.
 </source>
-        <translation>Asegúrese de que los paquetes necesarios estén instalados, `%1` existe y es ejecutable</translation>
+        <translation> Assegureu-vos que els paquets necessaris estan instal·lats, `%1` existeix i es pot executar.
+</translation>
     </message>
     <message>
         <location filename="../tool/IToolShell.cpp" line="55"/>
         <source>External process crashed.
 </source>
-        <translation>El proceso externo falló.
+        <translation>El procés extern ha fallat.
 </translation>
     </message>
     <message>
         <location filename="../tool/IToolShell.cpp" line="59"/>
         <source>An unknown error occurred.
 </source>
-        <translation>A ocurrido un error desconocido</translation>
+        <translation>S'ha product un error desconegut.
+</translation>
     </message>
     <message>
         <location filename="../tool/IToolShell.cpp" line="172"/>
         <source>!!! failed !!!
 </source>
-        <translation>!!!falló!!!</translation>
+        <translation>!!! ha fallat !!!
+</translation>
     </message>
 </context>
 <context>
     <name>IUnit</name>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
         <source>Bad position format. Must be: "[N|S] ddd mm.sss [W|E] ddd mm.sss" or "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
-        <translation>Formato de coordenadas incorrecto. Debe ser: "[N|S] ggg mm.sss [W|E] ggg mm.sss" o "[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
+        <translation>Format amb possicions incorrectes. Ha de ser: "[N|S] ddd mm.sss [W|E] ddd mm.sss" o "[N|S] ddd.ddd [W|E] ddd.ddd"</translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Position values out of bounds. </source>
-        <translation>Valores de posición fuera del límite.</translation>
+        <translation>Els valors de la posició estan fora dels límits.</translation>
     </message>
 </context>
 <context>
@@ -9654,27 +10149,47 @@ o
     <message>
         <location filename="../units/IUnitsSetup.ui" line="14"/>
         <source>Setup units...</source>
-        <translation>Configurar unidades...</translation>
+        <translation>Configurar unitats...</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="38"/>
-        <source>Metric</source>
-        <translation>Métrico</translation>
+        <location filename="../units/IUnitsSetup.ui" line="36"/>
+        <source>Length unit</source>
+        <translation>Unitat de longitud</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="47"/>
-        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
-        <translation><b>Nota:</b> Para algunos elementos de la interfaz de usuario, cambiar las unidades no tendrá efecto hasta que se reinicie QMapShack.</translation>
+        <location filename="../units/IUnitsSetup.ui" line="48"/>
+        <source>Nautic</source>
+        <translation>Nàutic</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="31"/>
+        <location filename="../units/IUnitsSetup.ui" line="61"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="24"/>
-        <source>Nautic</source>
-        <translation>Naútico</translation>
+        <location filename="../units/IUnitsSetup.ui" line="74"/>
+        <source>Metric</source>
+        <translation>Mètric</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="80"/>
+        <source>Slope unit</source>
+        <translation>Unitats del pendent</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="92"/>
+        <source>Degrees (°)</source>
+        <translation>Graus (°)</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="105"/>
+        <source>Percent (%)</source>
+        <translation>Percentatge (%)</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="133"/>
+        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
+        <translation><b>Nota:</b> En caviar algun dels elements GUI, les unitats no tindran efecte fins que no es reinicií QMapShack.</translation>
     </message>
 </context>
 <context>
@@ -9682,12 +10197,12 @@ o
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="14"/>
         <source>Icons...</source>
-        <translation>Iconos.</translation>
+        <translation>Icones...</translation>
     </message>
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="68"/>
         <source>External Icons:</source>
-        <translation>Iconos:</translation>
+        <translation>Icones externes:</translation>
     </message>
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="75"/>
@@ -9702,7 +10217,7 @@ o
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="95"/>
         <source>All custom icons have to be *.bmp or *.png format.</source>
-        <translation>Los iconos personalizados deben de ser BMP o PNG</translation>
+        <translation>Les icones personalitzades han d'estar en format *.bmp o bé *.png.</translation>
     </message>
 </context>
 </TS>
diff --git a/src/locale/qmapshack_cs.ts b/src/locale/qmapshack_cs.ts
index b5a193d..df0477e 100644
--- a/src/locale/qmapshack_cs.ts
+++ b/src/locale/qmapshack_cs.ts
@@ -16,7 +16,7 @@
     <message>
         <location filename="../CAbout.cpp" line="49"/>
         <source>(no DBUS: device detection and handling disabled)</source>
-        <translation type="unfinished"></translation>
+        <translation>(žádné DBUS: zjišťování zařízení a zacházení s ním zakázáno)</translation>
     </message>
 </context>
 <context>
@@ -59,22 +59,22 @@
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
         <source>No Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Žádná činnost</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
         <source>Total</source>
-        <translation type="unfinished"></translation>
+        <translation>Celkem</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
         <source>Ascent:</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoupání:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="372"/>
         <source>Descent:</source>
-        <translation type="unfinished"></translation>
+        <translation>Klesání:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="115"/>
@@ -89,7 +89,7 @@
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
         <source>Public Transport</source>
-        <translation type="unfinished"></translation>
+        <translation>Veřejná doprava</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
@@ -120,12 +120,12 @@
 <context>
     <name>CCanvas</name>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="61"/>
+        <location filename="../canvas/CCanvas.cpp" line="63"/>
         <source>View %1</source>
         <translation>Pohled %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="705"/>
+        <location filename="../canvas/CCanvas.cpp" line="766"/>
         <source>Setup Map Background</source>
         <translation>Nastavit pozadí mapy</translation>
     </message>
@@ -270,27 +270,27 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="113"/>
+        <location filename="../gis/db/CDBProject.cpp" line="114"/>
         <source>Failed to load...</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepodařilo se nahrát...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="114"/>
+        <location filename="../gis/db/CDBProject.cpp" line="115"/>
         <source>Can't load file "%1" . It will be skipped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze nahrát soubor "%1". Bude přeskočen.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="127"/>
+        <location filename="../gis/db/CDBProject.cpp" line="128"/>
         <source>Project already in database...</source>
-        <translation type="unfinished"></translation>
+        <translation>Projekt již je v databázi...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="128"/>
+        <location filename="../gis/db/CDBProject.cpp" line="129"/>
         <source>The project "%1" has already been imported into the database. It will be skipped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Projekt "%1" již byl zaveden do databáze. Bude přeskočen.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="279"/>
+        <location filename="../gis/db/CDBProject.cpp" line="280"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -299,47 +299,47 @@ To solve this conflict you can create and save a clone, force your version or dr
 K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji verzi, nebo ji zahodit a vzít jednu z databáze</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="285"/>
+        <location filename="../gis/db/CDBProject.cpp" line="286"/>
         <source>Conflict with database...</source>
         <translation>Střet s databází...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="286"/>
+        <location filename="../gis/db/CDBProject.cpp" line="287"/>
         <source>Clone && Save</source>
         <translation>Klonovat a uložit</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="287"/>
+        <location filename="../gis/db/CDBProject.cpp" line="288"/>
         <source>Force Save</source>
         <translation>Vynutit uložení</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="288"/>
+        <location filename="../gis/db/CDBProject.cpp" line="289"/>
         <source>Take remote</source>
         <translation>Vzít vzdálenou verzi</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="572"/>
+        <location filename="../gis/db/CDBProject.cpp" line="573"/>
         <source>Missing folder...</source>
         <translation>Chybí složka...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="573"/>
+        <location filename="../gis/db/CDBProject.cpp" line="574"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation>Nepodařilo se uložit projekt. Složka byla v databázi smazána.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="580"/>
+        <location filename="../gis/db/CDBProject.cpp" line="581"/>
         <source>Save ...</source>
         <translation>Uložit...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>There was an unexpected database error:
 
 %1</source>
@@ -348,12 +348,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
 %1</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="760"/>
+        <location filename="../gis/db/CDBProject.cpp" line="761"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation>Projekt '%1' se právě bude aktualizovat z databáze. Jsou tu ovšem neuložené změny.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="761"/>
+        <location filename="../gis/db/CDBProject.cpp" line="762"/>
         <source>Save changes?</source>
         <translation>Uložit změny?</translation>
     </message>
@@ -492,21 +492,6 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation>Na konec</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
-        <source>distance: </source>
-        <translation>Vzdálenost: </translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
-        <source>ascent: </source>
-        <translation>Stoupání: </translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
-        <source>descent: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
         <source><h2>Areas</h2></source>
         <translation><h2>Oblasti</h2></translation>
@@ -514,7 +499,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
         <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
-        <translation>Chcete třídit cestovní body podél cesty, ale vypnul jste svázání cestovních bodů a cest (dání do vzájemného vztahu). Chcete je opět zapnout?</translation>
+        <translation>Chcete řadit cestovní body podél cesty, ale vypnul jste svázání cestovních bodů a cest (dání do vzájemného vztahu). Chcete je opět zapnout?</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
@@ -527,6 +512,21 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation><b>Přehled všech stop v projektu</b><br/></translation>
     </message>
     <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
+        <source>Distance: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
+        <source>Ascent: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
+        <source>Descent: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
         <source><h2>Routes</h2></source>
         <translation><h2>Cesty</h2></translation>
@@ -579,7 +579,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
         <source>Miscellaneous</source>
-        <translation type="unfinished"></translation>
+        <translation>Různé</translation>
     </message>
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
@@ -639,7 +639,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     <message>
         <location filename="../gis/db/CExportDatabase.cpp" line="90"/>
         <source>Select export path...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybrat cestu pro vyvedeni...</translation>
     </message>
 </context>
 <context>
@@ -648,40 +648,40 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="79"/>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="123"/>
         <source>Create %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Vytvořit %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="82"/>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="126"/>
         <source>Failed to create %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepodařilo se vytvořit %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="88"/>
         <source>Done!</source>
-        <translation type="unfinished"></translation>
+        <translation>Hotovo!</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="100"/>
         <source>Abort by user!</source>
-        <translation type="unfinished"></translation>
+        <translation>Přerušeno uživatelem!</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="108"/>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="140"/>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="165"/>
         <source>Database Error: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba databáze: %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="153"/>
         <source>Save project as %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Uložit projekt jako %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="157"/>
         <source>Failed!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepodařilo se!</translation>
     </message>
 </context>
 <context>
@@ -697,17 +697,17 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     <message>
         <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="30"/>
         <source>coarse</source>
-        <translation type="unfinished"></translation>
+        <translation>Hrubý</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="31"/>
         <source>medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Střední</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="32"/>
         <source>fine</source>
-        <translation type="unfinished"></translation>
+        <translation>Jemný</translation>
     </message>
 </context>
 <context>
@@ -739,12 +739,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     <message>
         <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
         <source>Missing field definition for development field.</source>
-        <translation type="unfinished"></translation>
+        <translation>Chybí vymezení pole pro vývojové pole.</translation>
     </message>
     <message>
         <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="226"/>
         <source>FIT decoding error: invalid field def nr %1 while creating dev field profile.</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba dekódování FIT: neplatné vymezení pole číslo %1 při vytváření profilu vývojového pole.</translation>
     </message>
 </context>
 <context>
@@ -917,8 +917,19 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
-        <source>Length: %1 %2</source>
-        <translation>Délka: %1 %2</translation>
+        <source>Length: %1%2</source>
+        <translation type="unfinished">Délka: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
+        <source>Time: %1%2</source>
+        <translation type="unfinished">Čas: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
+        <source>Distance: %1%2</source>
+        <translation type="unfinished">Vzdálenost: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
@@ -926,12 +937,6 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation>Délka: -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
-        <source>Time: %1 %2</source>
-        <translation>Čas: %1 %2</translation>
-    </message>
-    <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
         <source>Time: -</source>
         <translation>Výsledný čas: -</translation>
@@ -952,11 +957,6 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation>s %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
-        <source>Distance: %1 %2</source>
-        <translation>Vzdálenost: %1 %2</translation>
-    </message>
-    <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
         <source>Changed route points.</source>
         <translation>Změněné body cesty.</translation>
@@ -996,262 +996,284 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation>Nepodařilo se přečíst data.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="80"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="78"/>
         <source>_Clone</source>
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="251"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="124"/>
+        <source>Invalid points....</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="125"/>
+        <source>The track '%1' has %2 invalid points out of %3 visible points. Do you want to hide invalid points now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="261"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation>Změněny body stop. Obětována veškerá předchozí data.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
-        <source>Length: %1 %2</source>
-        <translation>Délka: %1 %2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>min.</source>
+        <translation type="unfinished">min.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>max.</source>
+        <translation type="unfinished">max.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
-        <source>, %1%2 %3, %4%5 %6</source>
-        <translation>, %1%2 %3, %4%5 %6</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="377"/>
+        <source>Length: %1%2</source>
+        <translation type="unfinished">Délka: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <source>, %1%2%3, %4%5%6</source>
+        <translation type="unfinished">, %1%2 %3, %4%5%6 {1%2%3,?}</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="396"/>
+        <source>Time: %1%2, Speed: %3%4</source>
+        <translation type="unfinished">Čas: %1, Rychlost: %3%4 {1%2,?}</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+        <source>Moving: %1%2, Speed: %3%4</source>
+        <translation type="unfinished">Pohyb: %1, Rychlost: %3%4 {1%2,?}</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="421"/>
         <source>Start: %1</source>
         <translation>Začátek: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
         <source>Start: -</source>
         <translation>Začátek: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
         <source>End: %1</source>
         <translation>Konec: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
         <source>End: -</source>
         <translation>Konec: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
         <source>Points: %1 (%2)</source>
         <translation>Body: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="443"/>
         <source>Invalid elevations!</source>
         <translation>Neplatné výšky!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>Invalid timestamps!</source>
         <translation>Neplatná časová razítka!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
         <source>Invalid positions!</source>
         <translation>Neplatné polohy!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
         <source>Activities: %1</source>
         <translation>Činnosti: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
         <source>Index: %1</source>
         <translation>Rejstřík: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
         <source>Index: visible %1, total %2</source>
         <translation>Rejstřík: viditelné %1, celkem %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
-        <source>Ele.: %1 %2</source>
-        <translation>Výška: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
-        <source> slope: %1%3 (%2%)</source>
-        <translation> sklon: %1%3 (%2%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
-        <source> speed: %1%2</source>
-        <translation> rychlost: %1%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
         <source>... and %1 tags not displayed</source>
         <translation>... a %1 značek nezobrazeno</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
         <source>Distance: - (-)</source>
         <translation>Vzdálenost: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
         <source>Moving: - (-)</source>
         <translation>Pohyb: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
+        <source>, Descent: %1%2 (%3%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <source>, Moving: %1%2 (%3%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="696"/>
+        <source>, Descent: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1318"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1331"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1387"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1570"/>
         <source>track</source>
         <translation>Stopa</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1522"/>
         <source>Hide point %1.</source>
         <translation>Skrýt bod %1.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1526"/>
         <source>Hide points %1..%2.</source>
         <translation>Skrýt body %1  %2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
-        <source> Moving: %1%2 (%3%)</source>
-        <translation> Pohyb: %1%2 (%3%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="701"/>
         <source>, %1%2</source>
         <translation>, %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
-        <source> Time: %1%2</source>
-        <translation> Čas: %1%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
         <source>, %1-, %2-</source>
         <translation>, %1-, %2-</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
-        <source>Time: %1, Speed: %2 %3</source>
-        <translation>Čas: %1, Rychlost: %2 %3</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
         <source>Time: -, Speed: -</source>
         <translation>Čas: -, Rychlost: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
-        <source>Moving: %1, Speed: %2 %3</source>
-        <translation>Pohyb: %1, Rychlost: %2 %3</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Moving: -, Speed: -</source>
         <translation>Pohyb: -, Rychlost: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
-        <source>Ascent: - (-)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="589"/>
+        <source>Ele.: %1%2</source>
+        <translation type="unfinished">Výška: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
-        <source>Descent: - (-)</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+        <source>, Slope: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
-        <source>Ascent: %1%2 (%3%)</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <source>, Speed: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
-        <source> Descent: %1%2 (%3%)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="636"/>
+        <source>Ascent: - (-)</source>
+        <translation>Stoupání: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
+        <source>Descent: - (-)</source>
+        <translation>Klesání: - (-)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="644"/>
+        <source>Ascent: %1%2 (%3%)</source>
+        <translation>Stoupání: %1%2 (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
         <source>Distance: %1%2 (%3%)</source>
         <translation>Vzdálenost: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
         <source>Ascent: -</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoupání: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
         <source>Descent: -</source>
-        <translation type="unfinished"></translation>
+        <translation>Klesání: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
         <source>Ascent: %1%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
-        <source> Descent: %1%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoupání: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="706"/>
         <source>Distance: %1%2</source>
         <translation>Vzdálenost: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="711"/>
+        <source>, Time: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1377"/>
         <source>Permanently removed points %1..%2</source>
         <translation>Trvale odstraněné body %1 ... %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1555"/>
         <source>Show points.</source>
         <translation>Ukázat body.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2194"/>
         <source>Changed name</source>
         <translation>Změněný název</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2200"/>
         <source>Changed comment</source>
         <translation>Změněná poznámka</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2206"/>
         <source>Changed description</source>
         <translation>Změněný popis</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed links</source>
         <translation>Změněné odkazy</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2223"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation>Výška bodu %1 byla změněna na %2 %3</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2247"/>
         <source>Changed activity to '%1' for complete track.</source>
         <translation>Činnost byla pro celou stopu změněna na '%1'.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2286"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation>Činnost byla změněna pro oblast (%2...%3) na '%1'.</translation>
     </message>
@@ -1283,7 +1305,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="221"/>
         <source>Added terrain slope from DEM file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Přidán sklon území ze souboru s digitálním výškovým modelem (DEM).</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="243"/>
@@ -1293,7 +1315,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="261"/>
         <source>Replaced elevation data with interpolated values. (M=%1, RMSErr=%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Výšková data nahrazena interpolovanými hodnotami. (M=%1, RMSErr=%2)</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="277"/>
@@ -1333,10 +1355,10 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="394"/>
         <source>Converted subpoints from routing to track points</source>
-        <translation type="unfinished"></translation>
+        <translation>Podbody převedeny ze stanovení směru cesty na body stopy</translation>
     </message>
     <message>
-        <location filename="../qlgt/converter.cpp" line="195"/>
+        <location filename="../qlgt/converter.cpp" line="196"/>
         <source>Copy flag information from QLandkarte GT track</source>
         <translation>Kopírovat informační příznak ze stopy QLandkarte GT</translation>
     </message>
@@ -1359,70 +1381,85 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation>Nedostupné</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="104"/>
         <source>_Clone</source>
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
-        <source>Elevation: %1 %2</source>
-        <translation>Výška: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="277"/>
+        <source>Elevation: %1%2</source>
+        <translation type="unfinished">Výška: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
-        <source>Proximity: %1 %2</source>
-        <translation>Blízkost: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="288"/>
+        <source>Proximity: %1%2</source>
+        <translation type="unfinished">Blízkost: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
         <source>Changed name</source>
         <translation>Změněný název</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
         <source>Changed position</source>
         <translation>Změněná poloha</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
         <source>Changed elevation</source>
         <translation>Změněná výška</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="413"/>
+        <source>Removed proximity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="417"/>
         <source>Changed proximity</source>
         <translation>Změněná blízkost</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="432"/>
         <source>Changed icon</source>
         <translation>Změněná ikona</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="438"/>
         <source>Changed comment</source>
         <translation>Změněná poznámka</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="444"/>
         <source>Changed description</source>
         <translation>Změněný popis</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="450"/>
         <source>Changed links</source>
         <translation>Změněné odkazy</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="456"/>
         <source>Changed images</source>
         <translation>Změněné obrázky</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="462"/>
         <source>Add image</source>
         <translation>Přidat obrázek</translation>
     </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="877"/>
+        <source>Changed to proximity-radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="882"/>
+        <source>Changed to nogo-area</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CGisListDB</name>
@@ -1469,12 +1506,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     <message>
         <location filename="../gis/CGisListDB.cpp" line="127"/>
         <source>Import from Files...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zavést ze souborů...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="128"/>
         <source>Export to GPX...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyvést do GPX...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="131"/>
@@ -1550,7 +1587,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     <message>
         <location filename="../gis/CGisListDB.cpp" line="1055"/>
         <source>Import GIS Data...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zavést údaje GIS...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="508"/>
@@ -1577,251 +1614,271 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
 <context>
     <name>CGisListWks</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="117"/>
+        <location filename="../gis/CGisListWks.cpp" line="122"/>
         <source>Save</source>
         <translation>Uložit</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="101"/>
+        <location filename="../gis/CGisListWks.cpp" line="106"/>
         <source>Edit..</source>
         <translation>Upravit...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="126"/>
+        <location filename="../gis/CGisListWks.cpp" line="131"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="140"/>
         <source>Update Project on Device</source>
         <translation>Aktualizovat projekt na zařízení</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="149"/>
+        <location filename="../gis/CGisListWks.cpp" line="154"/>
         <source>Edit...</source>
         <translation>Upravit...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="102"/>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="155"/>
         <source>Copy to...</source>
         <translation>Kopírovat do...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="113"/>
+        <location filename="../gis/CGisListWks.cpp" line="118"/>
         <source>Autom. Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Automaticky. Uložit</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="118"/>
+        <location filename="../gis/CGisListWks.cpp" line="123"/>
         <source>Save as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Uložit jako...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="159"/>
+        <location filename="../gis/CGisListWks.cpp" line="164"/>
         <source>Copy Track with Waypoints</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopírovat stopu s cestovními body</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="167"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Show Bubble</source>
         <translation>Ukázat bublinu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="169"/>
+        <location filename="../gis/CGisListWks.cpp" line="175"/>
         <source>Move Waypoint</source>
         <translation>Přesunout cestovní bod</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="170"/>
+        <location filename="../gis/CGisListWks.cpp" line="176"/>
         <source>Proj. Waypoint...</source>
         <translation>Promítnutí cestovního bodu...</translation>
     </message>
     <message>
+        <location filename="../gis/CGisListWks.cpp" line="177"/>
+        <source>Change Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../gis/CGisListWks.cpp" line="178"/>
+        <source>Toggle Nogo-Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <source>Delete Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
         <source>Route Instructions</source>
         <translation>Pokyny pro cestu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <location filename="../gis/CGisListWks.cpp" line="191"/>
         <source>Calculate Route</source>
         <translation>Spočítat cestu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="181"/>
+        <location filename="../gis/CGisListWks.cpp" line="192"/>
         <source>Reset Route</source>
         <translation>Nastavit cestu znovu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="193"/>
         <source>Edit Route</source>
         <translation>Upravit cestu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="183"/>
+        <location filename="../gis/CGisListWks.cpp" line="194"/>
         <source>Convert to Track</source>
         <translation>Převést na stopu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="199"/>
+        <location filename="../gis/CGisListWks.cpp" line="212"/>
         <source>Create Route</source>
         <translation>Vytvořit cestu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="200"/>
+        <location filename="../gis/CGisListWks.cpp" line="213"/>
         <source>Change Icon (sel. waypt. only)</source>
-        <translation type="unfinished"></translation>
+        <translation>Změnit ikonu (pouze vybrané cestovní body)</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="158"/>
+        <location filename="../gis/CGisListWks.cpp" line="163"/>
         <source>Set Track Activity</source>
-        <translation type="unfinished">Nastavit činnost stopy</translation>
+        <translation>Nastavit činnost stopy</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="634"/>
+        <location filename="../gis/CGisListWks.cpp" line="646"/>
         <source>Drop items...</source>
         <translation>Zahodit prvky...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="659"/>
-        <location filename="../gis/CGisListWks.cpp" line="1691"/>
-        <location filename="../gis/CGisListWks.cpp" line="1729"/>
+        <location filename="../gis/CGisListWks.cpp" line="671"/>
+        <location filename="../gis/CGisListWks.cpp" line="1771"/>
+        <location filename="../gis/CGisListWks.cpp" line="1809"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation><b>Aktualizovat zařízení</b><p>Aktualizovat %1<br/>Počkejte, prosím...</p></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Delete project...</source>
         <translation>Smazat projekt...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Do you really want to delete %1?</source>
         <translation>Opravdu chcete smazat %1?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Track Profile</source>
         <translation>Profil stopy</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
         <source>Show on Map</source>
         <translation>Ukázat na mapě</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="109"/>
         <source>Hide from Map</source>
         <translation>Skrýt v mapě</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="109"/>
+        <location filename="../gis/CGisListWks.cpp" line="114"/>
         <source>Sort by Time</source>
-        <translation>Třídit podle času</translation>
+        <translation>Řadit podle času</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="110"/>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Sort by Name</source>
-        <translation>Třídit podle názvu</translation>
+        <translation>Řadit podle názvu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="119"/>
+        <location filename="../gis/CGisListWks.cpp" line="124"/>
         <source>Save as GPX 1.1 w/o ext...</source>
-        <translation type="unfinished"></translation>
+        <translation>Uložit jako GPX 1.1 w/o ext...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="122"/>
+        <location filename="../gis/CGisListWks.cpp" line="127"/>
         <source>Send to Devices</source>
         <translation>Poslat do zařízení</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Sync. with Database</source>
         <translation>Seřídit s databází</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="154"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Select Range</source>
         <translation>Vybrat rozsah</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="155"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Edit Track Points</source>
         <translation>Upravit body stopy</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="156"/>
+        <location filename="../gis/CGisListWks.cpp" line="161"/>
         <source>Reverse Track</source>
         <translation>Obrátit stopu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="157"/>
+        <location filename="../gis/CGisListWks.cpp" line="162"/>
         <source>Combine Tracks</source>
         <translation>Spojit stopy</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="192"/>
+        <location filename="../gis/CGisListWks.cpp" line="204"/>
         <source>Edit Area Points</source>
         <translation>Upravit body oblasti</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="166"/>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="785"/>
+        <location filename="../gis/CGisListWks.cpp" line="797"/>
         <source>Saving workspace. Please wait.</source>
         <translation>Ukládá se pracovní prostor. Počkejte, prosím.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="831"/>
+        <location filename="../gis/CGisListWks.cpp" line="843"/>
         <source>Loading workspace. Please wait.</source>
         <translation>Nahrává se pracovní prostor. Počkejte, prosím.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>Close all projects...</source>
         <translation>Zavřít všechny projekty...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>This will remove all projects from the workspace.</source>
         <translation>Tímto budou všechny projekty odstraněny z pracovního prostoru.</translation>
     </message>
 </context>
 <context>
-    <name>CGisWidget</name>
+    <name>CGisWorkspace</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>Load project...</source>
-        <translation>Nahrát projekt...</translation>
+        <translation type="unfinished">Nahrát projekt...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>The project "%1" is already in the workspace.</source>
-        <translation>Projekt "%1" je již náhrán do pracovního prostoru.</translation>
+        <translation type="unfinished">Projekt "%1" je již náhrán do pracovního prostoru.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="213"/>
+        <source><b>Item Selection: </b>Item selected from workspace list. Click on the map to switch back to normal mouse selection behavior.</source>
+        <translation type="unfinished"><b>Výběr prvků: </b>Prvek vybrán ze seznamu pracovního prostoru. Klepněte na mapu pro přepnutí zpět do běžného chování při výběru myší.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="559"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="626"/>
         <source>Copy items...</source>
-        <translation>Kopírovat prvky...</translation>
+        <translation type="unfinished">Kopírovat prvky...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="578"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="645"/>
         <source>Change waypoint symbols.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Změnit značky cestovních bodů.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Cut Track...</source>
-        <translation>Rozkrojit stopu...</translation>
+        <translation type="unfinished">Rozkrojit stopu...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Do you want to delete the original track?</source>
-        <translation>Opravdu chcete smazat původní stopu?</translation>
+        <translation type="unfinished">Opravdu chcete smazat původní stopu?</translation>
     </message>
 </context>
 <context>
@@ -1909,22 +1966,22 @@ line %2, column %3:
     <message>
         <location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
         <source>Cut history before</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyjmout záznam minulosti před</translation>
     </message>
     <message>
         <location filename="../widgets/CHistoryListWidget.cpp" line="38"/>
         <source>Cut history after</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyjmout záznam minulosti po</translation>
     </message>
     <message>
         <location filename="../widgets/CHistoryListWidget.cpp" line="155"/>
         <source>History removal</source>
-        <translation type="unfinished"></translation>
+        <translation>Odstranění záznamu minulosti</translation>
     </message>
     <message>
         <location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
         <source>The removal is permanent and cannot be undone. <b>Do you really want to delete history before this step?</b></source>
-        <translation type="unfinished"></translation>
+        <translation>Odstranění je trvalé a nelze je vrátit zpět. <b>Opravdu chcete smazat záznamy před tímto krokem?</b></translation>
     </message>
 </context>
 <context>
@@ -1948,98 +2005,297 @@ line %2, column %3:
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
+        <source>Air Temp.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
         <source>Air Temperature</source>
-        <translation>Teplota vzduchu</translation>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Teplota vzduchu</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
+        <source>Water Temp.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
         <source>Water Temperature</source>
-        <translation>Teplota vody</translation>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Teplota vody</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
+        <source>Depth</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Hloubka</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
         <source>Depth</source>
-        <translation>Hloubka</translation>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Hloubka</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
+        <source>Heart R.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
         <source>Heart Rate</source>
-        <translation>Tep srdce</translation>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Tep srdce</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="93"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="112"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
         <source>Cadence</source>
-        <translation>Rychlost chůze</translation>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Rychlost chůze</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
+        <source>Cadence</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Rychlost chůze</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
         <source>Speed</source>
-        <translation>Rychlost</translation>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Rychlost</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <source>Speed</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Rychlost</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+        <source>Accel.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
         <source>Acceleration</source>
-        <translation>Zrychlení</translation>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Zrychlení</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
         <source>Course</source>
-        <translation>Směr</translation>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Směr</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
-        <source>Temperature</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
+        <source>Course</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Směr</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
+        <source>Temp.</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
+        <source>Temperature</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Teplota</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
+        <source>Dist.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Vzdál.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
         <source>Distance</source>
-        <translation type="unfinished"></translation>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Vzdálenost</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Ele.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Výška</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <source>Elevation</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Výška</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
         <source>Energy</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Síla</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
+        <source>Energy</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Síla</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Sea Lev. Pres.</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
         <source>Sea Level Pressure</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Tlak u hladiny moře</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>v. Speed</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
-        <source>Speed (vertical)</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>Vertical Speed</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
         <source>Slope*</source>
         <translation>Sklon*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
-        <source>Speed*</source>
-        <translation>Rychlost*</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Sklon</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
-        <source>Elevation</source>
-        <translation>Výška</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <source>Speed over Distance*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
+        <source>Speed over Time*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Elevation*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
         <source>Progress</source>
-        <translation>Postup</translation>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Postup</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
+        <source>Progress*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terr. Slope</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
-        <source>Terrain slope</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terrain Slope*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLogProject</name>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="62"/>
+        <source>Failed to load file %1...</source>
+        <translation type="unfinished">Nepodařilo se nahrát soubor %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="84"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished">Nepodařilo se otevřít %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="95"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation type="unfinished">Chyba při čtení: %1
+Řádek %2, Sloupec %3:
+%4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="102"/>
+        <source>Not an Openambit log file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="113"/>
+        <source>Device: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="140"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="145"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="150"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="182"/>
+        <source>Use of local time...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="183"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="245"/>
+        <source>This LOG file does not contain any position data and can not be displayed by QMapShack: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2054,55 +2310,56 @@ line %2, column %3:
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="813"/>
+        <location filename="../CMainWindow.cpp" line="859"/>
         <source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
         <translation>Použít <b>Nabídka → Pohled → Přidat pohled na mapu</b> k otevření nového pohledu. Nebo <b>Nabídka → Soubor → Nahrát pohled na mapu</b> k obnovení uložené. Nebo klepněte <a href='newview'>sem</a>.</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="941"/>
-        <source>Ele: %1%2</source>
-        <translation>Výška: %1%2</translation>
+        <location filename="../CMainWindow.cpp" line="987"/>
+        <source>Ele.: %1%2</source>
+        <translation type="unfinished">Výška: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="953"/>
+        <location filename="../CMainWindow.cpp" line="999"/>
         <source>Slope: %1%2</source>
-        <translation type="unfinished"></translation>
+        <comment>terrain</comment>
+        <translation type="unfinished">Sklon: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="969"/>
+        <location filename="../CMainWindow.cpp" line="1015"/>
         <source>[Grid: %1]</source>
         <translation>[Mřížka: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1110"/>
+        <location filename="../CMainWindow.cpp" line="1156"/>
         <source>Load GIS Data...</source>
         <translation>Nahrát data GIS...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
         <source>Select output file</source>
         <translation>Vybrat výstupní soubor</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>QMapShack View (*.view)</source>
         <translation>Pohled QMapShack (*.view)</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>Select file to load</source>
         <translation>Vybrat soubor k nahrání</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1481"/>
+        <location filename="../CMainWindow.cpp" line="1532"/>
         <source>Fatal...</source>
         <translation>Kritické...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1482"/>
+        <location filename="../CMainWindow.cpp" line="1533"/>
         <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
-        <translation type="unfinished"></translation>
+        <translation>QMapShack zjistil, že knihovna Proj4 je nainstalována špatně. Chybí překladové tabulky pro promítání EPSG, jež jsou obvykle uloženy v /usr/share/proj. Spojte se, prosím, s údržbářem balíčku ve vaší distribuci, aby to spravil.</translation>
     </message>
 </context>
 <context>
@@ -2112,7 +2369,9 @@ line %2, column %3:
         <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
 
 If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
-        <translation type="unfinished"></translation>
+        <translation>Nyní tu nejsou žádné mapy. S QMapShack bez map není žádná zábava. Mapy můžete nainstalovat po stisknutí tlačítka Pomoc! Potřebuji mapy! v panelovém okně Mapy. Nebo můžete stisknout klávesu F1 pro otevření dokumentace na internetu, která vám poví, jak QMapShack používat.
+
+A když to bez map nejde, proč je neposkytujete? Protože mít mapy připravené ke stažení vyžaduje dobrý server. A to není služba zadarmo. Projektu se (na to) nedostává peněz. A mapy a data výškových modelů (DEM) jsou chráněna autorskými právy (právy ke kopírování). Z toho důvodu musí být držitel práv před zabalením dat požádán. Není to tak lehké, jak to může znít a za některá data se platí poplatky za užívání. Projektu zkrátka chybí prostředky, aby to dělal. Myslíme si dále, že žádat po vá [...]
     </message>
 </context>
 <context>
@@ -2683,13 +2942,14 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
     <message>
         <location filename="../map/CMapIMG.cpp" line="432"/>
         <source>Read external type file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Přečíst vnější typ souboru...</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="432"/>
         <source>Failed to read type file: %1
 Fall back to internal types.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepodařilo se přečíst typ souboru: %1
+Návrat k vnitřním typům.</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="474"/>
@@ -2811,7 +3071,7 @@ Fall back to internal types.</source>
     <message>
         <location filename="../map/CMapPropSetup.cpp" line="196"/>
         <source>Select type file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybrat typ souboru...</translation>
     </message>
 </context>
 <context>
@@ -3050,42 +3310,42 @@ Neznámá stavba.</translation>
 <context>
     <name>CMouseNormal</name>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="39"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
         <source>Add POI as Waypoint</source>
-        <translation type="unfinished"></translation>
+        <translation>Přidat POI jako cestovní bod</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
         <source>Add Waypoint</source>
         <translation>Přidat cestovní bod</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
         <source>Add Track</source>
         <translation>Přidat stopu</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
         <source>Add Route</source>
         <translation>Přidat cestu</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="44"/>
         <source>Add Area</source>
         <translation>Přidat oblast</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="45"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="46"/>
         <source>Select Items On Map</source>
         <translation>Vybrat prvky na mapě</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
         <source>Copy position</source>
         <translation>Kopírovat polohu</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="49"/>
         <source>Copy position (Grid)</source>
         <translation>Kopírovat polohu (mřížka)</translation>
     </message>
@@ -3101,9 +3361,9 @@ Neznámá stavba.</translation>
 <context>
     <name>CMouseRangeTrk</name>
     <message>
-        <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
+        <location filename="../mouse/CMouseRangeTrk.cpp" line="239"/>
         <source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
-        <translation type="unfinished"></translation>
+        <translation><b>Upravit rozsah</b><br/>Vyberte první bod stopy klepnutím levým tlačítkem myši. A potom druhý bod. Opusťte výběr rozsahu klepnutím pravým tlačítkem myši.<br/></translation>
     </message>
 </context>
 <context>
@@ -3151,26 +3411,26 @@ Neznámá stavba.</translation>
     <name>CPlot</name>
     <message>
         <location filename="../plot/CPlot.cpp" line="55"/>
-        <source>distance [%1]</source>
-        <translation>Vzdálenost [%1]</translation>
+        <source>Distance [%1]</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../plot/CPlot.cpp" line="60"/>
-        <source>time</source>
-        <translation>Čas</translation>
+        <source>Time</source>
+        <translation type="unfinished">Čas</translation>
     </message>
 </context>
 <context>
     <name>CPlotProfile</name>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="79"/>
-        <source>distance [%1]</source>
-        <translation>Vzdálenost [%1]</translation>
+        <source>Distance [%1]</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="80"/>
-        <source>alt. [%1]</source>
-        <translation>Výška [%1]</translation>
+        <source>Ele. [%1]</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3222,12 +3482,12 @@ y: %4 m/px</translation>
 <context>
     <name>CProgressDialog</name>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="46"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="48"/>
         <source>Elapsed time: %1</source>
         <translation>Uplynulý čas: %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="132"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="134"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation>Uplynulý čas: %1 sekund.</translation>
     </message>
@@ -3275,6 +3535,29 @@ není platným vymezením soustavy souřadnic
     </message>
 </context>
 <context>
+    <name>CQlbProject</name>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open...</source>
+        <translation type="unfinished">Nepodařilo se otevřít...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished">Nepodařilo se otevřít %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="138"/>
+        <source>Could not convert...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="139"/>
+        <source>The file contains overlays that can not be converted. This is because QMapShack does not support all overlay types of QLandkarte.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CQlgtDb</name>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="308"/>
@@ -3460,116 +3743,122 @@ není platným vymezením soustavy souřadnic
 <context>
     <name>CRouterBRouter</name>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
         <source>original</source>
-        <translation type="unfinished"></translation>
+        <translation>Původní</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
         <source>first alternative</source>
-        <translation type="unfinished"></translation>
+        <translation>První náhradní</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
         <source>second alternative</source>
-        <translation type="unfinished"></translation>
+        <translation>Druhý náhradní</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="53"/>
         <source>third alternative</source>
-        <translation type="unfinished"></translation>
+        <translation>Třetí náhradní</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="148"/>
         <source>BRouter (offline)</source>
-        <translation type="unfinished"></translation>
+        <translation>BRouter (nepřipojeno)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="155"/>
         <source>BRouter (online)</source>
-        <translation type="unfinished"></translation>
+        <translation>BRouter (připojeno)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="185"/>
         <source>profile: %1, alternative: %2</source>
+        <translation>Profil: %1, náhradní: %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="283"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="408"/>
+        <source>BRouter does not support more then 1 nogo-area in this version, consider to upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="297"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="420"/>
         <source>response is empty</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpověď je prázdná</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="334"/>
         <source>Bad response from server: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Špatná odpověď od serveru: %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="386"/>
         <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
-        <translation type="unfinished"></translation>
+        <translation><b>BRouter</b><br/>Požadavek na stanovení cesty poslán serveru. Počkejte, prosím...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="270"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="389"/>
         <source>Calculate route with %1</source>
-        <translation type="unfinished">Spočítat cestu s %1</translation>
+        <translation>Spočítat cestu s %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="454"/>
         <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
-        <translation type="unfinished"></translation>
+        <translation><b>BRouter</b><br/>Špatná odpověď od serveru:<br/>%1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="444"/>
         <source><br/>Calculation time: %1s</source>
-        <translation type="unfinished"><br/>Doba výpočtu: %1 s</translation>
+        <translation><br/>Doba výpočtu: %1 s</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="548"/>
         <source>Error</source>
-        <translation type="unfinished">Chyba</translation>
+        <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="600"/>
         <source>running</source>
-        <translation type="unfinished"></translation>
+        <translation>Běží</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="592"/>
         <source>starting</source>
-        <translation type="unfinished"></translation>
+        <translation>Začíná</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="554"/>
         <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local  [...]
-        <translation type="unfinished"></translation>
+        <translation>QMapShack se s BRouter dorozumívá přes síťové spojení. Obyčejně se tak děje na zvláštní adrese, na kterou nelze dosáhnout vně vašeho zařízení. BRouter nicméně naslouchá spojení na všech dostupných rozhraních. Pokud jste ve své vlastní síti se zapnutým firewallem (ohnivou zdí), není to až zas takový problém. Pokud jste ve veřejné síti, každá otevřená přípojka (port) představuje nebezpečí, protože může být využita ještě někým dalším s možným úmyslem ohrozit váš systém. [...]
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="581"/>
         <source>Warning...</source>
-        <translation type="unfinished">Varování...</translation>
+        <translation>Varování...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="586"/>
         <source>I understand the risk. Don't tell me again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozumím nebezpečí. Znovu už mě neupozorňovat.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="607"/>
         <source>stopped</source>
-        <translation type="unfinished"></translation>
+        <translation>Zastaveno</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="618"/>
         <source>not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenainstalováno</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="629"/>
         <source>online</source>
-        <translation type="unfinished"></translation>
+        <translation>Připojeno</translation>
     </message>
 </context>
 <context>
@@ -3577,22 +3866,22 @@ není platným vymezením soustavy souřadnic
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
         <source>%1 not accessible</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Není přístupný</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
         <source>%1 invalid result</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Neplatný výsledek</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
         <source>Error parsing online-config:</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při zpracování nastavení na internetu:</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="538"/>
         <source>Network error:</source>
-        <translation type="unfinished"></translation>
+        <translation>Síťová chyba:</translation>
     </message>
 </context>
 <context>
@@ -3600,164 +3889,164 @@ není platným vymezením soustavy souřadnic
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
         <source>Restore Default Values</source>
-        <translation type="unfinished"></translation>
+        <translation>Obnovit výchozí hodnoty</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
         <source>Open Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Otevřít adresář</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
         <source>select Java Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybrat spustitelný soubor Java</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="414"/>
         <source>please select BRouter installation directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyberte, prosím, instalační adresář pro BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="419"/>
         <source>selected directory does not exist</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybraný adresář neexistuje</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="420"/>
         <source>create directory and install BRouter there</source>
-        <translation type="unfinished"></translation>
+        <translation>Vytvořit adresář a nainstalovat do něj BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="427"/>
         <source>existing BRouter installation</source>
-        <translation type="unfinished"></translation>
+        <translation>Stávající instalace BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="428"/>
         <source>update existing BRouter installation</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizovat stávající instalaci BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="433"/>
         <source>empty directory, create new BRouter installation here</source>
-        <translation type="unfinished"></translation>
+        <translation>Prázdný adresář. Vytvořit novou instalaci BRouter zde</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
         <source>create new BRouter installation</source>
-        <translation type="unfinished"></translation>
+        <translation>Vytvořit novou instalaci BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
         <source>seems to be a valid Java-executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Zdá se, že se jedná o platný spustitelný soubor Java</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
         <source>doesn't seem to be a valid Java-executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Zdá se, že se nejedná o platný spustitelný soubor Java</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
         <source>Java Executable not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Spustitelný soubor Java nenalezen</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="496"/>
         <source>Error loading installation-page at %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při nahrávání instalační stránky na %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="505"/>
         <source>no brouter-version to install selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Nvybrána žádná verze BRouter k nainstalování</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="513"/>
         <source>selected %1 for download and installation</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybráno %1 pro stažení a instalaci</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
         <source>Warning...</source>
-        <translation type="unfinished">Varování...</translation>
+        <translation>Varování...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
         <source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
-        <translation type="unfinished"></translation>
+        <translation>Stáhnout: %1<br/><br/>Toto stáhne  nainstaluje soubor zip z umístění se staženými soubory, které není jakkoli se to vezme bezpečné, používající prostý HTTP. Obyčejně by to mělo být HTTPS. Nebezpečí spočívá v tom, že někdo přesměruje požadavek a pošle vám náhradou archiv zip se škodlivým programem. QMapShack toto nemá jak zjistit. <br/>Pokud tomu nerozumíte a máte pochybnosti, nepokračujte a přerušte. Místo toho použijte internetovou verzi BRouter.</ [...]
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
         <source>I understand the risk and wish to proceed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozumím nebezpečí a přeji si pokračovat.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
         <source>download %1 started</source>
-        <translation type="unfinished"></translation>
+        <translation>Stahování %1 začalo</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
         <source>Network Error: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba v síti: %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
         <source>download %1 finished</source>
-        <translation type="unfinished"></translation>
+        <translation>Stahování %1 dokončeno</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
         <source>unzipping:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozbalení:</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
         <source>ready.</source>
-        <translation type="unfinished"></translation>
+        <translation>Připraven.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="613"/>
         <source>download of brouter failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepodařilo se stáhnout BRouter: %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="623"/>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="630"/>
         <source>retrieving available profiles from %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Získávají se dostupné profily z %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="654"/>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="736"/>
         <source>content of profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Obsah profilu</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
         <source>Error:</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba: </translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
         <source>Error creating directory %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při vytváření adresáře %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="571"/>
         <source>Error directory %1 does not exist</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba adresář %1 neexistuje</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="578"/>
         <source>Error creating file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při vytváření souboru %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="582"/>
         <source>Error writing to file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při zápisu do souboru %1.</translation>
     </message>
 </context>
 <context>
@@ -3765,7 +4054,7 @@ není platným vymezením soustavy souřadnic
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
         <source>Continue with Setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokračovat v nastavování</translation>
     </message>
 </context>
 <context>
@@ -3773,125 +4062,125 @@ není platným vymezením soustavy souřadnic
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
         <source>available routing-data is being determined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dostupná data se stanovením cesty jsou určena.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="108"/>
         <source>Select outdated</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybrat zastaralé</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
         <source>Clear Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyprázdnit výběr</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
         <source>Delete selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Smazat výběr</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Stáhnout</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="281"/>
         <source>Error creating segments directory %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při vytváření adresáře s částmi %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="365"/>
         <source>cannot parse: %1 is not a date</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze zpracovat: %1 není datum</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="390"/>
         <source>cannot parse: %1 is not a valid size</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze zpracovat: %1 není platná velikost</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="409"/>
         <source>Error retrieving available routing data from %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při získávání dostupných dat se stanovením cesty z %1: %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="490"/>
         <source>segments directory does not exist: </source>
-        <translation type="unfinished"></translation>
+        <translation>Adresář s částmi neexistuje: </translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="504"/>
         <source>error creating file %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při vytváření souboru %1: %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="536"/>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="576"/>
         <source>no valid request for filename %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Žádný platný požadavek pro souborový název %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="541"/>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="584"/>
         <source>no open file assigned to request for %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Žádný otevřený soubor nepřiřazen k požadavku pro %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="551"/>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="594"/>
         <source>error writing to file %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při zápisu do souboru %1: %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="620"/>
         <source>error renaming file %1 to %2: %3</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při přejmenovávání souboru %1 na %2: %3</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="694"/>
         <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktuální: %1 (%2), zastaralé: %3 (%4), ke stažení: %5 (%6)</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
         <source>being downloaded: %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Stahuje se: %1 z %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
         <source>no local data, online available: %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Žádná místní data, dostupná na internetu: %1 (%2)</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="798"/>
         <source>local data outdated (%1, %2 - remote %3, %4)</source>
-        <translation type="unfinished"></translation>
+        <translation>Místní data zastaralá (%1, %2 - vzdálený %3, %4)</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
         <source>Error removing %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při odstraňování souboru %1: %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
         <source>Network Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Síťová chyba</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
         <source>invalid result, no files found</source>
-        <translation type="unfinished"></translation>
+        <translation>Neplatný výsledek, nenalezeny žádné soubory</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="806"/>
         <source>local data up to date (%1, %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Místní data aktuální (%1, %2)</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="818"/>
         <source>no routing-data available</source>
-        <translation type="unfinished"></translation>
+        <translation>Nejsou dostupná žádná data se stanovením cesty</translation>
     </message>
 </context>
 <context>
@@ -3900,13 +4189,13 @@ není platným vymezením soustavy souřadnic
         <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
         <source>!!! done !!!
 </source>
-        <translation type="unfinished">Hotovo!</translation>
+        <translation>Hotovo!</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
         <source>!!! failed !!!
 </source>
-        <translation type="unfinished">Nepodařilo se!</translation>
+        <translation>Nepodařilo se!</translation>
     </message>
 </context>
 <context>
@@ -4019,7 +4308,7 @@ není platným vymezením soustavy souřadnic
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="301"/>
         <source><b>MapQuest</b><br/>Routing request sent to server. Please wait...</source>
-        <translation><b>MapQuest</b><br/>Požadavek na stanovením cesty poslán serveru. Počkejte, prosím...</translation>
+        <translation><b>MapQuest</b><br/>Požadavek na stanovení cesty poslán serveru. Počkejte, prosím...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="312"/>
@@ -4280,7 +4569,7 @@ není platným vymezením soustavy souřadnic
     <message>
         <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
         <source>BRouter (online)</source>
-        <translation type="unfinished"></translation>
+        <translation>BRouter (připojeno)</translation>
     </message>
 </context>
 <context>
@@ -4291,17 +4580,17 @@ není platným vymezením soustavy souřadnic
         <translation>Vytvořit databázi Routino</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="58"/>
         <source>Select files...</source>
         <translation>Vybrat soubory...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="82"/>
         <source>Select target path...</source>
         <translation>Vybrat cílovou cestu...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="143"/>
         <source>!!! done !!!
 </source>
         <translation>Hotovo!</translation>
@@ -4312,7 +4601,7 @@ není platným vymezením soustavy souřadnic
     <message>
         <location filename="../mouse/CScrOptRangeTrk.cpp" line="38"/>
         <source>No range selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Nevybrán žádný rozsah</translation>
     </message>
 </context>
 <context>
@@ -4491,6 +4780,73 @@ line %2, column %3:
     </message>
 </context>
 <context>
+    <name>CSmlProject</name>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="63"/>
+        <source>Failed to load file %1...</source>
+        <translation type="unfinished">Nepodařilo se nahrát soubor %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="85"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished">Nepodařilo se otevřít %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="96"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation type="unfinished">Chyba při čtení: %1
+Řádek %2, Sloupec %3:
+%4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="103"/>
+        <source>Not an sml file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="129"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="134"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="139"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="148"/>
+        <source>Battery usage: %1 %/hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="160"/>
+        <source>Device: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="195"/>
+        <source>Use of local time...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="196"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="245"/>
+        <source>This SML file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CTableTrk</name>
     <message>
         <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
@@ -4504,8 +4860,8 @@ line %2, column %3:
         <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
-        <source>%1 %2</source>
-        <translation>%1 %2</translation>
+        <source>%1%2</source>
+        <translation type="unfinished">%1%2</translation>
     </message>
 </context>
 <context>
@@ -4513,97 +4869,97 @@ line %2, column %3:
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
         <source>Failed to load file %1...</source>
-        <translation type="unfinished">Nepodařilo se nahrát soubor %1...</translation>
+        <translation>Nepodařilo se nahrát soubor %1...</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="73"/>
         <source>Failed to open %1</source>
-        <translation type="unfinished">Nepodařilo se otevřít %1</translation>
+        <translation>Nepodařilo se otevřít %1</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="84"/>
         <source>Failed to read: %1
 line %2, column %3:
  %4</source>
-        <translation type="unfinished">Chyba při čtení: %1
+        <translation>Chyba při čtení: %1
 Řádek %2, Sloupec %3:
 %4</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="91"/>
         <source>Not a TCX file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Není to soubor TCX: %1</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="101"/>
         <source>This TCX file contains at least 1 workout, but neither an activity nor a course. As workouts do not contain position data, they can not be imported to QMapShack.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tento soubor TCX obsahuje alespoň 1 řešení, ale není to ani činnost ani směr. A jelikož ta řešení neobsahují údaje o poloze, nelze je zavést do QMapShack.</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="106"/>
         <source>This TCX file does not contain any activity or course: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Tento soubor TCX neobsahuje žádnou činnost ani směr: %1</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="275"/>
         <source>File exists ...</source>
-        <translation type="unfinished">Soubor existuje...</translation>
+        <translation>Soubor existuje...</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="276"/>
         <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
-        <translation type="unfinished"></translation>
+        <translation>Soubor existuje a nebyl vytvořen QMapShack. Pokud stisknete Ano, všechna data v tomto poli budou ztracena.I když tento soubor obsahuje data a byl nahrán QMapShack, QMapShack nemusí být schopen nahrát a uložit všechny prvky tohoto souboru. Tyto prvky budou ztraceny. Doporučuje se použít jiný soubor. <b>Opravdu chcete soubor přepsat?</b></translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="315"/>
         <source>The track <b>%1</b> you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. <b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b></source>
-        <translation type="unfinished"></translation>
+        <translation>Stopa <b>%1</b>, kterou jste vybrali, obsahuje body stopy s neplatnými časovými razítky. Zařízení nemusí vytvořený soubor TCX se směrem přijmout, pokud se to tak nechá. <b>Chcete použít filtr se stálou rychlostí (10 m/s) a pokračovat?</b></translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
         <source>Course</source>
-        <translation type="unfinished">Směr</translation>
+        <translation>Směr</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
         <source>Activity</source>
-        <translation type="unfinished">Činnost</translation>
+        <translation>Činnost</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Zrušit</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
         <source>Track with invalid timestamps...</source>
-        <translation type="unfinished"></translation>
+        <translation>Stopa s neplatnými časovými razítky...</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="334"/>
         <source>Activity or course?</source>
-        <translation type="unfinished"></translation>
+        <translation>Činnost nebo směr?</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
         <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
-        <translation type="unfinished"></translation>
+        <translation>QMapShack neví, jak má být stopa <b>%1</b> uložena. <b>Chcete ji uložit jako směr nebo jako činnost? </b> Zapamatujte si, že pouze cestovní body, které jsou dostatečně blízko stopy, budou uloženy, když bude uložena jako směr. Cestovní body nebudou uloženy, když je stopa ukládána jako činnost.</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
         <source>Failed to create file '%1'</source>
-        <translation type="unfinished">Nepodařilo se vytvořit soubor '%1'</translation>
+        <translation>Nepodařilo se vytvořit soubor '%1'</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
         <source>Failed to write file '%1'</source>
-        <translation type="unfinished">Nepodařilo se zapsat soubor '%1'</translation>
+        <translation>Nepodařilo se zapsat soubor '%1'</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="435"/>
         <location filename="../gis/tcx/CTcxProject.cpp" line="454"/>
         <source>Saving GIS data failed...</source>
-        <translation type="unfinished">Nepodařilo se uložit data GIS...</translation>
+        <translation>Nepodařilo se uložit data GIS...</translation>
     </message>
 </context>
 <context>
@@ -4611,32 +4967,32 @@ line %2, column %3:
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
         <source>choose one...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybrat jeden...</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
         <source>Hiking Tour Summary (built-in)</source>
-        <translation type="unfinished"></translation>
+        <translation>Přehled pěšího výletu (vestavěno)</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>-</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
         <source>Template path...</source>
-        <translation type="unfinished"></translation>
+        <translation>Cesta k předloze...</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
         <source>Failed to read template file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepodařilo se přečíst soubor s předlohou %1.</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
         <source>Preview...</source>
-        <translation type="unfinished"></translation>
+        <translation>Náhled...</translation>
     </message>
 </context>
 <context>
@@ -4657,12 +5013,12 @@ line %2, column %3:
     <message>
         <location filename="../helpers/CToolBarSetupDialog.cpp" line="43"/>
         <source>Available Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Dostupné činnosti</translation>
     </message>
     <message>
         <location filename="../helpers/CToolBarSetupDialog.cpp" line="44"/>
         <source>Selected Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybrané činnosti</translation>
     </message>
 </context>
 <context>
@@ -4710,7 +5066,7 @@ line %2, column %3:
     <message>
         <location filename="../helpers/CWptIconDialog.cpp" line="161"/>
         <source>Path to user icons...</source>
-        <translation>Cesta k uživatelským symbolům...</translation>
+        <translation>Cesta k uživatelským značkám...</translation>
     </message>
 </context>
 <context>
@@ -4718,187 +5074,187 @@ line %2, column %3:
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formulář</translation>
+        <translation>Formulář</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
         <source>Participants</source>
-        <translation type="unfinished"></translation>
+        <translation>Účastníci</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
         <source>Weather</source>
-        <translation type="unfinished"></translation>
+        <translation>Počasí</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
         <source>rain</source>
-        <translation type="unfinished"></translation>
+        <translation>Déšť</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
         <source>sunny</source>
-        <translation type="unfinished"></translation>
+        <translation>Slunečno</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
         <source>snow</source>
-        <translation type="unfinished"></translation>
+        <translation>Sněžení</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
         <source>clouds</source>
-        <translation type="unfinished"></translation>
+        <translation>Oblačnost</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
         <source>windy</source>
-        <translation type="unfinished"></translation>
+        <translation>Větrno</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
         <source>hot</source>
-        <translation type="unfinished"></translation>
+        <translation>Horko</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
         <source>warm</source>
-        <translation type="unfinished"></translation>
+        <translation>Teplo</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
         <source>cold</source>
-        <translation type="unfinished"></translation>
+        <translation>Chladno</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
         <source>freezing</source>
-        <translation type="unfinished"></translation>
+        <translation>Mrazivo</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
         <source>foggy</source>
-        <translation type="unfinished"></translation>
+        <translation>Mlhavo</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
         <source>humid</source>
-        <translation type="unfinished"></translation>
+        <translation>Vlhko</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
         <source>Character</source>
-        <translation type="unfinished"></translation>
+        <translation>Povaha</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
         <source>easy hiking</source>
-        <translation type="unfinished"></translation>
+        <translation>Snadný pěší výlet</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
         <source>climbing</source>
-        <translation type="unfinished"></translation>
+        <translation>Lezení</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
         <source>alpine</source>
-        <translation type="unfinished"></translation>
+        <translation>Pěší výlet v horách</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
         <source>large ascend</source>
-        <translation type="unfinished"></translation>
+        <translation>Velké stoupání</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
         <source>long distance</source>
-        <translation type="unfinished"></translation>
+        <translation>Velká vzdálenost</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
         <source>via ferrata</source>
-        <translation type="unfinished"></translation>
+        <translation>Zajištěná cesta</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
         <source>hail/soft hail</source>
-        <translation type="unfinished"></translation>
+        <translation>Kroupy/sněhové krupky</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
         <source>Rating</source>
-        <translation type="unfinished"></translation>
+        <translation>Hodnocení</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
         <source>Rating 5 stars</source>
-        <translation type="unfinished"></translation>
+        <translation>Hodnocení 5 hvězd</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
         <source>Rating 4 stars</source>
-        <translation type="unfinished"></translation>
+        <translation>Hodnocení 4 hvězdy</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
         <source>Rating 3 stars</source>
-        <translation type="unfinished"></translation>
+        <translation>Hodnocení 3 hvězdy</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
         <source>Rating 2 stars</source>
-        <translation type="unfinished"></translation>
+        <translation>Hodnocení 2 hvězdy</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
         <source>Rating 1 star</source>
-        <translation type="unfinished"></translation>
+        <translation>Hodnocení 1 hvězda</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
         <source>aborted</source>
-        <translation type="unfinished"></translation>
+        <translation>Zrušeno</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
         <source>Equipment</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybavení</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
         <source>ferrata gear</source>
-        <translation type="unfinished"></translation>
+        <translation>Výstroj pro zajištěnou cestu</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
         <source>night gear</source>
-        <translation type="unfinished"></translation>
+        <translation>Noční výstroj</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
         <source>snow shoes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sněžnice</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
         <source>climbing gear</source>
-        <translation type="unfinished"></translation>
+        <translation>Horolezecká výstroj</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
         <source>ski</source>
-        <translation type="unfinished"></translation>
+        <translation>Lyže</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
         <source>camping gear</source>
-        <translation type="unfinished"></translation>
+        <translation>Tábornické vybavení</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Podrobnosti</translation>
     </message>
 </context>
 <context>
@@ -4955,7 +5311,7 @@ line %2, column %3:
     <message>
         <location filename="../IAbout.ui" line="212"/>
         <source>Oliver Eichler</source>
-        <translation type="unfinished"></translation>
+        <translation>Oliver Eichler</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="225"/>
@@ -4975,17 +5331,17 @@ line %2, column %3:
     <message>
         <location filename="../IAbout.ui" line="295"/>
         <source>Russian:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruština:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="302"/>
         <source>Wolfgang Thämelt</source>
-        <translation type="unfinished"></translation>
+        <translation>Wolfgang Thämelt</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="428"/>
         <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
-        <translation type="unfinished">© 2014 Oliver Eichler (oliver.eichler at gmx.de) {2016 ?} {2017 ?}</translation>
+        <translation>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="189"/>
@@ -5052,7 +5408,9 @@ line %2, column %3:
         <source>Christian Eichler (qms at christian-eichler.de)
 Ivo Kronenberg
 Norbert Truchsess (norbert.truchsess at t-online.de)</source>
-        <translation type="unfinished"></translation>
+        <translation>Christian Eichler (qms at christian-eichler.de)
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="421"/>
@@ -5090,7 +5448,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../canvas/ICanvasSetup.ui" line="66"/>
         <source>Square (optimized for TMS and WMTS tiles)</source>
-        <translation type="unfinished"></translation>
+        <translation>druhá mocnina (vyladěno pro dlaždice TMS a WMTS)</translation>
     </message>
 </context>
 <context>
@@ -5111,7 +5469,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
         <source>Available Tracks</source>
-        <translation type="unfinished"></translation>
+        <translation>Dostupné stopy</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
@@ -5124,7 +5482,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
         <source>Combined Tracks</source>
-        <translation type="unfinished"></translation>
+        <translation>Spojené stopy</translation>
     </message>
 </context>
 <context>
@@ -5189,7 +5547,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="55"/>
         <source>Cut Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>Režim rozkrojení:</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="136"/>
@@ -5403,42 +5761,42 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
         <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="118"/>
+        <location filename="../dem/IDemList.ui" line="112"/>
         <source>To add files with elevation data use <b>File->Setup DEM Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
         <translation>Pro přidání souborů s údaji o výšce použijte <b>Soubor → Nastavit cesty k výškovým modelům</b>. Nebo klepněte <a href='setup'><b>sem</b></a></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="131"/>
+        <location filename="../dem/IDemList.ui" line="125"/>
         <source>Use the context menu (right mouse button click on entry) to activate a file. Use drag-n-drop to move the activated file in the process order. </source>
         <translation>Použijte související nabídku (klepnutí pravým tlačítkem myši na položku) pro zapnutí souboru. Použijte přetažení a upuštění pro posunutí zapnutého souboru v pořadí procesů. </translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="156"/>
+        <location filename="../dem/IDemList.ui" line="150"/>
         <source>Activate</source>
         <translation>Zapnout</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="165"/>
+        <location filename="../dem/IDemList.ui" line="159"/>
         <source>Move Up</source>
         <translation>Posunout nahoru</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="168"/>
+        <location filename="../dem/IDemList.ui" line="162"/>
         <source>Hide DEM behind previous one</source>
         <translation>Skrýt výškový model za předchozí</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="177"/>
+        <location filename="../dem/IDemList.ui" line="171"/>
         <source>Move down</source>
         <translation>Posunout dolů</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="180"/>
+        <location filename="../dem/IDemList.ui" line="174"/>
         <source>Show DEM on top of next one</source>
         <translation>Výškový model překrývá další</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="189"/>
+        <location filename="../dem/IDemList.ui" line="183"/>
         <source>Reload DEM</source>
         <translation>Nahrát výškový model znovu</translation>
     </message>
@@ -5484,7 +5842,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="138"/>
         <source>Terrain</source>
-        <translation>Terén</translation>
+        <translation>Území</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="214"/>
@@ -5518,7 +5876,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
         <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation type="unfinished"></translation>
+        <translation>Oblast byla zavedena do QMapShack a byla změněna. Už více neukazuje původní údaje. Podívejte se, prosím, na záznam změn.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="148"/>
@@ -5604,12 +5962,12 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
         <source>Sort along track (multiple)</source>
-        <translation>Třídit podle stopy (vícenásobně)</translation>
+        <translation>Řadit podél stopy (vícenásobně)</translation>
     </message>
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
         <source>Sort along track (single)</source>
-        <translation>Třídit podle stopy (jednorázově)</translation>
+        <translation>Řadit podél stopy (jednorázově)</translation>
     </message>
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
@@ -5632,7 +5990,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
         <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation type="unfinished"></translation>
+        <translation>Cesta byla zavedena do QMapShack a byla změněna. Už více neukazuje původní údaje. Podívejte se, prosím, na záznam změn.</translation>
     </message>
     <message>
         <location filename="../gis/rte/IDetailsRte.ui" line="205"/>
@@ -5754,7 +6112,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
         <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation type="unfinished"></translation>
+        <translation>Stopa byla zavedena do QMapShack a byla změněna. Už více neukazuje původní údaje. Podívejte se, prosím, na záznam změn.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
@@ -5886,12 +6244,12 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1505"/>
         <source>Ascent</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoupání</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1510"/>
         <source>Descent</source>
-        <translation type="unfinished"></translation>
+        <translation>Klesání</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1524"/>
@@ -5914,7 +6272,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
         <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation type="unfinished"></translation>
+        <translation>Cestovní bod byl zaveden do QMapShack a byl změněn. Už více neukazuje původní údaje. Podívejte se, prosím, na záznam změn.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="284"/>
@@ -5981,7 +6339,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="292"/>
+        <location filename="../device/IDevice.cpp" line="314"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation>Je jiný projekt se stejným názvem. Pokud stisknete OK, bude odstraněn a nahrazen.</translation>
     </message>
@@ -6019,42 +6377,42 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="14"/>
         <source>Export database to GPX...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyvést databázi do GPX...</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="22"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="33"/>
         <source>Export Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>Cesta pro vyvedeni:</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="46"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>-</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="55"/>
         <source>GPX 1.1 without extensions</source>
-        <translation type="unfinished"></translation>
+        <translation>GPX 1.1 bez rozšíření</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="83"/>
         <source>Start</source>
-        <translation type="unfinished">Spustit</translation>
+        <translation>Spustit</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="93"/>
         <source>Abort</source>
-        <translation type="unfinished">Přerušit</translation>
+        <translation>Přerušit</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="100"/>
         <source>Close</source>
-        <translation type="unfinished">Zavřít</translation>
+        <translation>Zavřít</translation>
     </message>
 </context>
 <context>
@@ -6146,32 +6504,32 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formulář</translation>
+        <translation>Formulář</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="51"/>
         <source><b>Interpolate Elevation Data</b></source>
-        <translation type="unfinished"></translation>
+        <translation><b>Interpolovat výšková data</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="69"/>
         <source>Replace elevation of track points with interpolated data.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nahradit výšková data bodů stopy interpolovanými daty.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="76"/>
         <source>Quality</source>
-        <translation type="unfinished"></translation>
+        <translation>Kvalita</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="105"/>
         <source>Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Náhled</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="112"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -6329,7 +6687,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="51"/>
         <source><b>Replace Elevation Data</b></source>
-        <translation><b>Nahradit data výšky</b></translation>
+        <translation><b>Nahradit výšková data</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="63"/>
@@ -6421,22 +6779,22 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formulář</translation>
+        <translation>Formulář</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="35"/>
         <source><b>Convert track subpoints to points</b></source>
-        <translation type="unfinished"></translation>
+        <translation><b>Převést podstopy cesty na body</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="47"/>
         <source>Convert subpoints obtained from routing to ordinary track points </source>
-        <translation type="unfinished"></translation>
+        <translation>Převést podbody obdržené ze stanovení směru cesty na řádné body stopy</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -6444,22 +6802,22 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formulář</translation>
+        <translation>Formulář</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="51"/>
         <source><b>Calculate Terrain Slope</b></source>
-        <translation type="unfinished"></translation>
+        <translation><b>Vypočítat sklon území</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="63"/>
         <source>Calculate slope of the terrain based on loaded DEM files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vypočítat sklon území z nahraných souborů s digitálními výškovými modely.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="70"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -6472,94 +6830,122 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     <message>
         <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="124"/>
         <source>FIT decoding error: a development field with the field_definition_number %1 already exists.</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba dekódování FIT: vývojové pole s field_definition_number %1 již existuje.</translation>
+    </message>
+</context>
+<context>
+    <name>IGisDatabase</name>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulář</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="59"/>
+        <source>Name</source>
+        <translation type="unfinished">Název</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="64"/>
+        <source>Age</source>
+        <translation type="unfinished">Věk</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="97"/>
+        <source>To add a database do a right click on the database list above.</source>
+        <translation type="unfinished">Pro přidání databáze klepněte pravým tlačítkem myši na seznam s databázemi výše.</translation>
     </message>
 </context>
 <context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="44"/>
+        <location filename="../gis/IGisItem.cpp" line="45"/>
         <source>[no name]</source>
         <translation>[žádný název]</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>The item is not part of the project in the database.</source>
         <translation>Prvek není částí projektu v databázi.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="317"/>
+        <location filename="../gis/IGisItem.cpp" line="318"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation>
-Buď je to nový symbol nebo byl v databázi někým smazán.</translation>
+Buď je to nový prvek nebo byl v databázi někým smazán.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="323"/>
+        <location filename="../gis/IGisItem.cpp" line="324"/>
         <source>The item is not in the database.</source>
         <translation>Prvek není v databázi.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="329"/>
+        <location filename="../gis/IGisItem.cpp" line="330"/>
         <source>The item might need to be saved</source>
         <translation>Může být potřeba prvek uložit.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="413"/>
+        <location filename="../gis/IGisItem.cpp" line="414"/>
         <source>Initial version.</source>
         <translation>Počáteční verze.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="529"/>
+        <location filename="../gis/IGisItem.cpp" line="534"/>
+        <source>Never ask again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="535"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation><h3>%1</h3> Tento prvek je pravděpodobně pouze pro čtení, protože nebyl vytvořen v programu QMapShack. Obvykle nemáte zájem měnit zavedená data. Ale pokud si myslíte, že je to tentokrát na místě, stiskněte OK.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="530"/>
+        <location filename="../gis/IGisItem.cpp" line="536"/>
         <source>Read Only Mode...</source>
         <translation>Režim pouze pro čtení...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="700"/>
-        <location filename="../gis/IGisItem.cpp" line="753"/>
+        <location filename="../gis/IGisItem.cpp" line="713"/>
+        <location filename="../gis/IGisItem.cpp" line="766"/>
         <source><h4>Description:</h4></source>
         <translation><h4>Popis:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="703"/>
-        <location filename="../gis/IGisItem.cpp" line="756"/>
+        <location filename="../gis/IGisItem.cpp" line="716"/>
+        <location filename="../gis/IGisItem.cpp" line="769"/>
         <source><p>--- no description ---</p></source>
         <translation><p>--- žádný popis ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="714"/>
+        <location filename="../gis/IGisItem.cpp" line="727"/>
         <source><h4>Comment:</h4></source>
         <translation><h4>Poznámka:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="717"/>
+        <location filename="../gis/IGisItem.cpp" line="730"/>
         <source><p>--- no comment ---</p></source>
         <translation><p>--- žádná poznámka ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="728"/>
-        <location filename="../gis/IGisItem.cpp" line="767"/>
+        <location filename="../gis/IGisItem.cpp" line="741"/>
+        <location filename="../gis/IGisItem.cpp" line="780"/>
         <source><h4>Links:</h4></source>
         <translation><h4>Odkazy:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="731"/>
-        <location filename="../gis/IGisItem.cpp" line="770"/>
+        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="783"/>
         <source><p>--- no links ---</p></source>
         <translation><p>--- žádné odkazy ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Edit name...</source>
         <translation>Upravit název...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Enter new %1 name.</source>
         <translation>Zadat nový název %1.</translation>
     </message>
@@ -6567,121 +6953,110 @@ Buď je to nový symbol nebo byl v databázi někým smazán.</translation>
 <context>
     <name>IGisProject</name>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source>Save project?</source>
         <translation>Uložit projekt?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source><h3>%1</h3>The project was changed. Save before closing it?</source>
         <translation><h3>%1</h3>Projekt byl změněn. Uložit jej před zavřením?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="356"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="375"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation>%1: Svázat stopy a cestovní body.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="366"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="385"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation><h3>%1</h3>Trvalo to moc dlouho? Chcete svázání stop a cestovních bodů pro tento projekt přeskočit i v budoucnu?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="367"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="386"/>
         <source>Canceled correlation...</source>
         <translation>Svázání zrušeno...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="412"/>
-        <location filename="../gis/prj/IGisProject.cpp" line="469"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="431"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="488"/>
         <source>Save "%1" to...</source>
         <translation>Uložit "%1" do...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="554"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="573"/>
         <source><br/>
 Filename: %1</source>
         <translation><br/>
 Název souboru: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="559"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="578"/>
         <source>Waypoints: %1</source>
         <translation>Cestovní body: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="563"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="582"/>
         <source>Tracks: %1</source>
         <translation>Stopy: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="567"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="586"/>
         <source>Routes: %1</source>
         <translation>Cesty: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="571"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="590"/>
         <source>Areas: %1</source>
         <translation>Oblasti: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="691"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="733"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation>Jste si jistý, že chcete smazat '%1' z projektu '%2'?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="692"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="734"/>
         <source>Delete...</source>
         <translation>Smazat...</translation>
     </message>
 </context>
 <context>
-    <name>IGisWidget</name>
+    <name>IGisWorkspace</name>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="14"/>
+        <location filename="../gis/IGisWorkspace.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulář</translation>
+        <translation type="unfinished">Formulář</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="43"/>
+        <location filename="../gis/IGisWorkspace.ui" line="43"/>
         <source>Opacity</source>
         <translation type="unfinished">Neprůhlednost</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="50"/>
+        <location filename="../gis/IGisWorkspace.ui" line="50"/>
         <source>Change the opacity of all GIS Items on the map.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Změnit neprůhlednost všech položek GIS na mapě.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="66"/>
+        <location filename="../gis/IGisWorkspace.ui" line="66"/>
         <source>Filter</source>
         <translation type="unfinished">Filtr</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="116"/>
-        <location filename="../gis/IGisWidget.ui" line="146"/>
+        <location filename="../gis/IGisWorkspace.ui" line="116"/>
         <source>Name</source>
-        <translation>Název</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="151"/>
-        <source>Age</source>
-        <translation>Věk</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="185"/>
-        <source>To add a database do a right click on the database list above.</source>
-        <translation>Pro přidání databáze klepněte pravým tlačítkem myši na seznam s databázemi výše.</translation>
+        <translation type="unfinished">Název</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="205"/>
+        <location filename="../gis/IGisWorkspace.ui" line="129"/>
         <source>Clear Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vyprázdnit filtr</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <location filename="../gis/IGisWorkspace.ui" line="138"/>
         <source>Setup Filter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nastavit filtr</translation>
     </message>
 </context>
 <context>
@@ -6781,7 +7156,7 @@ Název souboru: %1</translation>
 <context>
     <name>ILineOp</name>
     <message>
-        <location filename="../mouse/line/ILineOp.cpp" line="212"/>
+        <location filename="../mouse/line/ILineOp.cpp" line="279"/>
         <source>Routing</source>
         <translation>Cesta</translation>
     </message>
@@ -6833,377 +7208,393 @@ Název souboru: %1</translation>
         <translation>Pohled</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="103"/>
+        <location filename="../IMainWindow.ui" line="104"/>
         <source>Window</source>
         <translation>Okno</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="113"/>
+        <location filename="../IMainWindow.ui" line="114"/>
         <source>?</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="121"/>
-        <source>Project</source>
-        <translation>Projekt</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="132"/>
+        <location filename="../IMainWindow.ui" line="133"/>
         <source>Tool</source>
         <translation>Nástroj</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="157"/>
+        <location filename="../IMainWindow.ui" line="152"/>
         <source>Maps</source>
         <translation>Mapy</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="200"/>
+        <location filename="../IMainWindow.ui" line="189"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation>Digitální výškový model</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="239"/>
-        <source>Data</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="308"/>
+        <location filename="../IMainWindow.ui" line="282"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="323"/>
+        <location filename="../IMainWindow.ui" line="297"/>
         <source>Show Scale</source>
         <translation>Ukázat měřítko</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="335"/>
+        <location filename="../IMainWindow.ui" line="309"/>
         <source>Setup Map Font</source>
         <translation>Nastavit písmo mapy</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="350"/>
+        <location filename="../IMainWindow.ui" line="324"/>
         <source>Show Grid</source>
         <translation>Ukázat mřížku</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="353"/>
+        <location filename="../IMainWindow.ui" line="327"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="365"/>
+        <location filename="../IMainWindow.ui" line="339"/>
         <source>Setup Grid</source>
         <translation>Nastavit mřížku</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="368"/>
+        <location filename="../IMainWindow.ui" line="342"/>
         <source>Ctrl+Alt+G</source>
         <translation>Ctrl+Alt+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="383"/>
+        <location filename="../IMainWindow.ui" line="357"/>
         <source>Flip Mouse Wheel</source>
         <translation>Obrátit kolečko myši</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="395"/>
-        <location filename="../IMainWindow.ui" line="398"/>
+        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="372"/>
         <source>Setup Map Paths</source>
         <translation>Nastavit cesty k mapám</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="413"/>
+        <location filename="../IMainWindow.ui" line="387"/>
         <source>POI Text</source>
         <translation>Text POI</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="428"/>
+        <location filename="../IMainWindow.ui" line="402"/>
         <source>Night / Day</source>
         <translation>Noc/Den</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="443"/>
+        <location filename="../IMainWindow.ui" line="417"/>
         <source>Map Tool Tip</source>
         <translation>Rada k nástroji pro mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="458"/>
+        <location filename="../IMainWindow.ui" line="432"/>
         <source>Setup DEM Paths</source>
         <translation>Nastavit cesty k výškovým modelům</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="470"/>
+        <location filename="../IMainWindow.ui" line="444"/>
         <source>About</source>
         <translation>O programu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="482"/>
+        <location filename="../IMainWindow.ui" line="456"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="257"/>
-        <source>Route</source>
-        <translation>Cesta</translation>
+        <location filename="../IMainWindow.ui" line="122"/>
+        <location filename="../IMainWindow.ui" line="222"/>
+        <source>Workspace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="287"/>
+        <location filename="../IMainWindow.ui" line="231"/>
         <source>Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Nástrojový panel</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="245"/>
+        <source>Database</source>
+        <translation type="unfinished">Databáze</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="257"/>
+        <source>Routing</source>
+        <translation type="unfinished">Cesta</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="302"/>
-        <location filename="../IMainWindow.ui" line="305"/>
+        <location filename="../IMainWindow.ui" line="276"/>
+        <location filename="../IMainWindow.ui" line="279"/>
         <source>Add Map View</source>
         <translation>Přidat pohled na mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="446"/>
+        <location filename="../IMainWindow.ui" line="420"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="485"/>
+        <location filename="../IMainWindow.ui" line="459"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="497"/>
-        <location filename="../IMainWindow.ui" line="500"/>
+        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="474"/>
         <source>Setup Map View</source>
         <translation>Nastavit pohled na mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="512"/>
+        <location filename="../IMainWindow.ui" line="486"/>
         <source>Load GIS Data</source>
         <translation>Nahrát data GIS</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="515"/>
+        <location filename="../IMainWindow.ui" line="489"/>
         <source>Load projects from file</source>
         <translation>Nahrát projekty ze souboru</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="518"/>
+        <location filename="../IMainWindow.ui" line="492"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="530"/>
+        <location filename="../IMainWindow.ui" line="504"/>
         <source>Save All GIS Data</source>
         <translation>Uložit všechna data GIS</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="533"/>
+        <location filename="../IMainWindow.ui" line="507"/>
         <source>Save all projects in the workspace</source>
         <translation>Uložit všechny projekty nacházející se v pracovním prostoru</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="536"/>
+        <location filename="../IMainWindow.ui" line="510"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="548"/>
+        <location filename="../IMainWindow.ui" line="522"/>
         <source>Setup Time Zone</source>
         <translation>Nastavit časové pásmo</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="560"/>
+        <location filename="../IMainWindow.ui" line="534"/>
         <source>Add empty project</source>
         <translation>Přidat prázdný projekt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="575"/>
+        <location filename="../IMainWindow.ui" line="549"/>
         <source>Search Google</source>
         <translation>Hledat pomocí Google</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="587"/>
+        <location filename="../IMainWindow.ui" line="561"/>
         <source>Close all projects</source>
         <translation>Zavřít všechny projekty</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="590"/>
+        <location filename="../IMainWindow.ui" line="564"/>
         <source>F8</source>
         <translation>F8</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="602"/>
+        <location filename="../IMainWindow.ui" line="576"/>
         <source>Setup Units</source>
         <translation>Nastavit jednotky</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="614"/>
+        <location filename="../IMainWindow.ui" line="588"/>
         <source>Setup Workspace</source>
         <translation>Nastavit pracovní prostor</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="617"/>
+        <location filename="../IMainWindow.ui" line="591"/>
         <source>Setup save on exit.</source>
         <translation>Nastavit uložení při ukončení.</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="629"/>
+        <location filename="../IMainWindow.ui" line="603"/>
         <source>Import Database from QLandkarte</source>
         <translation>Zavést databázi z QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="632"/>
+        <location filename="../IMainWindow.ui" line="606"/>
         <source>Import QLandkarte GT database</source>
         <translation>Zavést databázi GT QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="644"/>
+        <location filename="../IMainWindow.ui" line="618"/>
         <source>VRT Builder</source>
         <translation>Sestavovač VRT</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="647"/>
+        <location filename="../IMainWindow.ui" line="621"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation>Rozhraní pro gdalbuildvrt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="659"/>
+        <location filename="../IMainWindow.ui" line="633"/>
         <source>Store Map View</source>
         <translation>Uložit pohled na mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="662"/>
+        <location filename="../IMainWindow.ui" line="636"/>
         <source>Write current active map and DEM list including the properties to a file</source>
         <translation>Zapsat nynější činnou mapu a seznam výškových modelů včetně vlastností do souboru</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="674"/>
+        <location filename="../IMainWindow.ui" line="648"/>
         <source>Load Map View</source>
         <translation>Nahrát pohled na mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="677"/>
+        <location filename="../IMainWindow.ui" line="651"/>
         <source>Restore view with active map and DEM list including the properties from a file</source>
         <translation>Obnovit pohled s činnou mapou a seznam výškových modelů včetně vlastností ze souboru</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="692"/>
+        <location filename="../IMainWindow.ui" line="666"/>
         <source>Ext. Profile</source>
         <translation>Ext. Profil</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="695"/>
+        <location filename="../IMainWindow.ui" line="669"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="707"/>
+        <location filename="../IMainWindow.ui" line="681"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="710"/>
+        <location filename="../IMainWindow.ui" line="684"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="722"/>
+        <location filename="../IMainWindow.ui" line="696"/>
         <source>Clone Map View</source>
         <translation>Klonovat pohled na mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="725"/>
+        <location filename="../IMainWindow.ui" line="699"/>
         <source>Ctrl+Shift+T</source>
         <translation>Ctrl+Shift+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="737"/>
+        <location filename="../IMainWindow.ui" line="711"/>
         <source>Create Routino Database</source>
         <translation>Vytvořit databázi Routino</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="749"/>
+        <location filename="../IMainWindow.ui" line="723"/>
         <source>Save(Print) Map Screenshot</source>
         <translation>Uložit (vytisknout) snímek obrazovky s mapou</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="752"/>
+        <location filename="../IMainWindow.ui" line="726"/>
         <source>Print a selected area of the map</source>
         <translation>Vytisknout vybranou oblast mapy</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="755"/>
+        <location filename="../IMainWindow.ui" line="729"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="767"/>
+        <location filename="../IMainWindow.ui" line="741"/>
         <source>Setup Coord. Format</source>
         <translation>Nastavit formát souřadnic</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="770"/>
+        <location filename="../IMainWindow.ui" line="744"/>
         <source>Change the format coordinates are displayed</source>
         <translation>Změnit formát, v němž jsou souřadnice zobrazeny</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="782"/>
+        <location filename="../IMainWindow.ui" line="756"/>
         <source>Setup Map Background</source>
         <translation>Nastavit pozadí mapy</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="794"/>
+        <location filename="../IMainWindow.ui" line="768"/>
         <source>Setup Waypoint Icons</source>
         <translation>Stanovit ikony cestovních bodů</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="797"/>
+        <location filename="../IMainWindow.ui" line="771"/>
         <source>Setup path to custom icons</source>
         <translation>Stanovit cestu k vlastním ikonám</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="806"/>
+        <location filename="../IMainWindow.ui" line="780"/>
         <source>Close Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Zavřít kartu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="809"/>
+        <location filename="../IMainWindow.ui" line="783"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="818"/>
+        <location filename="../IMainWindow.ui" line="792"/>
         <source>Quickstart Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Nápověda pro rychlý začátek</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="827"/>
+        <location filename="../IMainWindow.ui" line="801"/>
         <source>Setup Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastavit nástrojový panel</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="839"/>
+        <location filename="../IMainWindow.ui" line="813"/>
         <source>Toggle Docks</source>
-        <translation type="unfinished"></translation>
+        <translation>Přepnout panely</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="842"/>
+        <location filename="../IMainWindow.ui" line="816"/>
         <source>Toggle visibility of dockable windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Přepnout viditelnost ukotvitelných oken</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="845"/>
+        <location filename="../IMainWindow.ui" line="819"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished">Ctrl+D</translation>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="854"/>
+        <location filename="../IMainWindow.ui" line="828"/>
         <source>Full Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Celá obrazovka</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="857"/>
+        <location filename="../IMainWindow.ui" line="831"/>
         <source>F11</source>
-        <translation type="unfinished">F11</translation>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="843"/>
+        <source>Min./Max. Track Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="846"/>
+        <source>Show the minimum and maximum values of the track properties along the track in the map view.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="849"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7266,17 +7657,17 @@ Nechce se mi číst dokumentaci!</translation>
     <message>
         <location filename="../map/IMapOnline.cpp" line="41"/>
         <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
-        <translation type="unfinished">Tato mapa vyžaduje podporu pro OpenSSL. Nicméně kvůli právním omezením v některých zemích není OpenSSL k QMapShack přibaleno. Můžete se podívat na <a href='https://www.openssl.org/community/binaries.html'>stránky OpenSSL</a>, kde najdete spustitelné soubory. Musíte zkopírovat libeay32.dll a ssleay32.dll do adresáře s programem QMapShack.</translation>
+        <translation>Tato mapa vyžaduje podporu pro OpenSSL. Nicméně kvůli právním omezením v některých zemích není OpenSSL k QMapShack přibaleno. Můžete se podívat na <a href='https://www.openssl.org/community/binaries.html'>stránky OpenSSL</a>, kde najdete spustitelné soubory. Musíte zkopírovat libeay32.dll a ssleay32.dll do adresáře s programem QMapShack.</translation>
     </message>
     <message>
         <location filename="../map/IMapOnline.cpp" line="47"/>
         <source>Error...</source>
-        <translation type="unfinished">Chyba...</translation>
+        <translation>Chyba...</translation>
     </message>
     <message>
         <location filename="../map/IMapOnline.cpp" line="98"/>
         <source><b>%1</b>: %2 tiles pending<br/></source>
-        <translation type="unfinished"><b>%1</b>: %2 dlaždic čeká<br/></translation>
+        <translation><b>%1</b>: %2 dlaždic čeká<br/></translation>
     </message>
 </context>
 <context>
@@ -7365,7 +7756,7 @@ Nechce se mi číst dokumentaci!</translation>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="170"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Podrobnosti</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="264"/>
@@ -7380,17 +7771,17 @@ Nechce se mi číst dokumentaci!</translation>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="353"/>
         <source>Type File:</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ souboru:</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="367"/>
         <source>Forget external type file and use internal types.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapomenout na vnější souborový typ a použít vnitřní typy.</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="381"/>
         <source>Load an external type file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nahrát vnější typ souboru.</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="227"/>
@@ -7413,38 +7804,42 @@ Nechce se mi číst dokumentaci!</translation>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
         <source>Advanced Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokročilé volby</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
         <source>Source No Data (-srcnodata)</source>
-        <translation type="unfinished"></translation>
+        <translation>Zdroj, žádná data (-srcnodata)</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="46"/>
         <source>Target No Data (-vrtnodata)</source>
-        <translation type="unfinished"></translation>
+        <translation>Cíl, žádná data (-vrtnodata)</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="56"/>
         <source>Target Projection (-a_srs)</source>
-        <translation type="unfinished"></translation>
+        <translation>Cíl, promítání (-a_srs)</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="63"/>
         <source>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tyto volby jsou pro určité případy a obyčejně je chcete ponechat prázdné. Podívejte se na GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Nápověda</a> pro další informace.</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
-        <source>1. Select one or multiple source files.
-2. Select a file name for the target VRT file.
-3. Press "Start" button.
+        <source><ol>
+<li>Select one or multiple source files.</li>
+<li>Select a file name for the target VRT file.</li>
+<li>Press "Start" button.</li>
+</ol>
 
 Tip:
-* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
-* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
-* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
+<ul>
+<li>If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.</li>
+<li>Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.</li>
+<li>The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</li>
+</ul></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7482,64 +7877,64 @@ Tip:
         <translation><b>Nová čára</b><br/>Posuňte ukazovátko myši a použijte levé tlačítko myši k upuštění bodů. Až to bude uděláno, použijte pravé tlačítko myši k zastavení.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="289"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="300"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation><b>Smazat bod</b><br/>Přesuňte ukazovátko myši blízko k bodu a stiskněte levé tlačítko myši pro jeho smazání.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="297"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="308"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation><b>Upravit rozsah bodů</b><br/>Klepněte levým tlačítkem myši na první bod pro započetí výběru. Klepněte levým tlačítkem myši na druhý bod pro dokončení výběru a vyberte z voleb. Použijte pravé tlačítko myši pro zrušení.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="305"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="316"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Přesunout bod</b><br/>Přesuňte ukazovátko myši blízko k bodu a stiskněte levé tlačítko myši pro jeho držení v blízkosti ukazovátka. Posuňte myší pro přesunutí bodu. Upustěte bod klepnutím levým tlačítkem myši. Použijte pravé tlačítko myši pro zrušení.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="313"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Přidat bod</b><br/>Přesuňte ukazovátko myši blízko k čáře a stiskněte levé tlačítko myši pro přidání bodu. Bod přilne k ukazovátku a vy jím budete moci pohnout. Bod upustěte klepnutím levým tlačítkem myši. Použijte pravé tlačítko myši pro zrušení.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="321"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation><b>Žádné stanovení cesty</b><br/>Všechny body budou spojeny přímou čarou.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="327"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation><b>Automatické stanovení cesty</b><br/>Nynější nastavení směrování je používáno k vytváření cesty mezi body. <b>Poznámka:</b> Vybraný směrovač musí být schopen rychle směrovat (za běhu). Směrovače nepřipojené k internetu toto obvykle dokáží, směrovače připojené k internetu to běžně neumí.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="343"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation><b>Vektorové stanovení cesty</b><br/>Spojuje body čárou z nahrané vektorové mapy, je-li to možné.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="504"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="515"/>
         <source><b>%1 Metrics</b></source>
         <translation><b>%1 metrika</b></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="507"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="518"/>
         <source>Distance:</source>
         <translation>Vzdálenost:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="509"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="520"/>
         <source>Ascent:</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoupání:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="511"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="522"/>
         <source>Descent:</source>
-        <translation type="unfinished"></translation>
+        <translation>Klesání:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.h" line="135"/>
+        <location filename="../mouse/line/IMouseEditLine.h" line="137"/>
         <source><br/><b>Move the map</b><br/>If you keep the left mouse button pressed and move the mouse, you will move the map.<br/><br/></source>
-        <translation type="unfinished"></translation>
+        <translation><br/><b>Posunout mapu</b><br/>Pokud levé tlačítko myši podržíte stisknuté a myší pohnete, posunete mapu.<br/><br/></translation>
     </message>
 </context>
 <context>
@@ -7581,18 +7976,19 @@ Tip:
     <message>
         <location filename="../plot/IPlot.cpp" line="99"/>
         <source>Cut...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vyjmout...</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="542"/>
         <source>Hold CTRL key for vertical zoom, only.
 Hold ALT key for horizontal zoom, only.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pro (pouze) svislé přiblížení podržte klávesu Ctrl.
+Pro (pouze) vodorovné přiblížení podržte klávesu Alt.</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="697"/>
         <source>No or bad data.</source>
-        <translation>Žádné nebo špatné údaje.</translation>
+        <translation>Žádná nebo špatná data.</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="1298"/>
@@ -7769,63 +8165,78 @@ nebo
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
         <source>Form</source>
-        <translation type="unfinished">Formulář</translation>
+        <translation>Formulář</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
         <source>Alternative</source>
-        <translation type="unfinished"></translation>
+        <translation>Náhradní</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
         <source>display selected routing profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobrazit vybraný profil stanovení cesty</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="67"/>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="128"/>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="142"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
         <source>on-the-fly routing</source>
-        <translation type="unfinished"></translation>
+        <translation>Stanovení cesty za běhu</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
         <source>BRouter: </source>
-        <translation type="unfinished"></translation>
+        <translation>BRouter: </translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
         <source>not running</source>
-        <translation type="unfinished"></translation>
+        <translation>Neběží</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
         <source>start/stop BRouter</source>
-        <translation type="unfinished"></translation>
+        <translation>Spustit/Zastavit BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
         <source>show BRouter console</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukázat konzoli BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
         <source>Setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastavit</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="181"/>
         <source>Caution! BRouter is listening on all ports for connections.</source>
+        <translation>Pozor! BRouter kvůli připojení naslouchá na všech přípojkách (port).</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="217"/>
+        <source><p><a href="http://brouter.de/brouter/" target="_blank">BRouter</a> © <a href="https://github.com/abrensch/brouter/blob/master/LICENSE" target="_blank">ABrensch, Licence GPLv3</a></p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="227"/>
+        <source><p>Directions Courtesy of <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="237"/>
+        <source><p>Routing data <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a> contributors</p></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7834,12 +8245,12 @@ nebo
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
         <source>BRouter Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
         <source>TextLabel</source>
-        <translation type="unfinished">Textový štítek</translation>
+        <translation>Textový štítek</translation>
     </message>
 </context>
 <context>
@@ -7847,37 +8258,37 @@ nebo
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
         <source>BRouter Setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastavení BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="48"/>
         <source>choose which BRouter to use</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybrat, který BRouter použít</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
         <source>BRouter-Web (online)</source>
-        <translation type="unfinished"></translation>
+        <translation>Stránky BRouter (připojeno)</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
         <source>local Installation</source>
-        <translation type="unfinished"></translation>
+        <translation>Místní instalace</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
         <source>Expert Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Režim znalce</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
         <source>local BRouter Installation directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Místní instalační adresář BRouter:</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
         <source>select installation directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybrat instalační adresář</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
@@ -7887,137 +8298,137 @@ nebo
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="389"/>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="400"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="119"/>
         <source>labelLocalDirResult</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
         <source>create or update installation</source>
-        <translation type="unfinished"></translation>
+        <translation>Vytvořit nebo aktualizovat instalaci</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
         <source>Java Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Spustitelný soubor Java</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
         <source>labelLocalJavaResult</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
         <source>search for installed java</source>
-        <translation type="unfinished"></translation>
+        <translation>Hledat nainstalovanou Javu</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="241"/>
         <source>Download and install BRouter Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Stáhnout a nainstalovat verzi BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
         <source>about:blank</source>
-        <translation type="unfinished">o:prázdný</translation>
+        <translation>o:prázdný</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
         <source>File to install</source>
-        <translation type="unfinished"></translation>
+        <translation>Soubor k nainstalování</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
         <source>Download and Install</source>
-        <translation type="unfinished"></translation>
+        <translation>Stáhnout a nainstalovat</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
         <source>available Profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Dostupné profily</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
         <source>install profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Instalovat profil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
         <source>remove profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Odstranit profil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
         <source>installed Profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Nainstalované profily</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
         <source>content of profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Obsah profilu</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
         <source>BRouter-Web URL:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresa (URL) stránek BRouter:</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
         <source>Service-URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresa (URL) služby</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
         <source>Profile-URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresa (URL) profilu</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
         <source>Hostname</source>
-        <translation type="unfinished"></translation>
+        <translation>Jméno hostitelského počítače</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
         <source>Port</source>
-        <translation type="unfinished">Přípojka</translation>
+        <translation>Přípojka (port)</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
         <source>Profile directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresář s profilem</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
         <source>Segments directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresář s částmi</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
         <source>Custom Profiles dir</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresář s vlastními profily</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
         <source>Max Runtime</source>
-        <translation type="unfinished"></translation>
+        <translation>Nejdelší doba běhu programu</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="621"/>
         <source>Number Threads</source>
-        <translation type="unfinished"></translation>
+        <translation>Počet vláken</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
         <source>Java Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Volby pro Java</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
         <source>Profiles Url</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresa (URL) profilu</translation>
     </message>
 </context>
 <context>
@@ -8116,7 +8527,7 @@ nebo
         <translation>Jazyk</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="131"/>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="118"/>
         <source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path. You can create your own routing data with <b>Tool->Create Routino Database</b>.</source>
         <translation>Pro použití stanovení cesty bez připojení k internetu je potřeba stanovit cesty k místním datům se stanovením cest. Použijte nástrojové tlačítko pro nastavení k zaregistrování cesty. Svá vlastní data se stanovením cest vytvoříte pomocí <b>Nástroj → Vytvořit databázi Routino</b>.</translation>
     </message>
@@ -8156,13 +8567,13 @@ nebo
         <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="22"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="25"/>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="63"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="39"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="42"/>
         <source>Select source files:</source>
         <translation>Vybrat zdrojové soubory:</translation>
     </message>
@@ -8186,6 +8597,18 @@ nebo
         <source>File Prefix</source>
         <translation>Předpona souboru</translation>
     </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="133"/>
+        <source><p>To create a Routino routing database you need to download *pbf files from <a href='http://download.geofabrik.de/'>GeoFabrik</a>. The process of creating a Routino database is quite slow and the resulting files quite large. Therefore it's recommended not to download whole continents. Limit your download to those countries you really need. However as Routino can't route over several databases you have to include all countries that ar [...]
+
+<ol>
+<li>Select one or multiple source *.pbf files.</li>
+<li>Select a path for your Routino database.</li>
+<li>Select a prefix. The database will be listed by this prefix.</li>
+<li>Press "Start" button.</li>
+</ol></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IScrOptEditLine</name>
@@ -8277,12 +8700,12 @@ nebo
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
         <source>Delete a point. (Ctrl+-)</source>
-        <translation type="unfinished"></translation>
+        <translation>Smazat bod. (Ctrl+-)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
         <source>Ctrl+-</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+-</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
@@ -8432,7 +8855,7 @@ nebo
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
         <source>Set an activity for the selected range.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastavit činnost pro vybraný rozsah.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
@@ -8541,7 +8964,7 @@ nebo
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="99"/>
         <source>Change the icon of all selected waypoints.</source>
-        <translation type="unfinished"></translation>
+        <translation>Změnit ikonu všech vybraných cestovních bodů.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="119"/>
@@ -8551,7 +8974,7 @@ nebo
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="139"/>
         <source>Set an activity for all selected tracks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastavit činnost pro všechny vybrané stopy.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="153"/>
@@ -8566,7 +8989,7 @@ nebo
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="236"/>
         <source>Select all items that are completely inside the selected area.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybrat všechny prvky, které jsou úplně uvnitř vybrané oblasti.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="296"/>
@@ -8653,7 +9076,7 @@ nebo
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
         <source>Copy track together with all attached waypoints into another project.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopírovat stopu společně se všemi připojenými cestovními body do jiného projektu.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="43"/>
@@ -8673,7 +9096,7 @@ nebo
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
         <source>Set an activity for the complete track.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastavit činnost pro celou stopu.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="224"/>
@@ -8700,6 +9123,8 @@ nebo
         <location filename="../gis/wpt/IScrOptWpt.ui" line="101"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="118"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="132"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="153"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="170"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -8729,12 +9154,62 @@ nebo
         <translation>Klonovat cestovní bod a kopii přesunout o danou vzdálenost a ve stanoveném úhlu.</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="176"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="150"/>
+        <source>edit radius of circular area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="167"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="185"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="232"/>
         <source>TextLabel</source>
         <translation>Textový štítek</translation>
     </message>
 </context>
 <context>
+    <name>IScrOptWptRadius</name>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulář</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="49"/>
+        <source>edit radius of circular area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="52"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="66"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="84"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="63"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="81"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="128"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Textový štítek</translation>
+    </message>
+</context>
+<context>
     <name>ISearchDatabase</name>
     <message>
         <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
@@ -8849,37 +9324,37 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formulář</translation>
+        <translation>Formulář</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="22"/>
         <source>Available</source>
-        <translation type="unfinished">Dostupné</translation>
+        <translation>Dostupné</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="46"/>
         <source>Add to selected items</source>
-        <translation type="unfinished"></translation>
+        <translation>Přidat k vybraným prvkům</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="60"/>
         <source>Remove from selected items</source>
-        <translation type="unfinished"></translation>
+        <translation>Odstranit z vybraných prvků</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="78"/>
         <source>Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybrané</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="102"/>
         <source>Move selected items up</source>
-        <translation type="unfinished"></translation>
+        <translation>Posunout vybrané prvky nahoru</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="116"/>
         <source>Move selected items down</source>
-        <translation type="unfinished"></translation>
+        <translation>Posunout vybrané prvky dolů</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="49"/>
@@ -8887,7 +9362,7 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="105"/>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="119"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -9073,22 +9548,22 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
     <message>
         <location filename="../gis/ISetupFilter.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formulář</translation>
+        <translation>Formulář</translation>
     </message>
     <message>
         <location filename="../gis/ISetupFilter.ui" line="38"/>
         <source>Apply filter to</source>
-        <translation type="unfinished"></translation>
+        <translation>Použít filtr na</translation>
     </message>
     <message>
         <location filename="../gis/ISetupFilter.ui" line="45"/>
         <source>name only</source>
-        <translation type="unfinished"></translation>
+        <translation>pouze název</translation>
     </message>
     <message>
         <location filename="../gis/ISetupFilter.ui" line="52"/>
         <source>complete text</source>
-        <translation type="unfinished"></translation>
+        <translation>celý text</translation>
     </message>
 </context>
 <context>
@@ -9129,7 +9604,7 @@ Pokud zadáte 'slovo', provede se hledání přesné shody. Pokud zad
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="22"/>
         <source>Symbol</source>
-        <translation>Symbol</translation>
+        <translation>Značka</translation>
     </message>
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="29"/>
@@ -9191,27 +9666,27 @@ nebo
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="14"/>
         <source>Insert Template...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vložit předlohu...</translation>
     </message>
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="32"/>
         <source>Templates</source>
-        <translation type="unfinished"></translation>
+        <translation>Předlohy</translation>
     </message>
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="42"/>
         <source>Select a path with your own templates.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybrat cestu s vašimi vlastními předlohami.</translation>
     </message>
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="45"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="77"/>
         <source>Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Náhled</translation>
     </message>
 </context>
 <context>
@@ -9274,7 +9749,7 @@ nebo
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="25"/>
         <source>Templ.</source>
-        <translation type="unfinished"></translation>
+        <translation>Předloha</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="120"/>
@@ -9488,12 +9963,12 @@ nebo
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="577"/>
         <source>Insert From Template</source>
-        <translation type="unfinished"></translation>
+        <translation>Vložit z předlohy</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="580"/>
         <source>Create text from template.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vytvořit text z předlohy.</translation>
     </message>
 </context>
 <context>
@@ -9566,18 +10041,23 @@ nebo
         <source>short format</source>
         <translation>v krátkém formátu</translation>
     </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="123"/>
+        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
+        <translation type="unfinished"><b>Poznámka:</b> Některé prvky uživatelského rozhraní změna jednotek neovlivní, dokud QMapShack nespustíte znovu.</translation>
+    </message>
 </context>
 <context>
     <name>IToolBarSetupDialog</name>
     <message>
         <location filename="../helpers/IToolBarSetupDialog.ui" line="14"/>
         <source>Setup Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastavit nástrojový panel</translation>
     </message>
     <message>
         <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
         <source>Toolbar is visible in Fullscreen-mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Nástrojový panel je viditelný v režimu celé obrazovky</translation>
     </message>
 </context>
 <context>
@@ -9621,18 +10101,18 @@ nebo
 <context>
     <name>IUnit</name>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
         <source>Bad position format. Must be: "[N|S] ddd mm.sss [W|E] ddd mm.sss" or "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
         <translation>Špatný polohový formát. Musí být: "[N|S] ddd mm.sss [W|E] ddd mm.sss" nebo "[N|S] ddd.ddd [W|E] ddd.ddd"</translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Position values out of bounds. </source>
         <translation>Polohy mimo platné hodnoty. </translation>
     </message>
@@ -9645,22 +10125,42 @@ nebo
         <translation>Nastavit jednotky...</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="38"/>
+        <location filename="../units/IUnitsSetup.ui" line="36"/>
+        <source>Length unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="74"/>
         <source>Metric</source>
         <translation>Metrické</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="47"/>
+        <location filename="../units/IUnitsSetup.ui" line="80"/>
+        <source>Slope unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="92"/>
+        <source>Degrees (°)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="105"/>
+        <source>Percent (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="133"/>
         <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
         <translation><b>Poznámka:</b> Některé prvky uživatelského rozhraní změna jednotek neovlivní, dokud QMapShack nespustíte znovu.</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="31"/>
+        <location filename="../units/IUnitsSetup.ui" line="61"/>
         <source>Imperial</source>
         <translation>Anglické</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="24"/>
+        <location filename="../units/IUnitsSetup.ui" line="48"/>
         <source>Nautic</source>
         <translation>Nautické</translation>
     </message>
@@ -9675,7 +10175,7 @@ nebo
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="68"/>
         <source>External Icons:</source>
-        <translation>Vnější symboly:</translation>
+        <translation>Vnější značky:</translation>
     </message>
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="75"/>
@@ -9690,7 +10190,7 @@ nebo
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="95"/>
         <source>All custom icons have to be *.bmp or *.png format.</source>
-        <translation>Všechny vlastní symboly musí být ve formátu *.bmp nebo *.png.</translation>
+        <translation>Všechny vlastní značky musí být ve formátu *.bmp nebo *.png.</translation>
     </message>
 </context>
 </TS>
diff --git a/src/locale/qmapshack_de.ts b/src/locale/qmapshack_de.ts
index 842cc6f..ab204b3 100644
--- a/src/locale/qmapshack_de.ts
+++ b/src/locale/qmapshack_de.ts
@@ -120,12 +120,12 @@
 <context>
     <name>CCanvas</name>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="61"/>
+        <location filename="../canvas/CCanvas.cpp" line="63"/>
         <source>View %1</source>
         <translation>Ansicht %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="705"/>
+        <location filename="../canvas/CCanvas.cpp" line="766"/>
         <source>Setup Map Background</source>
         <translation>Kartenhintergrund einstellen</translation>
     </message>
@@ -270,27 +270,27 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="113"/>
+        <location filename="../gis/db/CDBProject.cpp" line="114"/>
         <source>Failed to load...</source>
         <translation>Laden fehlgeschlagen...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="114"/>
+        <location filename="../gis/db/CDBProject.cpp" line="115"/>
         <source>Can't load file "%1" . It will be skipped.</source>
         <translation>Konnte die Datei "%1" nicht laden. Wird ausgelassen.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="127"/>
+        <location filename="../gis/db/CDBProject.cpp" line="128"/>
         <source>Project already in database...</source>
         <translation>Das Projekt ist schon in der Datenbank...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="128"/>
+        <location filename="../gis/db/CDBProject.cpp" line="129"/>
         <source>The project "%1" has already been imported into the database. It will be skipped.</source>
         <translation>Das Projekt "%1" wurde schon in die Datenbank importiert. Wird asugelassen.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="279"/>
+        <location filename="../gis/db/CDBProject.cpp" line="280"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -299,47 +299,47 @@ To solve this conflict you can create and save a clone, force your version or dr
 Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihre Version oder verwerfen diese und nehmen die Version in der Datenbank</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="285"/>
+        <location filename="../gis/db/CDBProject.cpp" line="286"/>
         <source>Conflict with database...</source>
         <translation>Konflikt mit der Datenbank...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="286"/>
+        <location filename="../gis/db/CDBProject.cpp" line="287"/>
         <source>Clone && Save</source>
         <translation>Klonen && Speichern</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="287"/>
+        <location filename="../gis/db/CDBProject.cpp" line="288"/>
         <source>Force Save</source>
         <translation>Speichern erzwingen</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="288"/>
+        <location filename="../gis/db/CDBProject.cpp" line="289"/>
         <source>Take remote</source>
         <translation>Entfernte Version nehmen</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="572"/>
+        <location filename="../gis/db/CDBProject.cpp" line="573"/>
         <source>Missing folder...</source>
         <translation>Fehlender Ordner...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="573"/>
+        <location filename="../gis/db/CDBProject.cpp" line="574"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation>Speichern des Projektes fehlgeschlagen. Der Ordner wurde in der Datenbank gelöscht.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="580"/>
+        <location filename="../gis/db/CDBProject.cpp" line="581"/>
         <source>Save ...</source>
         <translation>Speichern ...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>There was an unexpected database error:
 
 %1</source>
@@ -348,12 +348,12 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
 %1</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="760"/>
+        <location filename="../gis/db/CDBProject.cpp" line="761"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation>Das Projekt '%1' will sich gerade aus der Datenbank aktualisieren. Es gibt allerdings nicht gespeicherte Änderungen.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="761"/>
+        <location filename="../gis/db/CDBProject.cpp" line="762"/>
         <source>Save changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
@@ -497,16 +497,6 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>Zum Ende</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
-        <source>distance: </source>
-        <translation>Entfernung:</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
-        <source>ascent: </source>
-        <translation>Anstieg:</translation>
-    </message>
-    <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
         <source><h2>Areas</h2></source>
         <translation><h2>Gebiete</h2></translation>
@@ -522,6 +512,21 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>Verknüpfungen...</translation>
     </message>
     <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
+        <source>Distance: </source>
+        <translation>Entfernung: </translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
+        <source>Ascent: </source>
+        <translation>Anstieg: </translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
+        <source>Descent: </source>
+        <translation>Abstieg: </translation>
+    </message>
+    <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
         <source><h2>Routes</h2></source>
         <translation><h2>Routen</h2></translation>
@@ -549,11 +554,6 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>Stichwörter bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
-        <source>descent: </source>
-        <translation>Abstieg: </translation>
-    </message>
-    <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
         <source>Enter keywords.</source>
         <translation>Stichwörter eingeben.</translation>
@@ -835,7 +835,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
         <source>Area: %1%2</source>
-        <translation>Gebiet: %1 %2</translation>
+        <translation>Gebiet: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
@@ -917,8 +917,8 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
-        <source>Length: %1 %2</source>
-        <translation>Länge: %1 %2</translation>
+        <source>Length: %1%2</source>
+        <translation>Länge: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
@@ -928,8 +928,8 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
         <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
-        <source>Time: %1 %2</source>
-        <translation>Gesamtzeit: %1 %2</translation>
+        <source>Time: %1%2</source>
+        <translation>Gesamtzeit: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
@@ -953,8 +953,8 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
-        <source>Distance: %1 %2</source>
-        <translation>Entfernung: %1 %2</translation>
+        <source>Distance: %1%2</source>
+        <translation>Entf.: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
@@ -996,269 +996,291 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>Lesen der Daten fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="80"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="78"/>
         <source>_Clone</source>
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="251"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="261"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation>Wegpunkte geändert, alle vorherigen Daten sind verloren.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
-        <source>Length: %1 %2</source>
-        <translation>Länge: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
-        <source>, %1%2 %3, %4%5 %6</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <source>, %1-, %2-</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
-        <source>, %1-, %2-</source>
-        <translation></translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="396"/>
+        <source>Time: %1%2, Speed: %3%4</source>
+        <translation>Zeit: %1%2, Geschw.: %3%4</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
         <source>Time: -, Speed: -</source>
-        <translation>Zeit: -, Geschwindigkeit: -</translation>
+        <translation>Zeit: -, Geschw.: -</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+        <source>Moving: %1%2, Speed: %3%4</source>
+        <translation>Zeit in Bew.: %1%2, Geschw.: %3%4</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Moving: -, Speed: -</source>
-        <translation>Zeit in Bew.: -, Geschw. -</translation>
+        <translation>Zeit in Bew.: -, Geschw.: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="421"/>
         <source>Start: %1</source>
         <translation>Beginn: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
         <source>Start: -</source>
         <translation>Beginn: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
         <source>End: %1</source>
         <translation>Ende: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
         <source>End: -</source>
         <translation>Ende: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
         <source>Points: %1 (%2)</source>
         <translation>Punkte: %1 von %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="443"/>
         <source>Invalid elevations!</source>
         <translation>Ungültige Höhenwerte!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>Invalid timestamps!</source>
         <translation>Ungültige Zeitmarken!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
         <source>Invalid positions!</source>
         <translation>Ungültige Positionsdaten!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
         <source>Activities: %1</source>
         <translation>Aktivitäten: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
         <source>Index: %1</source>
         <translation>Index: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
         <source>Index: visible %1, total %2</source>
         <translation>Index: angez. %1, total %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
-        <source>Ele.: %1 %2</source>
-        <translation>Höhe: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
-        <source> slope: %1%3 (%2%)</source>
-        <translation>, Neigung: %1%3 (%2%)</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+        <source>, Slope: %1%2</source>
+        <translation>, Steigung: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
-        <source> speed: %1%2</source>
-        <translation>, Geschw.: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
         <source>... and %1 tags not displayed</source>
         <translation>... und %1 Tags werden nicht angezeigt</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
         <source>Distance: - (-)</source>
         <translation>Entfernung: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
         <source>Moving: - (-)</source>
         <translation>Zeit in Bew.: - (-) </translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1318"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1331"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1387"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1570"/>
         <source>track</source>
         <translation>Track</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1522"/>
         <source>Hide point %1.</source>
         <translation>Punkt %1 verbergen.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1526"/>
         <source>Hide points %1..%2.</source>
         <translation>Punkte %1  %2 verbergen.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
-        <source> Moving: %1%2 (%3%)</source>
-        <translation>, Zeit in Bew.: %1 %2 (%3%)</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="701"/>
+        <source>, %1%2</source>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
-        <source>, %1%2</source>
-        <translation>, %1 %2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="124"/>
+        <source>Invalid points....</source>
+        <translation>Ungültige Punkte...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
-        <source> Time: %1%2</source>
-        <translation> Zeit: %1 %2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="125"/>
+        <source>The track '%1' has %2 invalid points out of %3 visible points. Do you want to hide invalid points now?</source>
+        <translation>Der Track '%1' hat %2 ungültige Punkte von insgesamt %3 sichtbaren Punkten. Wollen Sie die ungültigen Punkte herausnehmen?</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
-        <source>Time: %1, Speed: %2 %3</source>
-        <translation>Zeit: %1, Geschwindigkeit: %2 %3</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>min.</source>
+        <translation>min.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
-        <source>Moving: %1, Speed: %2 %3</source>
-        <translation>Zeit in Bew.: %1, Geschw. %2 %3</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>max.</source>
+        <translation>max.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="377"/>
+        <source>Length: %1%2</source>
+        <translation>Länge: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <source>, %1%2%3, %4%5%6</source>
+        <translation>, %1%2%3, %4%5%6</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="589"/>
+        <source>Ele.: %1%2</source>
+        <translation>Höhe: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <source>, Speed: %1%2</source>
+        <translation>, Geschw.: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="636"/>
         <source>Ascent: - (-)</source>
         <translation>Anstieg: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>Descent: - (-)</source>
         <translation>Abstieg: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="644"/>
         <source>Ascent: %1%2 (%3%)</source>
-        <translation>Anstieg: %1 %2 (%3%)</translation>
+        <translation>Anstieg: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
-        <source> Descent: %1%2 (%3%)</source>
-        <translation>, Abstieg: %1 %2 (%3%)</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
+        <source>, Descent: %1%2 (%3%)</source>
+        <translation>, Abstieg: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
         <source>Distance: %1%2 (%3%)</source>
-        <translation>Entf.: %1 %2 (%3%)</translation>
+        <translation>Entf.: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <source>, Moving: %1%2 (%3%)</source>
+        <translation>, Zeit in Bew.: %1%2 (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
         <source>Ascent: -</source>
         <translation>Anstieg: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
         <source>Descent: -</source>
         <translation>Abstieg: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
         <source>Ascent: %1%2</source>
-        <translation>Anstieg: %1 %2</translation>
+        <translation>Anstieg: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
-        <source> Descent: %1%2</source>
-        <translation> Abstieg: %1 %2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="696"/>
+        <source>, Descent: %1%2</source>
+        <translation>, Abstieg: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="706"/>
         <source>Distance: %1%2</source>
-        <translation>Entfernung: %1 %2</translation>
+        <translation>Entf.: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="711"/>
+        <source>, Time: %1%2</source>
+        <translation>, Zeit: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1377"/>
         <source>Permanently removed points %1..%2</source>
         <translation>Punkte %1..%2 dauerhaft entfernt</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1555"/>
         <source>Show points.</source>
         <translation>Punkte anzeigen.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2194"/>
         <source>Changed name</source>
         <translation>Name geändert</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2200"/>
         <source>Changed comment</source>
         <translation>Kommentar geändert</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2206"/>
         <source>Changed description</source>
         <translation>Beschreibung geändert</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed links</source>
         <translation>Geänderte Verknüpfungen</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2223"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation>Höhe von Punkt %1 auf %2 %3 geändert</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2247"/>
         <source>Changed activity to '%1' for complete track.</source>
         <translation>Die Aktivität wurde für den gesamten Track auf '%1' geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2286"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation>Die Aktivität wurde für den Bereich (%2..%3) auf '%1' geändert.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="96"/>
         <source>Hide points by Douglas Peuker algorithm (%1%2)</source>
-        <translation>Punkte ausblenden mit dem Douglas-Peuker Algorithmus (%1 %2)</translation>
+        <translation>Punkte ausblenden mit dem Douglas-Peuker Algorithmus (%1%2)</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="122"/>
@@ -1298,7 +1320,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="277"/>
         <source>Offset elevation data by %1%2.</source>
-        <translation>Versatz der Höhendaten um %1 %2.</translation>
+        <translation>Versatz der Höhendaten um %1%2.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="290"/>
@@ -1318,7 +1340,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="346"/>
         <source>Changed speed to %1%2.</source>
-        <translation>Geschwindigkeit auf %1 %2 geändert.</translation>
+        <translation>Geschwindigkeit auf %1%2 geändert.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="365"/>
@@ -1336,7 +1358,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>Punkte vom autom. Routing in Trackpunkte umgewandelt </translation>
     </message>
     <message>
-        <location filename="../qlgt/converter.cpp" line="195"/>
+        <location filename="../qlgt/converter.cpp" line="196"/>
         <source>Copy flag information from QLandkarte GT track</source>
         <translation>Kopiert das Informationsflag aus dem QLandkarte GT Track</translation>
     </message>
@@ -1359,70 +1381,85 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>Nicht verfügbar</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="104"/>
         <source>_Clone</source>
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
-        <source>Elevation: %1 %2</source>
-        <translation>Höhe: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="277"/>
+        <source>Elevation: %1%2</source>
+        <translation>Höhe: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
-        <source>Proximity: %1 %2</source>
-        <translation>Abstand: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="288"/>
+        <source>Proximity: %1%2</source>
+        <translation>Abstand: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
         <source>Changed name</source>
         <translation>Name geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
         <source>Changed position</source>
         <translation>Position geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
         <source>Changed elevation</source>
         <translation>Höhe geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="413"/>
+        <source>Removed proximity</source>
+        <translation>Abstandsalarm entfernen</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="417"/>
         <source>Changed proximity</source>
         <translation>Abstandsalarm geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="432"/>
         <source>Changed icon</source>
         <translation>Symbol geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="438"/>
         <source>Changed comment</source>
         <translation>Kommentar geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="444"/>
         <source>Changed description</source>
         <translation>Beschreibung geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="450"/>
         <source>Changed links</source>
         <translation>Geänderte Verknüpfungen</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="456"/>
         <source>Changed images</source>
         <translation>Bilder geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="462"/>
         <source>Add image</source>
         <translation>Bild hinzufügen</translation>
     </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="877"/>
+        <source>Changed to proximity-radius</source>
+        <translation>Radius des Abstandsalarmes ändern</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="882"/>
+        <source>Changed to nogo-area</source>
+        <translation>In eine Gebietsvermeidung ändern</translation>
+    </message>
 </context>
 <context>
     <name>CGisListDB</name>
@@ -1577,249 +1614,269 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
 <context>
     <name>CGisListWks</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="117"/>
+        <location filename="../gis/CGisListWks.cpp" line="122"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="101"/>
+        <location filename="../gis/CGisListWks.cpp" line="106"/>
         <source>Edit..</source>
         <translation>Bearbeiten..</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="109"/>
+        <location filename="../gis/CGisListWks.cpp" line="114"/>
         <source>Sort by Time</source>
         <translation>Nach der Zeit sortieren</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="110"/>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Sort by Name</source>
         <translation>Nach dem Namen sortieren</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="126"/>
+        <location filename="../gis/CGisListWks.cpp" line="131"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="140"/>
         <source>Update Project on Device</source>
         <translation>Aktualisiere das Projekt auf dem Gerät</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="149"/>
+        <location filename="../gis/CGisListWks.cpp" line="154"/>
         <source>Edit...</source>
         <translation>Bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="102"/>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="155"/>
         <source>Copy to...</source>
         <translation>Kopieren nach...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="113"/>
+        <location filename="../gis/CGisListWks.cpp" line="118"/>
         <source>Autom. Save</source>
         <translation>Autom. Speichern</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="118"/>
+        <location filename="../gis/CGisListWks.cpp" line="123"/>
         <source>Save as...</source>
         <translation>Speichern unter...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="159"/>
+        <location filename="../gis/CGisListWks.cpp" line="164"/>
         <source>Copy Track with Waypoints</source>
         <translation>Track mit Wegpunkten kopieren</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="167"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Show Bubble</source>
         <translation>Infoblase anzeigen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="169"/>
+        <location filename="../gis/CGisListWks.cpp" line="175"/>
         <source>Move Waypoint</source>
         <translation>Wegpunkt verschieben</translation>
     </message>
     <message>
+        <location filename="../gis/CGisListWks.cpp" line="177"/>
+        <source>Change Radius</source>
+        <translation>Radius ändern</translation>
+    </message>
+    <message>
         <location filename="../gis/CGisListWks.cpp" line="178"/>
+        <source>Toggle Nogo-Area</source>
+        <translation>Gebietsvermeidung umschalten</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <source>Delete Radius</source>
+        <translation>Radius entfernen</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
         <source>Route Instructions</source>
         <translation>Navigationsanweisungen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <location filename="../gis/CGisListWks.cpp" line="191"/>
         <source>Calculate Route</source>
         <translation>Route berechnen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="181"/>
+        <location filename="../gis/CGisListWks.cpp" line="192"/>
         <source>Reset Route</source>
         <translation>Route zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="193"/>
         <source>Edit Route</source>
         <translation>Route bearbeiten</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="183"/>
+        <location filename="../gis/CGisListWks.cpp" line="194"/>
         <source>Convert to Track</source>
         <translation>In einen Track umwandeln</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="199"/>
+        <location filename="../gis/CGisListWks.cpp" line="212"/>
         <source>Create Route</source>
         <translation>Route erstellen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="200"/>
+        <location filename="../gis/CGisListWks.cpp" line="213"/>
         <source>Change Icon (sel. waypt. only)</source>
         <translation>Symbol änd. (nur ausgew. Wegp.)</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="158"/>
+        <location filename="../gis/CGisListWks.cpp" line="163"/>
         <source>Set Track Activity</source>
         <translation>Trackaktivität festlegen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="634"/>
+        <location filename="../gis/CGisListWks.cpp" line="646"/>
         <source>Drop items...</source>
         <translation>Elemente verwerfen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="659"/>
-        <location filename="../gis/CGisListWks.cpp" line="1691"/>
-        <location filename="../gis/CGisListWks.cpp" line="1729"/>
+        <location filename="../gis/CGisListWks.cpp" line="671"/>
+        <location filename="../gis/CGisListWks.cpp" line="1771"/>
+        <location filename="../gis/CGisListWks.cpp" line="1809"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation><b>Aktualisieren der Geräte</b><p>Aktualisiere %1<br/>Bitte warten...</p></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Delete project...</source>
         <translation>Projekt löschen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Do you really want to delete %1?</source>
         <translation>Sind Sie sicher, dass sie %1 löschen wollen?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="170"/>
+        <location filename="../gis/CGisListWks.cpp" line="176"/>
         <source>Proj. Waypoint...</source>
         <translation>Wegpunkt Projektion...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Track Profile</source>
         <translation>Trackprofil</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="122"/>
+        <location filename="../gis/CGisListWks.cpp" line="127"/>
         <source>Send to Devices</source>
         <translation>Ans Gerät senden</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="154"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Select Range</source>
         <translation>Bereich wählen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="155"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Edit Track Points</source>
         <translation>Trackpunkte bearbeiten</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="156"/>
+        <location filename="../gis/CGisListWks.cpp" line="161"/>
         <source>Reverse Track</source>
         <translation>Track umkehren</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="157"/>
+        <location filename="../gis/CGisListWks.cpp" line="162"/>
         <source>Combine Tracks</source>
         <translation>Tracks verbinden</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="192"/>
+        <location filename="../gis/CGisListWks.cpp" line="204"/>
         <source>Edit Area Points</source>
         <translation>Gebietspunkte bearbeiten</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="166"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
         <source>Show on Map</source>
         <translation>Auf der Karte anzeigen.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="109"/>
         <source>Hide from Map</source>
         <translation>Auf der Karte ausblenden.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="119"/>
+        <location filename="../gis/CGisListWks.cpp" line="124"/>
         <source>Save as GPX 1.1 w/o ext...</source>
         <translation>Als GPX o. Erw. speichern...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Sync. with Database</source>
         <translation>Mit der Datenbank synchronisieren</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="785"/>
+        <location filename="../gis/CGisListWks.cpp" line="797"/>
         <source>Saving workspace. Please wait.</source>
         <translation>Arbeitsplatz wird gespeichert. Bitte warten.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="831"/>
+        <location filename="../gis/CGisListWks.cpp" line="843"/>
         <source>Loading workspace. Please wait.</source>
         <translation>Arbeitsplatz laden. Bitte warten.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>Close all projects...</source>
         <translation>Alle Projekte schließen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>This will remove all projects from the workspace.</source>
         <translation>Dies wird alle Projekte aus dem Arbeitsplatz entfernen.</translation>
     </message>
 </context>
 <context>
-    <name>CGisWidget</name>
+    <name>CGisWorkspace</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>Load project...</source>
         <translation>Lade Projekt...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>The project "%1" is already in the workspace.</source>
         <translation>Das Projekt "%1" ist schon im Arbeitsplatz geladen.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="559"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="213"/>
+        <source><b>Item Selection: </b>Item selected from workspace list. Click on the map to switch back to normal mouse selection behavior.</source>
+        <translation><b>Elementauswahl: </b> Ein Element wurde aus der Arbeitplatzliste heraus ausgewählt. Klicken Sie auf die Karte, um wieder auf die normale Auswahl mit der Maus umzuschalten.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="626"/>
         <source>Copy items...</source>
         <translation>Elemente kopieren...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="578"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="645"/>
         <source>Change waypoint symbols.</source>
         <translation>Symbol der Wegpunkte wird geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Cut Track...</source>
         <translation>Track teilen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Do you want to delete the original track?</source>
         <translation>Wollen Sie den ursprünglichen Track löschen?</translation>
     </message>
@@ -1891,12 +1948,12 @@ Zeile %2, Spalte %3:
     <message>
         <location filename="../grid/CGrid.cpp" line="72"/>
         <source>%1m, %2m </source>
-        <translation>%1 m, %2 m</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../grid/CGrid.cpp" line="76"/>
         <source>N %1m, E %2m </source>
-        <translation>N %1 m, E %2 m</translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -1948,99 +2005,298 @@ Zeile %2, Spalte %3:
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <source>Speed</source>
+        <comment>extLongName</comment>
+        <translation>Geschwindigkeit</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
+        <source>Cadence</source>
+        <comment>extShortName</comment>
+        <translation>Trittfr.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
+        <source>Air Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
         <source>Air Temperature</source>
+        <comment>extLongName</comment>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
+        <source>Water Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
         <source>Water Temperature</source>
+        <comment>extLongName</comment>
         <translation>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
+        <source>Depth</source>
+        <comment>extShortName</comment>
+        <translation>Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
         <source>Depth</source>
+        <comment>extLongName</comment>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
+        <source>Heart R.</source>
+        <comment>extShortName</comment>
+        <translation>Puls</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
         <source>Heart Rate</source>
+        <comment>extLongName</comment>
         <translation>Pulsrate</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="93"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="112"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
         <source>Cadence</source>
+        <comment>extLongName</comment>
         <translation>Trittfrequenz</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
         <source>Speed</source>
-        <translation>Geschwindigkeit</translation>
+        <comment>extShortName</comment>
+        <translation>Geschw.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+        <source>Accel.</source>
+        <comment>extShortName</comment>
+        <translation>Beschl.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
         <source>Acceleration</source>
+        <comment>extLongName</comment>
         <translation>Beschleunigung</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
         <source>Course</source>
+        <comment>extShortName</comment>
         <translation>Kurs</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
+        <source>Course</source>
+        <comment>extLongName</comment>
+        <translation>Kurs</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
+        <source>Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
         <source>Temperature</source>
+        <comment>extLongName</comment>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
+        <source>Dist.</source>
+        <comment>extShortName</comment>
+        <translation>Entf.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
         <source>Distance</source>
+        <comment>extLongName</comment>
         <translation>Entfernung</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Ele.</source>
+        <comment>extShortName</comment>
+        <translation>Höhe</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <source>Elevation</source>
+        <comment>extLongName</comment>
+        <translation>Höhe</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
         <source>Energy</source>
+        <comment>extShortName</comment>
         <translation>Energie</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
+        <source>Energy</source>
+        <comment>extLongName</comment>
+        <translation>Energie</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Sea Lev. Pres.</source>
+        <comment>extShortName</comment>
+        <translation>Luftdr. M-Höhe</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
         <source>Sea Level Pressure</source>
+        <comment>extLongName</comment>
         <translation>Luftdruck Meereshöhe</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
-        <source>Speed (vertical)</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>v. Speed</source>
+        <comment>extShortName</comment>
+        <translation>Geschw. (v).</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>Vertical Speed</source>
+        <comment>extLongName</comment>
         <translation>Geschwindigkeit (vertikal)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
-        <source>Slope*</source>
-        <translation>Neigung*</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope</source>
+        <comment>extShortName</comment>
+        <translation>Neigung</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
-        <source>Speed*</source>
-        <translation>Geschwindigkeit*</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <source>Speed over Distance*</source>
+        <comment>extLongName</comment>
+        <translation>Geschwindigkeit ü. Entfernung*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
-        <source>Elevation</source>
-        <translation>Höhe</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
+        <source>Speed over Time*</source>
+        <comment>extLongName</comment>
+        <translation>Geschwindigkeit ü. Zeit*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Elevation*</source>
+        <comment>extLongName</comment>
+        <translation>Höhe*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
         <source>Progress</source>
+        <comment>extShortName</comment>
         <translation>Verlauf</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
-        <source>Terrain slope</source>
-        <translation>Hangneigung</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
+        <source>Progress*</source>
+        <comment>extLongName</comment>
+        <translation>Verlauf*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terr. Slope</source>
+        <comment>extShortName</comment>
+        <translation>Hangn.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terrain Slope*</source>
+        <comment>extLongName</comment>
+        <translation>Hangneigung*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope*</source>
+        <translation>Neigung*</translation>
+    </message>
+</context>
+<context>
+    <name>CLogProject</name>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="62"/>
+        <source>Failed to load file %1...</source>
+        <translation>Datei %1 konnte nicht geladen werden...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="84"/>
+        <source>Failed to open %1</source>
+        <translation>Die Datei %1 konnte nicht geöffnet werden.</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="95"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Fehler beim Lesen: %1
+Zeile %2, Spalte %3:
+-%4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="102"/>
+        <source>Not an Openambit log file: %1</source>
+        <translation>Keine Openambit Logdatei: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="113"/>
+        <source>Device: %1<br/></source>
+        <translation>Gerät: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="140"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation>Erholungszeit: %1 h<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="145"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation>Trainingseffekt Spitze: %1 <br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="150"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation>Energie: %1 kCal<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="182"/>
+        <source>Use of local time...</source>
+        <translation>Lokale Zeit benutzen...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="183"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation>In der Datei wurde keine UTC Zeit gefunden. Deswegen wird die lokale Zeit auf dem Computer verwendet. Sie können nachträglich die Zeit im Track mit einem entsprechenden Filter ändern.</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="245"/>
+        <source>This LOG file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation>Diese LOG Datei enthält keine Positionsdaten und kann nicht in QMapShack angezeigt werden: %1</translation>
     </message>
 </context>
 <context>
@@ -2054,53 +2310,54 @@ Zeile %2, Spalte %3:
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="813"/>
+        <location filename="../CMainWindow.cpp" line="859"/>
         <source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
         <translation>Benützen Sie <b>Menü->Ansicht->Kartenansicht hinzufügen</b>, um eine neue Ansicht zu öffnen. Oder <b>Menü->Datei->Kartenansicht laden</b>, um eine gespeicherte wieder herzustellen. Oder Sie klicken einfach <a href='newview'>hier</a>.</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="941"/>
-        <source>Ele: %1%2</source>
+        <location filename="../CMainWindow.cpp" line="987"/>
+        <source>Ele.: %1%2</source>
         <translation>Höhe: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="953"/>
+        <location filename="../CMainWindow.cpp" line="999"/>
         <source>Slope: %1%2</source>
+        <comment>terrain</comment>
         <translation>Hangneigung: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="969"/>
+        <location filename="../CMainWindow.cpp" line="1015"/>
         <source>[Grid: %1]</source>
         <translation>[Gitter: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1110"/>
+        <location filename="../CMainWindow.cpp" line="1156"/>
         <source>Load GIS Data...</source>
         <translation>GIS Daten laden...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
         <source>Select output file</source>
         <translation>Ausgabedatei auswählen</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>QMapShack View (*.view)</source>
         <translation>QMapShack Ansicht (*.view)</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>Select file to load</source>
         <translation>Zu ladende Datei auswählen</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1481"/>
+        <location filename="../CMainWindow.cpp" line="1532"/>
         <source>Fatal...</source>
         <translation>Schwerer Fehler...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1482"/>
+        <location filename="../CMainWindow.cpp" line="1533"/>
         <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
         <translation>QMapShack hat eine unvollständig installierte Proj4 Bibliothek gefunden. Die Übersetzungstabellen für EPSG Projektionen, die normalerweise in /usr/share/proj installiert sind, fehlen. Bitte kontaktieren Sie den Paketbetreuer ihrer Distribution, um das zu beheben.</translation>
     </message>
@@ -2858,7 +3115,7 @@ Interne Typen werden wiederhergestellt.</translation>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="237"/>
         <source>Unknown projection and datum (%1%2).</source>
-        <translation>Unbekannte Projektion und Datum (%1 %2).</translation>
+        <translation>Unbekannte Projektion und Datum (%1%2).</translation>
     </message>
 </context>
 <context>
@@ -3053,42 +3310,42 @@ Unbekannte Struktur.</translation>
 <context>
     <name>CMouseNormal</name>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="39"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
         <source>Add POI as Waypoint</source>
         <translation>POI als Wegpunkt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
         <source>Add Waypoint</source>
         <translation>Wegpunkt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
         <source>Add Track</source>
         <translation>Track hinzufügen</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
         <source>Add Route</source>
         <translation>Route hinzufügen</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="44"/>
         <source>Add Area</source>
         <translation>Gebiet hinzufügen</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="45"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="46"/>
         <source>Select Items On Map</source>
         <translation>Elemente auf der Karte auswählen</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
         <source>Copy position</source>
         <translation>Position kopieren</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="49"/>
         <source>Copy position (Grid)</source>
         <translation>Position kopieren (Gitter)</translation>
     </message>
@@ -3104,7 +3361,7 @@ Unbekannte Struktur.</translation>
 <context>
     <name>CMouseRangeTrk</name>
     <message>
-        <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
+        <location filename="../mouse/CMouseRangeTrk.cpp" line="239"/>
         <source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
         <translation><b>Punktebereich auswählen</b><br/>Mit der linken Maustaste wählen Sie den ersten Punkt aus. Mit einem erneuten Drücken der linken Maustaste wählen Sie den zweiten Punkt aus und dann wählen Sie eine der Optionen. Zum Abbrechen nutzen Sie die rechte Maustaste.<br/></translation>
     </message>
@@ -3154,25 +3411,25 @@ Unbekannte Struktur.</translation>
     <name>CPlot</name>
     <message>
         <location filename="../plot/CPlot.cpp" line="55"/>
-        <source>distance [%1]</source>
+        <source>Distance [%1]</source>
         <translation>Entfernung [%1]</translation>
     </message>
     <message>
         <location filename="../plot/CPlot.cpp" line="60"/>
-        <source>time</source>
-        <translation>Uhrzeit</translation>
+        <source>Time</source>
+        <translation>Zeit</translation>
     </message>
 </context>
 <context>
     <name>CPlotProfile</name>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="79"/>
-        <source>distance [%1]</source>
+        <source>Distance [%1]</source>
         <translation>Entfernung [%1]</translation>
     </message>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="80"/>
-        <source>alt. [%1]</source>
+        <source>Ele. [%1]</source>
         <translation>Höhe [%1]</translation>
     </message>
 </context>
@@ -3225,12 +3482,12 @@ y: %4 m/px</translation>
 <context>
     <name>CProgressDialog</name>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="46"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="48"/>
         <source>Elapsed time: %1</source>
         <translation>Verstrichene Zeit: %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="132"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="134"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation>Verstrichene Zeit: %1 Sekunden.</translation>
     </message>
@@ -3278,6 +3535,29 @@ ist keine gültige Koordinatensystemdefinition:
     </message>
 </context>
 <context>
+    <name>CQlbProject</name>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open...</source>
+        <translation>Öffnen fehlgeschlagen...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open %1</source>
+        <translation>Die Datei %1 konnte nicht geöffnet werden</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="138"/>
+        <source>Could not convert...</source>
+        <translation>Konnte nicht umgewandelt werden...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="139"/>
+        <source>The file contains overlays that can not be converted. This is because QMapShack does not support all overlay types of QLandkarte.</source>
+        <translation>Die Datei enthält Einblendungen (Overlays), die nicht konvertiert werden können. Der Grund dafür ist, dass QMapShack nicht alle Einblendungstypen von QLandkarte unterstützt.</translation>
+    </message>
+</context>
+<context>
     <name>CQlgtDb</name>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="308"/>
@@ -3463,114 +3743,120 @@ ist keine gültige Koordinatensystemdefinition:
 <context>
     <name>CRouterBRouter</name>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
         <source>original</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
         <source>first alternative</source>
         <translation>erste Variante</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
         <source>second alternative</source>
         <translation>zweite Variante</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="53"/>
         <source>third alternative</source>
         <translation>dritte Variante</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="148"/>
         <source>BRouter (offline)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="155"/>
         <source>BRouter (online)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="185"/>
         <source>profile: %1, alternative: %2</source>
         <translation>Profil: %1, Variante: %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="283"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="408"/>
+        <source>BRouter does not support more then 1 nogo-area in this version, consider to upgrade</source>
+        <translation>BRouter unterstützt in dieser Version nicht mehr als ein Vermeidungsgebiet. Versuchen Sie es mit einem Update.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="297"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="420"/>
         <source>response is empty</source>
         <translation>Anwort ist leer</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="334"/>
         <source>Bad response from server: %1</source>
         <translation>Fehlerhafte Serverantwort: %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="386"/>
         <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
         <translation><b>BRouter</b><br/>Routen-anfrage an den Server geschickt. Bitte warten...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="270"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="389"/>
         <source>Calculate route with %1</source>
         <translation>Berechne Route mit %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="454"/>
         <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
         <translation><b>BRouter</b><br/>Fehler-Antwort vom Server<br/>%1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="444"/>
         <source><br/>Calculation time: %1s</source>
         <translation><br/>Berechnungszeit: %1 s</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="548"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="600"/>
         <source>running</source>
         <translation>wird ausgeführt</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="592"/>
         <source>starting</source>
         <translation>started</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="554"/>
         <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local  [...]
         <translation>QMapShack kommuniziert mit BRouter über eine Netzwerkverbindung. Normalerweise wird das über eine spezielle Addresse gemacht, die von außen nicht zugänglich ist. Allerdings horcht BRouter auf allen verfügbaren Netzwerkschnittstellen. Wenn Sie in ihrem eigenen privaten Netzwerk mit einer aktiven Firewall sind, ist das kein großes Problem. Wenn Sie in einem öffentlichen Netzwerk sind, stellt jeder offene Zugang ein Risiko dar, weil er von jemanden missbraucht werden ka [...]
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="581"/>
         <source>Warning...</source>
         <translation>Warnung...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="586"/>
         <source>I understand the risk. Don't tell me again.</source>
         <translation>Ich verstehe das Risiko. Bitte nicht mehr zeigen.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="607"/>
         <source>stopped</source>
         <translation>angehalten</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="618"/>
         <source>not installed</source>
         <translation>nicht installiert</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="629"/>
         <source>online</source>
         <translation></translation>
     </message>
@@ -4295,17 +4581,17 @@ ist keine gültige Koordinatensystemdefinition:
         <translation>Routino Datenbank erstellen</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="58"/>
         <source>Select files...</source>
         <translation>Dateien auswählen...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="82"/>
         <source>Select target path...</source>
         <translation>Zielpfad auswählen...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="143"/>
         <source>!!! done !!!
 </source>
         <translation>!!! erledigt !!!</translation>
@@ -4495,6 +4781,73 @@ Zeile %2, Spalte %3:
     </message>
 </context>
 <context>
+    <name>CSmlProject</name>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="63"/>
+        <source>Failed to load file %1...</source>
+        <translation>Datei %1 konnte nicht geladen werden...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="85"/>
+        <source>Failed to open %1</source>
+        <translation>Die Datei %1 konnte nicht geöffnet werden.</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="96"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Fehler beim Lesen: %1
+Zeile %2, Spalte %3:
+-%4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="103"/>
+        <source>Not an sml file: %1</source>
+        <translation>Keine SML Datei: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="129"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation>Erholungszeit: %1 h<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="134"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation>Trainingseffekt Spitze: %1 <br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="139"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation>Energie: %1 kCal<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="160"/>
+        <source>Device: %1<br/></source>
+        <translation>Gerät: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="148"/>
+        <source>Battery usage: %1 %/hour</source>
+        <translation>Batteriebenutzung: %1 %/h</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="195"/>
+        <source>Use of local time...</source>
+        <translation>Lokale Zeit benutzen...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="196"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation>In der Datei wurde keine UTC Zeit gefunden. Deswegen wird die lokale Zeit auf dem Computer verwendet. Sie können nachträglich die Zeit im Track mit einem entsprechenden Filter ändern.</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="245"/>
+        <source>This SML file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation>Diese SML Datei enthält keine Positionsdaten und kann nicht in QMapShack angezeigt werden: %1</translation>
+    </message>
+</context>
+<context>
     <name>CTableTrk</name>
     <message>
         <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
@@ -4508,7 +4861,7 @@ Zeile %2, Spalte %3:
         <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
-        <source>%1 %2</source>
+        <source>%1%2</source>
         <translation></translation>
     </message>
 </context>
@@ -5407,42 +5760,42 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
         <translation></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="118"/>
+        <location filename="../dem/IDemList.ui" line="112"/>
         <source>To add files with elevation data use <b>File->Setup DEM Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
         <translation>Sie können Höhendaten mit <b>"Menü -> Datei -> DEM Verzeichnisse angeben"</b> hinzufügen. Oder Sie klicken einfach <a href='setup'><b>hier</b></a></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="131"/>
+        <location filename="../dem/IDemList.ui" line="125"/>
         <source>Use the context menu (right mouse button click on entry) to activate a file. Use drag-n-drop to move the activated file in the process order. </source>
         <translation>Mit dem Kontextmenü (Klick mit rechter Maustaste auf einen Eintrag) können Sie einen Datensatz aktivieren. Um die Höhendaten in einer anderen Reihenfolge anzuzeigen, können Sie jeden Eintrag mit drag-n-drop verschieben.</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="156"/>
+        <location filename="../dem/IDemList.ui" line="150"/>
         <source>Activate</source>
         <translation>Aktivieren</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="165"/>
+        <location filename="../dem/IDemList.ui" line="159"/>
         <source>Move Up</source>
         <translation>Nach oben verschieben</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="168"/>
+        <location filename="../dem/IDemList.ui" line="162"/>
         <source>Hide DEM behind previous one</source>
         <translation>Versteckt DEM hinter dem vorherigen</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="177"/>
+        <location filename="../dem/IDemList.ui" line="171"/>
         <source>Move down</source>
         <translation>Nach unten verschieben</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="180"/>
+        <location filename="../dem/IDemList.ui" line="174"/>
         <source>Show DEM on top of next one</source>
         <translation>DEM überlagert das nächste</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="189"/>
+        <location filename="../dem/IDemList.ui" line="183"/>
         <source>Reload DEM</source>
         <translation>DEM erneut laden</translation>
     </message>
@@ -5984,7 +6337,7 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="292"/>
+        <location filename="../device/IDevice.cpp" line="314"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation>Es gibt schon ein Projekt mit demselben Namen. Wenn Sie 'ok' drücken wird dieses entfernt und ersetzt.</translation>
     </message>
@@ -6479,89 +6832,117 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
     </message>
 </context>
 <context>
+    <name>IGisDatabase</name>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="59"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="64"/>
+        <source>Age</source>
+        <translation>Alter</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="97"/>
+        <source>To add a database do a right click on the database list above.</source>
+        <translation>Eine neue Datenbank wird über einen Rechtsklick im Fenster erstellt.</translation>
+    </message>
+</context>
+<context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="44"/>
+        <location filename="../gis/IGisItem.cpp" line="45"/>
         <source>[no name]</source>
         <translation>[kein Name]</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>The item is not part of the project in the database.</source>
         <translation>Das Element ist nicht Teil des Projektes in der Datenbank.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="317"/>
+        <location filename="../gis/IGisItem.cpp" line="318"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation>Es ist entweder ein neues Symbol oder es wurde in der Datenbank gelöscht.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="323"/>
+        <location filename="../gis/IGisItem.cpp" line="324"/>
         <source>The item is not in the database.</source>
         <translation>Das Element ist nicht in der Datenbank.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="329"/>
+        <location filename="../gis/IGisItem.cpp" line="330"/>
         <source>The item might need to be saved</source>
         <translation>Es könnte notwendig sein, das Element zu speichern.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="413"/>
+        <location filename="../gis/IGisItem.cpp" line="414"/>
         <source>Initial version.</source>
         <translation>Erstversion.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="529"/>
+        <location filename="../gis/IGisItem.cpp" line="534"/>
+        <source>Never ask again.</source>
+        <translation>Aufhören nachzufragen.</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="535"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation><h3>%1</h3> Diese Element ist vermutlich schreibgeschützt, da nicht mit QMapShack erstellt. Normalerweise sollten importierte Daten nicht geändert werden. Wenn doch, drücken Sie 'OK'.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="530"/>
+        <location filename="../gis/IGisItem.cpp" line="536"/>
         <source>Read Only Mode...</source>
         <translation>Schreibgeschützt...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="700"/>
-        <location filename="../gis/IGisItem.cpp" line="753"/>
+        <location filename="../gis/IGisItem.cpp" line="713"/>
+        <location filename="../gis/IGisItem.cpp" line="766"/>
         <source><h4>Description:</h4></source>
         <translation><h4>Beschreibung:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="703"/>
-        <location filename="../gis/IGisItem.cpp" line="756"/>
+        <location filename="../gis/IGisItem.cpp" line="716"/>
+        <location filename="../gis/IGisItem.cpp" line="769"/>
         <source><p>--- no description ---</p></source>
         <translation><p>--- keine Beschreibung ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="714"/>
+        <location filename="../gis/IGisItem.cpp" line="727"/>
         <source><h4>Comment:</h4></source>
         <translation><h4>Kommentar:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="717"/>
+        <location filename="../gis/IGisItem.cpp" line="730"/>
         <source><p>--- no comment ---</p></source>
         <translation><p>--- kein Kommentar ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="728"/>
-        <location filename="../gis/IGisItem.cpp" line="767"/>
+        <location filename="../gis/IGisItem.cpp" line="741"/>
+        <location filename="../gis/IGisItem.cpp" line="780"/>
         <source><h4>Links:</h4></source>
         <translation><h4>Verknüpfungen:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="731"/>
-        <location filename="../gis/IGisItem.cpp" line="770"/>
+        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="783"/>
         <source><p>--- no links ---</p></source>
         <translation><p>--- keine Verknüpfungen---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Edit name...</source>
         <translation>Name bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Enter new %1 name.</source>
         <translation>Geben Sie einen neuen %1namen ein.</translation>
     </message>
@@ -6569,119 +6950,108 @@ It is either a new item or it has been deleted in the database by someone else.<
 <context>
     <name>IGisProject</name>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source>Save project?</source>
         <translation>Projekt speichern?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source><h3>%1</h3>The project was changed. Save before closing it?</source>
         <translation><h3>%1</h3>Das Projekt wurde geändert. Speichern, bevor es geschlossen wird?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="356"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="375"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation>%1: Tracks und Wegpunkte verknüpfen.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="366"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="385"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation><h3>%1</h3>Hat das zu lange gedauert? Wollen Sie die Verknüpfung von Tracks und Wegpunkten auch in Zukunft für dieses Projekt überspringen?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="367"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="386"/>
         <source>Canceled correlation...</source>
         <translation>Verknüpfung abgebrochen...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="412"/>
-        <location filename="../gis/prj/IGisProject.cpp" line="469"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="431"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="488"/>
         <source>Save "%1" to...</source>
         <translation>Speichere "%1" nach...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="554"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="573"/>
         <source><br/>
 Filename: %1</source>
         <translation><br/>
 Dateiname: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="559"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="578"/>
         <source>Waypoints: %1</source>
         <translation>Wegpunkte: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="563"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="582"/>
         <source>Tracks: %1</source>
         <translation>Tracks: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="567"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="586"/>
         <source>Routes: %1</source>
         <translation>Routen: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="571"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="590"/>
         <source>Areas: %1</source>
         <translation>Gebiete: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="691"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="733"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation>Sind Sie sicher, dass Sie '%1' aus dem Projekt '%2' löschen wollen? </translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="692"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="734"/>
         <source>Delete...</source>
         <translation>Löschen...</translation>
     </message>
 </context>
 <context>
-    <name>IGisWidget</name>
+    <name>IGisWorkspace</name>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="14"/>
+        <location filename="../gis/IGisWorkspace.ui" line="14"/>
         <source>Form</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="43"/>
+        <location filename="../gis/IGisWorkspace.ui" line="43"/>
         <source>Opacity</source>
         <translation>Transparenz</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="50"/>
+        <location filename="../gis/IGisWorkspace.ui" line="50"/>
         <source>Change the opacity of all GIS Items on the map.</source>
         <translation>Ändert die Transparenz von allen GIS Elementen auf der Karte.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="66"/>
+        <location filename="../gis/IGisWorkspace.ui" line="66"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="116"/>
-        <location filename="../gis/IGisWidget.ui" line="146"/>
+        <location filename="../gis/IGisWorkspace.ui" line="116"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="151"/>
-        <source>Age</source>
-        <translation>Alter</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="185"/>
-        <source>To add a database do a right click on the database list above.</source>
-        <translation>Eine neue Datenbank wird über einen Rechtsklick im Fenster erstellt.</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="205"/>
+        <location filename="../gis/IGisWorkspace.ui" line="129"/>
         <source>Clear Filter</source>
         <translation>Filter zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <location filename="../gis/IGisWorkspace.ui" line="138"/>
         <source>Setup Filter</source>
         <translation>Filter einstellen</translation>
     </message>
@@ -6783,7 +7153,7 @@ Dateiname: %1</translation>
 <context>
     <name>ILineOp</name>
     <message>
-        <location filename="../mouse/line/ILineOp.cpp" line="212"/>
+        <location filename="../mouse/line/ILineOp.cpp" line="279"/>
         <source>Routing</source>
         <translation></translation>
     </message>
@@ -6835,375 +7205,391 @@ Dateiname: %1</translation>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="103"/>
+        <location filename="../IMainWindow.ui" line="104"/>
         <source>Window</source>
         <translation>Fenster</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="113"/>
+        <location filename="../IMainWindow.ui" line="114"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="121"/>
-        <source>Project</source>
-        <translation>Projekt</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="132"/>
+        <location filename="../IMainWindow.ui" line="133"/>
         <source>Tool</source>
         <translation>Werkzeug</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="157"/>
+        <location filename="../IMainWindow.ui" line="152"/>
         <source>Maps</source>
         <translation>Karten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="200"/>
+        <location filename="../IMainWindow.ui" line="189"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation>Dig. Höhenmodell (DEM)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="239"/>
-        <source>Data</source>
-        <translation>Daten</translation>
+        <location filename="../IMainWindow.ui" line="231"/>
+        <source>Toolbar</source>
+        <translation>Werkzeugleiste</translation>
     </message>
     <message>
         <location filename="../IMainWindow.ui" line="257"/>
-        <source>Route</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="287"/>
-        <source>Toolbar</source>
-        <translation>Werkzeugleiste</translation>
+        <source>Routing</source>
+        <translation>Streckenführung</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="302"/>
-        <location filename="../IMainWindow.ui" line="305"/>
+        <location filename="../IMainWindow.ui" line="276"/>
+        <location filename="../IMainWindow.ui" line="279"/>
         <source>Add Map View</source>
         <translation>Kartenansicht hinzufügen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="308"/>
+        <location filename="../IMainWindow.ui" line="282"/>
         <source>Ctrl+T</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="323"/>
+        <location filename="../IMainWindow.ui" line="297"/>
         <source>Show Scale</source>
         <translation>Maßstab</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="335"/>
+        <location filename="../IMainWindow.ui" line="309"/>
         <source>Setup Map Font</source>
         <translation>Kartenfont einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="350"/>
+        <location filename="../IMainWindow.ui" line="324"/>
         <source>Show Grid</source>
         <translation>Gitter</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="353"/>
+        <location filename="../IMainWindow.ui" line="327"/>
         <source>Ctrl+G</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="365"/>
+        <location filename="../IMainWindow.ui" line="339"/>
         <source>Setup Grid</source>
         <translation>Gitter einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="368"/>
+        <location filename="../IMainWindow.ui" line="342"/>
         <source>Ctrl+Alt+G</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="383"/>
+        <location filename="../IMainWindow.ui" line="357"/>
         <source>Flip Mouse Wheel</source>
         <translation>Mausrad umdrehen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="395"/>
-        <location filename="../IMainWindow.ui" line="398"/>
+        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="372"/>
         <source>Setup Map Paths</source>
         <translation>Kartenverzeichnisse angeben</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="413"/>
+        <location filename="../IMainWindow.ui" line="387"/>
         <source>POI Text</source>
         <translation>POI Text</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="428"/>
+        <location filename="../IMainWindow.ui" line="402"/>
         <source>Night / Day</source>
         <translation>Nacht / Tag</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="443"/>
+        <location filename="../IMainWindow.ui" line="417"/>
         <source>Map Tool Tip</source>
         <translation>Kartentooltip</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="446"/>
+        <location filename="../IMainWindow.ui" line="420"/>
         <source>Ctrl+I</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="458"/>
+        <location filename="../IMainWindow.ui" line="432"/>
         <source>Setup DEM Paths</source>
         <translation>DEM Verzeichnisse angeben</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="470"/>
+        <location filename="../IMainWindow.ui" line="444"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="482"/>
+        <location filename="../IMainWindow.ui" line="456"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="485"/>
+        <location filename="../IMainWindow.ui" line="459"/>
         <source>F1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="497"/>
-        <location filename="../IMainWindow.ui" line="500"/>
+        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="474"/>
         <source>Setup Map View</source>
         <translation>Kartenansicht einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="644"/>
+        <location filename="../IMainWindow.ui" line="618"/>
         <source>VRT Builder</source>
         <translation>VRT Builder</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="647"/>
+        <location filename="../IMainWindow.ui" line="621"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation>Eine graphische Benutzerschnittstelle zu gdalbuildvrt </translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="659"/>
+        <location filename="../IMainWindow.ui" line="633"/>
         <source>Store Map View</source>
         <translation>Kartenansicht speichern</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="662"/>
+        <location filename="../IMainWindow.ui" line="636"/>
         <source>Write current active map and DEM list including the properties to a file</source>
         <translation>Speichert die aktiven Karten und DEM Dateien inklusive der Eigenschaften in einer Datei</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="674"/>
+        <location filename="../IMainWindow.ui" line="648"/>
         <source>Load Map View</source>
         <translation>Kartenansicht laden</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="677"/>
+        <location filename="../IMainWindow.ui" line="651"/>
         <source>Restore view with active map and DEM list including the properties from a file</source>
         <translation>Stellt die aktiven Karten und DEM Dateien inklusive der Eigenschaften aus einer Datei wieder her</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="692"/>
+        <location filename="../IMainWindow.ui" line="666"/>
         <source>Ext. Profile</source>
         <translation>Erw. Profil</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="695"/>
+        <location filename="../IMainWindow.ui" line="669"/>
         <source>Ctrl+E</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="707"/>
+        <location filename="../IMainWindow.ui" line="681"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="710"/>
+        <location filename="../IMainWindow.ui" line="684"/>
         <source>Ctrl+Q</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="722"/>
+        <location filename="../IMainWindow.ui" line="696"/>
         <source>Clone Map View</source>
         <translation>Kartenansicht klonen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="725"/>
+        <location filename="../IMainWindow.ui" line="699"/>
         <source>Ctrl+Shift+T</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="737"/>
+        <location filename="../IMainWindow.ui" line="711"/>
         <source>Create Routino Database</source>
         <translation>Routino Datenbank erstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="749"/>
+        <location filename="../IMainWindow.ui" line="723"/>
         <source>Save(Print) Map Screenshot</source>
         <translation>Kartenausschnitt speichern (drucken)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="752"/>
+        <location filename="../IMainWindow.ui" line="726"/>
         <source>Print a selected area of the map</source>
         <translation>Einen ausgewählten Bereich der Karte drucken</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="755"/>
+        <location filename="../IMainWindow.ui" line="729"/>
         <source>Ctrl+P</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="767"/>
+        <location filename="../IMainWindow.ui" line="741"/>
         <source>Setup Coord. Format</source>
         <translation>Koordinatenformat einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="770"/>
+        <location filename="../IMainWindow.ui" line="744"/>
         <source>Change the format coordinates are displayed</source>
         <translation>Ändert das Format der angezeigten Koordinaten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="782"/>
+        <location filename="../IMainWindow.ui" line="756"/>
         <source>Setup Map Background</source>
         <translation>Kartenhintergrund einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="794"/>
+        <location filename="../IMainWindow.ui" line="768"/>
         <source>Setup Waypoint Icons</source>
         <translation>Wegpunktsymbole konfigurieren</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="797"/>
+        <location filename="../IMainWindow.ui" line="771"/>
         <source>Setup path to custom icons</source>
         <translation>Pfad zu individuellen Symbolen einrichten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="806"/>
+        <location filename="../IMainWindow.ui" line="780"/>
         <source>Close Tab</source>
         <translation>Reiter schließen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="809"/>
+        <location filename="../IMainWindow.ui" line="783"/>
         <source>Ctrl+W</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="818"/>
+        <location filename="../IMainWindow.ui" line="792"/>
         <source>Quickstart Help</source>
         <translation>Schnellstartanleitung</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="827"/>
+        <location filename="../IMainWindow.ui" line="801"/>
         <source>Setup Toolbar</source>
         <translation>Werkzeugleiste einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="839"/>
+        <location filename="../IMainWindow.ui" line="813"/>
         <source>Toggle Docks</source>
         <translation>Fenster umschalten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="842"/>
+        <location filename="../IMainWindow.ui" line="816"/>
         <source>Toggle visibility of dockable windows</source>
         <translation>Sichtbarkeit der andockbaren Fenster umschalten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="845"/>
+        <location filename="../IMainWindow.ui" line="819"/>
         <source>Ctrl+D</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="854"/>
+        <location filename="../IMainWindow.ui" line="828"/>
         <source>Full Screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="857"/>
+        <location filename="../IMainWindow.ui" line="831"/>
         <source>F11</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="512"/>
+        <location filename="../IMainWindow.ui" line="843"/>
+        <source>Min./Max. Track Values</source>
+        <translation>Min./Max. Trackwerte</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="846"/>
+        <source>Show the minimum and maximum values of the track properties along the track in the map view.</source>
+        <translation>Zeigt die minimalen und maximalen Werte der Trackdaten in der Kartenansicht entlang des Tracks an.</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="849"/>
+        <source>Ctrl+N</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="245"/>
+        <source>Database</source>
+        <translation>Datenbank</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="122"/>
+        <location filename="../IMainWindow.ui" line="222"/>
+        <source>Workspace</source>
+        <translation>Arbeitsplatz</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="486"/>
         <source>Load GIS Data</source>
         <translation>GIS Daten laden</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="515"/>
+        <location filename="../IMainWindow.ui" line="489"/>
         <source>Load projects from file</source>
         <translation>Lade Datei als Projekt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="518"/>
+        <location filename="../IMainWindow.ui" line="492"/>
         <source>Ctrl+L</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="530"/>
+        <location filename="../IMainWindow.ui" line="504"/>
         <source>Save All GIS Data</source>
         <translation>Alle GIS Daten speichern</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="533"/>
+        <location filename="../IMainWindow.ui" line="507"/>
         <source>Save all projects in the workspace</source>
         <translation>Alle Projekte, die sich auf dem Arbeitsplatz befinden, speichern</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="536"/>
+        <location filename="../IMainWindow.ui" line="510"/>
         <source>Ctrl+S</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="548"/>
+        <location filename="../IMainWindow.ui" line="522"/>
         <source>Setup Time Zone</source>
         <translation>Zeitzone einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="560"/>
+        <location filename="../IMainWindow.ui" line="534"/>
         <source>Add empty project</source>
         <translation>Leeres Projekt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="575"/>
+        <location filename="../IMainWindow.ui" line="549"/>
         <source>Search Google</source>
         <translation>Mit Google suchen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="587"/>
+        <location filename="../IMainWindow.ui" line="561"/>
         <source>Close all projects</source>
         <translation>Alle Projekte schließen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="590"/>
+        <location filename="../IMainWindow.ui" line="564"/>
         <source>F8</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="602"/>
+        <location filename="../IMainWindow.ui" line="576"/>
         <source>Setup Units</source>
         <translation>Einheiten einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="614"/>
+        <location filename="../IMainWindow.ui" line="588"/>
         <source>Setup Workspace</source>
         <translation>Arbeitsplatz konfigurieren</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="617"/>
+        <location filename="../IMainWindow.ui" line="591"/>
         <source>Setup save on exit.</source>
         <translation>Speichert Einstellungen beim Beenden.</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="629"/>
+        <location filename="../IMainWindow.ui" line="603"/>
         <source>Import Database from QLandkarte</source>
         <translation>Datenbankimport aus QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="632"/>
+        <location filename="../IMainWindow.ui" line="606"/>
         <source>Import QLandkarte GT database</source>
         <translation>QLandkarte GT Datenbank importieren</translation>
     </message>
@@ -7439,22 +7825,30 @@ Keine Lust die Anleitung zu lesen!</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
-        <source>1. Select one or multiple source files.
-2. Select a file name for the target VRT file.
-3. Press "Start" button.
+        <source><ol>
+<li>Select one or multiple source files.</li>
+<li>Select a file name for the target VRT file.</li>
+<li>Press "Start" button.</li>
+</ol>
 
 Tip:
-* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
-* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
-* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
-        <translation>1. Wählen Sie eine oder mehrere Quelldateien.
-2. Geben Sie einen Namen für die VRT Zieldatei an.
-3. Drücken Sie "Start"
+<ul>
+<li>If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.</li>
+<li>Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.</li>
+<li>The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</li>
+</ul></source>
+        <translation><ol>
+<li>Wählen Sie eine oder mehrere Quelldateien.</li>
+<li>Geben Sie einen Namen für die VRT Zieldatei an.</li>
+<li>Drücken Sie "Start".</li>
+</ol>
 
 Tipp:
-* Wenn Sie mehrere Dateien haben, verschieben Sie sie in einnen Unterordner des Kartenpfades. Erstellen Sie die VRT Datei im Kartenpfad.
-* Benützen Sie die erweiterten Optionen, um einen "keine Daten" Wert anzugeben, wenn ihre Quelldateien keinen haben und keinen rechteckigen Bereich abdecken. Gebiete ohne Karte werden dann transparent dargestellt.
-* Mit der "-a_srs" Option können sie eine Projektion/Datum vorgeben, wenn dieses in den Quellen fehlt. Damit werden die Daten aber NICHT neu projiziert. </translation>
+<ul>
+<li>Wenn Sie mehrere Dateien haben, verschieben Sie diese in einen Unterordner des Kartenpfades. Erstellen Sie die VRT Datei im Kartenpfad.</li>
+<li>Benützen Sie die erweiterten Optionen, um einen "keine Daten" Wert anzugeben, wenn ihre Quelldateien keinen haben und keinen rechteckigen Bereich abdecken. Gebiete ohne Karte werden dann transparent dargestellt.</li>
+<li>Mit der "-a_srs" Option können sie eine Projektion/Datum vorgeben, wenn dieses in den Quellen fehlt. Damit werden die Daten aber NICHT neu projiziert.</li>
+</ul></translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
@@ -7491,62 +7885,62 @@ Tipp:
         <translation><b>Neue Linie</b><br/>Erstellen Sie Punkte durch Verschieben des Mauscursors und Drücken der linken Maustaste. Mit der rechten Maustaste beenden Sie den Vorgang.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="289"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="300"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation><b>Punkt löschen</b><br/>Bewegen Sie den Mauscursor nahe an einen Punkt und drücken Sie die linke Maustaste um ihn zu löschen. <br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="297"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="308"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation><b>Punktebereich auswählen</b><br/>Mit der linken Maustaste wählen Sie den ersten Punkt aus. Mit einem erneuten Drücken der linken Maustaste wählen Sie den zweiten Punkt aus und dann wählen Sie eine der Optionen. Zum Abbrechen nutzen Sie die rechte Maustaste.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="305"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="316"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Punkt verschieben</b><br/>Bewegen Sie den Mauscursor nahe an einen Punkt und drücken die linke Maustaste, um ihn mit dem Cursor zu fangen. Verschieben Sie den Punkt mit der Maus. Setzen Sie den Punkt mit einem Linksklick. Zum Abbrechen nutzen Sie die rechte Maustaste.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="313"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Punkt hinzufügen</b><br/>Bewegen Sie den Mauscursor nahe an ein Liniensegment und drücken Sie die linke Maustaste, um einen Punkt hinzuzufügen. Der Punkt wird durch den Cursor gefangen und kann verschoben werden. Setzen Sie den Punkt mit einem Linksklick. Zum Abbrechen nutzen Sie die rechte Maustaste.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="321"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation><b>Kein Routing</b><br/>Alle Punkte werden mittels einer geraden Linie verbunden.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="327"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation><b>Auto Routing</b><br/>Die aktuellen Router Einstellungen erstellen eine Route zwischen Punkten. <b>Hinweis:</b> Der gewählte Router muss schnell routen können. Offline Router können dies gewöhnlich, Online Router nicht.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="343"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation><b>Vektor Routing</b><br/>Verbindet Punkte mit einer Linie einer geladenen Vektorkarte, soweit möglich.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="504"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="515"/>
         <source><b>%1 Metrics</b></source>
         <translation><b>%1maße</b></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="507"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="518"/>
         <source>Distance:</source>
         <translation>Entfernung:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="509"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="520"/>
         <source>Ascent:</source>
         <translation>Anstieg:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="511"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="522"/>
         <source>Descent:</source>
         <translation>Abstieg:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.h" line="135"/>
+        <location filename="../mouse/line/IMouseEditLine.h" line="137"/>
         <source><br/><b>Move the map</b><br/>If you keep the left mouse button pressed and move the mouse, you will move the map.<br/><br/></source>
         <translation><br/><b>Karte verschieben</b><br/>Wenn Sie den linken Mausknopf gedrückt halten und die Maus bewegen, verschieben Sie die Karte.<br/><br/></translation>
     </message>
@@ -7839,6 +8233,21 @@ sein</translation>
         <source>Caution! BRouter is listening on all ports for connections.</source>
         <translation>Vorsicht! BRouter horcht auf allen verfügbaren Schnittstellen.</translation>
     </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="217"/>
+        <source><p><a href="http://brouter.de/brouter/" target="_blank">BRouter</a> © <a href="https://github.com/abrensch/brouter/blob/master/LICENSE" target="_blank">ABrensch, Licence GPLv3</a></p></source>
+        <translation><p><a href="http://brouter.de/brouter/" target="_blank">BRouter</a> © <a href="https://github.com/abrensch/brouter/blob/master/LICENSE" target="_blank">ABrensch, Lizenz GPLv3</a></p></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="227"/>
+        <source><p>Directions Courtesy of <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></source>
+        <translation><p>Mit freundlicher Genehmigung von <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="237"/>
+        <source><p>Routing data <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a> contributors</p></source>
+        <translation><p>Routendaten <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a></p></translation>
+    </message>
 </context>
 <context>
     <name>IRouterBRouterInfo</name>
@@ -8127,7 +8536,7 @@ sein</translation>
         <translation>Sprache</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="131"/>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="118"/>
         <source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path. You can create your own routing data with <b>Tool->Create Routino Database</b>.</source>
         <translation>Um Offline-Routing zu nutzen, müssen Sie einen Pfad zu einer lokalen Routendatenbank angeben. Benutzen Sie dazu den Knopf mit dem blauen Ordner. Sie können mit <b>Werkzeug->Routino Datenbank erstellen</b> eine solche Routendatenbank selber erzeugen.</translation>
     </message>
@@ -8167,13 +8576,13 @@ sein</translation>
         <translation></translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="22"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="25"/>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="63"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="39"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="42"/>
         <source>Select source files:</source>
         <translation>Quelldateien auswählen:</translation>
     </message>
@@ -8197,6 +8606,26 @@ sein</translation>
         <source>File Prefix</source>
         <translation>Dateipräfix</translation>
     </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="133"/>
+        <source><p>To create a Routino routing database you need to download *pbf files from <a href='http://download.geofabrik.de/'>GeoFabrik</a>. The process of creating a Routino database is quite slow and the resulting files quite large. Therefore it's recommended not to download whole continents. Limit your download to those countries you really need. However as Routino can't route over several databases you have to include all countries that ar [...]
+
+<ol>
+<li>Select one or multiple source *.pbf files.</li>
+<li>Select a path for your Routino database.</li>
+<li>Select a prefix. The database will be listed by this prefix.</li>
+<li>Press "Start" button.</li>
+</ol></source>
+        <translation><p>Damit Sie eine Routingdatenbank für Routino erstellen können, müssen Sie *pbf Dateien von <a href='http://download.geofabrik.de/'>GeoFabrik</a> herunterladen. Es dauert sehr lange eine Datenbank für Routino zu erstellen und die erstellten Dateien sind sehr groß. Deswegen ist es nicht empfehlenswert ganze Kontinente herunterzuladen. Allerdings kann Routino nicht über mehrere Datenbanken routen. Deswegen sollten alle Länder, die von einer [...]
+
+<ol>
+<li>Eine oder mehrere *.pbf Dateien auswählen.</li>
+<li>Ein Verzeichnis für die Datenbank angeben.</li>
+<li>Einen Prefix bestimmen. Die Datenbank wird mit diesem Prefix gelistet.</li>
+<li>Den ""Start" Knopf drücken.</li>
+</ol>
+</translation>
+    </message>
 </context>
 <context>
     <name>IScrOptEditLine</name>
@@ -8711,6 +9140,8 @@ sein</translation>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="101"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="118"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="132"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="153"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="170"/>
         <source>...</source>
         <translation></translation>
     </message>
@@ -8740,7 +9171,57 @@ sein</translation>
         <translation>Wegpunkt klonen und um eine bestimmte Entfernung und einen bestimmten Winkel verschieben.</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="176"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="150"/>
+        <source>edit radius of circular area</source>
+        <translation>Den Abstandsradius ändern</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="167"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation>Zwischen Abstandsalarm und Gebietsvermeidung umschalten.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="185"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation>Den Abstandskreis entfernen.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="232"/>
+        <source>TextLabel</source>
+        <translation>Bezeichnung</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptWptRadius</name>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="20"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="49"/>
+        <source>edit radius of circular area</source>
+        <translation>Den Abstabdsradius ändern.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="52"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="66"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="84"/>
+        <source>...</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="63"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation>Zwischen Abstandsalarm und Gebietsvermeidung umschalten.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="81"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation>Den Abstandskreis entfernen.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="128"/>
         <source>TextLabel</source>
         <translation>Bezeichnung</translation>
     </message>
@@ -9578,6 +10059,11 @@ sein</translation>
         <source>short format</source>
         <translation>kurzem Format ausgeben</translation>
     </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="123"/>
+        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
+        <translation><b>Anmerkung:</b> Das Ändern der Einheiten wird bei einigen GUI-Elementen erst nach einem Neustart von QMapShack wirksam.</translation>
+    </message>
 </context>
 <context>
     <name>IToolBarSetupDialog</name>
@@ -9633,18 +10119,18 @@ sein</translation>
 <context>
     <name>IUnit</name>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
         <source>Bad position format. Must be: "[N|S] ddd mm.sss [W|E] ddd mm.sss" or "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
         <translation>Falsches Positionsformat. Muss entweder "[N|S] ddd mm.sss [W|E] ddd mm.sss" oder "[N|S] ddd.ddd [W|E] ddd.ddd" sein.</translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Position values out of bounds. </source>
         <translation>Position außerhalb der gültigen Werte.</translation>
     </message>
@@ -9657,22 +10143,42 @@ sein</translation>
         <translation>Einheiten einrichten...</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="38"/>
+        <location filename="../units/IUnitsSetup.ui" line="36"/>
+        <source>Length unit</source>
+        <translation>Längeneinheit</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="74"/>
         <source>Metric</source>
         <translation>metrisch</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="47"/>
+        <location filename="../units/IUnitsSetup.ui" line="80"/>
+        <source>Slope unit</source>
+        <translation>Steigung</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="92"/>
+        <source>Degrees (°)</source>
+        <translation>Grad (°)</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="105"/>
+        <source>Percent (%)</source>
+        <translation>Prozent (%)</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="133"/>
         <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
         <translation><b>Anmerkung:</b> Das Ändern der Einheiten wird bei einigen GUI-Elementen erst nach einem Neustart von QMapShack wirksam.</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="31"/>
+        <location filename="../units/IUnitsSetup.ui" line="61"/>
         <source>Imperial</source>
         <translation>imperial</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="24"/>
+        <location filename="../units/IUnitsSetup.ui" line="48"/>
         <source>Nautic</source>
         <translation>nautisch</translation>
     </message>
diff --git a/src/locale/qmapshack_es.ts b/src/locale/qmapshack_es.ts
index 0039761..920e67d 100644
--- a/src/locale/qmapshack_es.ts
+++ b/src/locale/qmapshack_es.ts
@@ -1,9708 +1,10213 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="es_ES">
-<context>
-    <name>CAbout</name>
-    <message>
-        <location filename="../CAbout.cpp" line="38"/>
-        <source>%1 (API V%2, expected V%3)</source>
-        <translation>%1 (API V%2, se esperaba V%3)</translation>
-    </message>
-    <message>
-        <location filename="../CAbout.cpp" line="42"/>
-        <source>%1 (API V%2)</source>
-        <translation>%1 (API V%2)</translation>
-    </message>
-    <message>
-        <location filename="../CAbout.cpp" line="49"/>
-        <source>(no DBUS: device detection and handling disabled)</source>
-        <translation>(no DBUS: detección y manipulación de dispositivos desactivados)</translation>
-    </message>
-</context>
-<context>
-    <name>CActivityTrk</name>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="51"/>
-        <source>Foot</source>
-        <translation>A pié</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="59"/>
-        <source>Bicycle</source>
-        <translation>Bicicleta</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="67"/>
-        <source>Motor Bike</source>
-        <translation>Moto</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="75"/>
-        <source>Car</source>
-        <translation>Coche</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="83"/>
-        <source>Cable Car</source>
-        <translation>Teleférico</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="91"/>
-        <source>Swim</source>
-        <translation>Natación</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="99"/>
-        <source>Ship</source>
-        <translation>Barco</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="115"/>
-        <source>Ski/Winter</source>
-        <translation>Esquí</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
-        <source>No Activity</source>
-        <translation>Sin Actividad</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
-        <source>Total</source>
-        <translation>Total</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
-        <source>Ascent:</source>
-        <translation>Ascenso:</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="372"/>
-        <source>Descent:</source>
-        <translation>Descenso:</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="107"/>
-        <source>Aeronautics</source>
-        <translation>Aeronáutica</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
-        <source>Public Transport</source>
-        <translation>Transporte Público</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
-        <source>Distance:</source>
-        <translation>Distancia:</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="396"/>
-        <source>Speed Moving:</source>
-        <translation>Velocidad en movimiento:</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="420"/>
-        <source>Speed Total:</source>
-        <translation>Velocidad Total:</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="444"/>
-        <source>Time Moving:</source>
-        <translation>Tiempo en movimiento:</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="468"/>
-        <source>Time Total:</source>
-        <translation>Tiempo Total:</translation>
-    </message>
-</context>
-<context>
-    <name>CCanvas</name>
-    <message>
-        <location filename="../canvas/CCanvas.cpp" line="61"/>
-        <source>View %1</source>
-        <translation>Vista %1</translation>
-    </message>
-    <message>
-        <location filename="../canvas/CCanvas.cpp" line="705"/>
-        <source>Setup Map Background</source>
-        <translation>Configuracion del Mapa de Fondo</translation>
-    </message>
-</context>
-<context>
-    <name>CColorChooser</name>
-    <message>
-        <location filename="../widgets/CColorChooser.cpp" line="51"/>
-        <source>Esc.</source>
-        <translation>Esc.</translation>
-    </message>
-</context>
-<context>
-    <name>CCommandProcessor</name>
-    <message>
-        <location filename="../setup/CCommandProcessor.cpp" line="31"/>
-        <source>Print debug output to console.</source>
-        <translation>Imprimir salida de depuración en la consola.</translation>
-    </message>
-    <message>
-        <location filename="../setup/CCommandProcessor.cpp" line="34"/>
-        <source>Print debug output to logfile (temp. path).</source>
-        <translation>Imprimir salida de depuración en archivo (carpeta temporal).</translation>
-    </message>
-    <message>
-        <location filename="../setup/CCommandProcessor.cpp" line="37"/>
-        <source>Do not show splash screen.</source>
-        <translation>No mostrar pantalla de bienvenida</translation>
-    </message>
-    <message>
-        <location filename="../setup/CCommandProcessor.cpp" line="40"/>
-        <source>File with QMapShack configuration.</source>
-        <translation>Archivo con la configuración de QMapShack</translation>
-    </message>
-    <message>
-        <location filename="../setup/CCommandProcessor.cpp" line="40"/>
-        <source>file</source>
-        <translation>Archivo</translation>
-    </message>
-    <message>
-        <location filename="../setup/CCommandProcessor.cpp" line="43"/>
-        <source>Files for future use.</source>
-        <translation>Archivos para uso futuro</translation>
-    </message>
-</context>
-<context>
-    <name>CCreateRouteFromWpt</name>
-    <message>
-        <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="68"/>
-        <source>route</source>
-        <translation>Ruta</translation>
-    </message>
-</context>
-<context>
-    <name>CDBFolderLostFound</name>
-    <message>
-        <location filename="../gis/db/CDBFolderLostFound.cpp" line="30"/>
-        <source>All your data grouped by folders.</source>
-        <translation>Todos tus datos agrupados en carpetas.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBFolderLostFound.cpp" line="59"/>
-        <source>Lost & Found (%1)</source>
-        <translation>Objetos Perdidos (%1)</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBFolderLostFound.cpp" line="64"/>
-        <source>Lost & Found</source>
-        <translation>Objetos Perdidos</translation>
-    </message>
-</context>
-<context>
-    <name>CDBFolderMysql</name>
-    <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="33"/>
-        <source>All your data grouped by folders.</source>
-        <translation>Todos tus datos agrupados en carpetas.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="53"/>
-        <source>MySQL Database</source>
-        <translation>Mi base de datos SQL</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="56"/>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="60"/>
-        <source>Server: </source>
-        <translation>Servidor:</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="65"/>
-        <source> (No PW)</source>
-        <translation>(Sin PW)</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="73"/>
-        <source>Error: </source>
-        <translation>Error: </translation>
-    </message>
-</context>
-<context>
-    <name>CDBFolderSqlite</name>
-    <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="30"/>
-        <source>All your data grouped by folders.</source>
-        <translation>Todos tus datos agrupados en carpetas.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="52"/>
-        <source>SQLite Database</source>
-        <translation>Base de Datos SQLite</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="62"/>
-        <source>File: </source>
-        <translation>Archivo:</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="66"/>
-        <source>Error: </source>
-        <translation>Error: </translation>
-    </message>
-</context>
-<context>
-    <name>CDBItem</name>
-    <message>
-        <location filename="../gis/db/CDBItem.cpp" line="91"/>
-        <source>%1 min.</source>
-        <translation>%1 min.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBItem.cpp" line="95"/>
-        <source>%1 h</source>
-        <translation>%1 h</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBItem.cpp" line="99"/>
-        <source>%1 days</source>
-        <translation>%1 dias</translation>
-    </message>
-</context>
-<context>
-    <name>CDBProject</name>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="113"/>
-        <source>Failed to load...</source>
-        <translation>Falló al cargar...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="114"/>
-        <source>Can't load file "%1" . It will be skipped.</source>
-        <translation>No se puede cargar el archivo "%1" . Se omitirá.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="127"/>
-        <source>Project already in database...</source>
-        <translation>Proyecto ya en base de datos ...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="128"/>
-        <source>The project "%1" has already been imported into the database. It will be skipped.</source>
-        <translation>El proyecto "%1" Ya se ha importado a la base de datos. Se omitirá.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="279"/>
-        <source>The item %1 has been changed by %2 (%3). 
-
-To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
-        <translation>El elemento %1 se ha cambiado por %2 (%3). 
-
-Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar tu versión y tomar la de la base de datos</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="285"/>
-        <source>Conflict with database...</source>
-        <translation>Conflicto con la base de datos...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="286"/>
-        <source>Clone && Save</source>
-        <translation>Duplicar y Guardar</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="287"/>
-        <source>Force Save</source>
-        <translation>Forzar guardado</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="288"/>
-        <source>Take remote</source>
-        <translation>Toma remota</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="572"/>
-        <source>Missing folder...</source>
-        <translation>Falta la carpeta</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="573"/>
-        <source>Failed to save project. The folder has been deleted in the database.</source>
-        <translation>Error al guardar el proyecto. La carpeta se ha eliminado de la base de datos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="580"/>
-        <source>Save ...</source>
-        <translation>Guardar...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
-        <source>There was an unexpected database error:
-
-%1</source>
-        <translation>Se produjo un error de base de datos inesperado:
-
-%1</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="760"/>
-        <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
-        <translation>El proyecto '%1' Está a punto de actualizarse desde la base de datos. Sin embargo, hay cambios no guardados.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CDBProject.cpp" line="761"/>
-        <source>Save changes?</source>
-        <translation>¿Guardar cambios?</translation>
-    </message>
-</context>
-<context>
-    <name>CDemList</name>
-    <message>
-        <location filename="../dem/CDemList.cpp" line="195"/>
-        <source>Deactivate</source>
-        <translation>Desactivar</translation>
-    </message>
-    <message>
-        <location filename="../dem/CDemList.cpp" line="195"/>
-        <source>Activate</source>
-        <translation>Activar</translation>
-    </message>
-</context>
-<context>
-    <name>CDemPathSetup</name>
-    <message>
-        <location filename="../dem/CDemPathSetup.cpp" line="41"/>
-        <source>Add or remove paths containing DEM data. There can be multiple files in a path but no sub-path is parsed. Supported formats are: %1</source>
-        <translation>Añadir o quitar rutas que contienen datos DEM. Puede haber múltiples archivos en una ruta, pero no se buscará en los subdirectorios. Los formatos soportados son: %1</translation>
-    </message>
-    <message>
-        <location filename="../dem/CDemPathSetup.cpp" line="56"/>
-        <source>Select DEM file path...</source>
-        <translation>Seleccione la ruta al archivo DEM...</translation>
-    </message>
-</context>
-<context>
-    <name>CDemVRT</name>
-    <message>
-        <location filename="../dem/CDemVRT.cpp" line="44"/>
-        <location filename="../dem/CDemVRT.cpp" line="52"/>
-        <location filename="../dem/CDemVRT.cpp" line="61"/>
-        <location filename="../dem/CDemVRT.cpp" line="90"/>
-        <source>Error...</source>
-        <translation>Error...</translation>
-    </message>
-    <message>
-        <location filename="../dem/CDemVRT.cpp" line="44"/>
-        <source>Failed to load file: %1</source>
-        <translation>Fallo al cargar el archivo: %1</translation>
-    </message>
-    <message>
-        <location filename="../dem/CDemVRT.cpp" line="52"/>
-        <location filename="../dem/CDemVRT.cpp" line="61"/>
-        <source>DEM must have one band with 16bit or 32bit data.</source>
-        <translation>El DEM debe tener una sola banda con datos de 16 o 32 bits.</translation>
-    </message>
-    <message>
-        <location filename="../dem/CDemVRT.cpp" line="90"/>
-        <source>No georeference information found.</source>
-        <translation>No se encontró información de georreferenciación.</translation>
-    </message>
-</context>
-<context>
-    <name>CDetailsGeoCache</name>
-    <message>
-        <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="61"/>
-        <source>none</source>
-        <translation>ninguno</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="61"/>
-        <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="131"/>
-        <source>???</source>
-        <translation>???</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="158"/>
-        <source>Searching for images...</source>
-        <translation>Buscando imagenes...</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="264"/>
-        <source>No images found</source>
-        <translation>No se encontraron imagenes</translation>
-    </message>
-</context>
-<context>
-    <name>CDetailsPrj</name>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="267"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
-        <source>none</source>
-        <translation>ninguna</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="340"/>
-        <source>Build diary...</source>
-        <translation>Creando diario...</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="419"/>
-        <source><h2>Waypoints</h2></source>
-        <translation>Waypoints</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="426"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="452"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="573"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="691"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="721"/>
-        <source>Info</source>
-        <translation>Información</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="427"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="574"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="692"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="722"/>
-        <source>Comment</source>
-        <translation>Comentario</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
-        <source><h2>Tracks</h2></source>
-        <translation>Tracks</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
-        <source>From Start</source>
-        <translation>Desde el inicio</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
-        <source>To Next</source>
-        <translation>Al siguiente</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
-        <source>To End</source>
-        <translation>Al Final</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
-        <source>distance: </source>
-        <translation>Distancia:</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
-        <source>ascent: </source>
-        <translation>Ascenso:</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
-        <source><h2>Areas</h2></source>
-        <translation>Áreas</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
-        <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
-        <translation>Desea ordenar waypoints a lo largo de un track, pero ha desactivado la correlación de track y waypoint. ¿Desea volver a encenderlo?</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
-        <source>Correlation...</source>
-        <translation>Correlación..</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="395"/>
-        <source><b>Summary over all tracks in project</b><br/></source>
-        <translation><b>Resumen de todos los tracks del proyecto</b><br/></translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
-        <source>descent: </source>
-        <translation>descenso:</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
-        <source><h2>Routes</h2></source>
-        <translation><h2>Rutas</h2></translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
-        <source>Edit name...</source>
-        <translation>Editar nombre...</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
-        <source>Enter new project name.</source>
-        <translation>Introducir nuevo nombre de proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
-        <source>Edit keywords...</source>
-        <translation>Editar etiquetas...</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
-        <source>Enter keywords.</source>
-        <translation>Introducir etiquetas.</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="897"/>
-        <source>Print Diary</source>
-        <translation>Imprimir Diario</translation>
-    </message>
-</context>
-<context>
-    <name>CDetailsTrk</name>
-    <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
-        <source>Reduce visible track points</source>
-        <translation>Reducir puntos visibles del track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
-        <source>Change elevation of track points</source>
-        <translation>Cambiar altitud de puntos del track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
-        <source>Change timestamp of track points</source>
-        <translation>Cambiar fecha/hora de puntos del track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
-        <source>Miscellaneous</source>
-        <translation>Diversos</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
-        <source>Color</source>
-        <translation>Color</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
-        <source>Activity</source>
-        <translation>Actividad</translation>
-    </message>
-</context>
-<context>
-    <name>CDetailsWpt</name>
-    <message>
-        <location filename="../gis/wpt/CDetailsWpt.cpp" line="166"/>
-        <source>Enter new proximity range.</source>
-        <translation>Introduzca el nuevo valor de proximidad.</translation>
-    </message>
-</context>
-<context>
-    <name>CDeviceGarmin</name>
-    <message>
-        <location filename="../device/CDeviceGarmin.cpp" line="272"/>
-        <source>Picture%1</source>
-        <translation>foto%1</translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/serialization.cpp" line="1068"/>
-        <source>Unknown</source>
-        <translation>Desconocido</translation>
-    </message>
-</context>
-<context>
-    <name>CDeviceGarminArchive</name>
-    <message>
-        <location filename="../device/CDeviceGarminArchive.cpp" line="30"/>
-        <source>Archive - expand to load</source>
-        <translation>Archivo: expanda para cargar</translation>
-    </message>
-    <message>
-        <location filename="../device/CDeviceGarminArchive.cpp" line="43"/>
-        <source>Archive - loaded</source>
-        <translation>Archivo - cargado</translation>
-    </message>
-</context>
-<context>
-    <name>CElevationDialog</name>
-    <message>
-        <location filename="../helpers/CElevationDialog.cpp" line="92"/>
-        <source>No DEM data found for that point.</source>
-        <translation>No se encontraron datos DEM para ese punto.</translation>
-    </message>
-</context>
-<context>
-    <name>CExportDatabase</name>
-    <message>
-        <location filename="../gis/db/CExportDatabase.cpp" line="90"/>
-        <source>Select export path...</source>
-        <translation>Seleccionar ruta de exportación ...</translation>
-    </message>
-</context>
-<context>
-    <name>CExportDatabaseThread</name>
-    <message>
-        <location filename="../gis/db/CExportDatabaseThread.cpp" line="79"/>
-        <location filename="../gis/db/CExportDatabaseThread.cpp" line="123"/>
-        <source>Create %1</source>
-        <translation>Crear %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CExportDatabaseThread.cpp" line="82"/>
-        <location filename="../gis/db/CExportDatabaseThread.cpp" line="126"/>
-        <source>Failed to create %1</source>
-        <translation>Fallo al crear %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CExportDatabaseThread.cpp" line="88"/>
-        <source>Done!</source>
-        <translation>¡Hecho!</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CExportDatabaseThread.cpp" line="100"/>
-        <source>Abort by user!</source>
-        <translation>¡Cancelado por el usuario!</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CExportDatabaseThread.cpp" line="108"/>
-        <location filename="../gis/db/CExportDatabaseThread.cpp" line="140"/>
-        <location filename="../gis/db/CExportDatabaseThread.cpp" line="165"/>
-        <source>Database Error: %1</source>
-        <translation>Error de base de datos: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CExportDatabaseThread.cpp" line="153"/>
-        <source>Save project as %1</source>
-        <translation>Guardar proyecto como %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CExportDatabaseThread.cpp" line="157"/>
-        <source>Failed!</source>
-        <translation>¡Falló!</translation>
-    </message>
-</context>
-<context>
-    <name>CFilterDeleteExtension</name>
-    <message>
-        <location filename="../gis/trk/filter/CFilterDeleteExtension.cpp" line="57"/>
-        <source>No extension available</source>
-        <translation>Extensión no disponible</translation>
-    </message>
-</context>
-<context>
-    <name>CFilterInterpolateElevation</name>
-    <message>
-        <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="30"/>
-        <source>coarse</source>
-        <translation>grueso</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="31"/>
-        <source>medium</source>
-        <translation>medio</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="32"/>
-        <source>fine</source>
-        <translation>fino</translation>
-    </message>
-</context>
-<context>
-    <name>CFitCrcState</name>
-    <message>
-        <location filename="../gis/fit/decoder/CFitCrcState.cpp" line="32"/>
-        <source>FIT decoding error : invalid CRC.</source>
-        <translation>Error decodificando FIT : CRC inválido.</translation>
-    </message>
-</context>
-<context>
-    <name>CFitDecoder</name>
-    <message>
-        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="132"/>
-        <source>FIT decoding error: unexpected end of file %1.</source>
-        <translation>FIT error de descodificación: final inesperado del archivo %1.</translation>
-    </message>
-</context>
-<context>
-    <name>CFitFieldBuilder</name>
-    <message>
-        <location filename="../gis/fit/decoder/CFitFieldBuilder.cpp" line="77"/>
-        <source>FIT decoding error: unknown base type %1.</source>
-        <translation>Error de descodificación FIT: tipo de base desconocido %1.</translation>
-    </message>
-</context>
-<context>
-    <name>CFitFieldDataState</name>
-    <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
-        <source>Missing field definition for development field.</source>
-        <translation>Falta la definición de campo para el campo de desarrollo.</translation>
-    </message>
-    <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="226"/>
-        <source>FIT decoding error: invalid field def nr %1 while creating dev field profile.</source>
-        <translation>Error de decodificación FIT: campo no válido def nr %1 al crear el perfil de campo dev</translation>
-    </message>
-</context>
-<context>
-    <name>CFitHeaderState</name>
-    <message>
-        <location filename="../gis/fit/decoder/CFitHeaderState.cpp" line="69"/>
-        <source>FIT decoding error: protocol %1 version not supported.</source>
-        <translation>Error de descodificación FIT: la versión del protocolo %1 no es compatible.</translation>
-    </message>
-    <message>
-        <location filename="../gis/fit/decoder/CFitHeaderState.cpp" line="120"/>
-        <source>FIT decoding error: file header signature mismatch. File is not FIT.</source>
-        <translation>Error de descodificación de FIT: falta de coincidencia de firma de encabezado de archivo. El archivo no es FIT.</translation>
-    </message>
-</context>
-<context>
-    <name>CFitProject</name>
-    <message>
-        <location filename="../gis/fit/CFitProject.cpp" line="61"/>
-        <source>Failed to load file %1...</source>
-        <translation>Falló al cargar archivo %1...</translation>
-    </message>
-    <message>
-        <location filename="../gis/fit/CFitProject.cpp" line="93"/>
-        <source>Failed to open FIT file %1.</source>
-        <translation>Falló al cargar archivo FIT %1.</translation>
-    </message>
-</context>
-<context>
-    <name>CFitRecordContentState</name>
-    <message>
-        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="70"/>
-        <source>FIT decoding error: architecture %1 not supported.</source>
-        <translation>Error decodificacion FIT: Arquitectura %1 no soportada</translation>
-    </message>
-    <message>
-        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="110"/>
-        <source>FIT decoding error: invalid offset %1 for state 'record content'</source>
-        <translation>FIT error de decodificación: desplazamiento no válido %1 para el contenido de registro de estado'</translation>
-    </message>
-</context>
-<context>
-    <name>CGarminTyp</name>
-    <message>
-        <location filename="../map/garmin/CGarminTyp.cpp" line="457"/>
-        <location filename="../map/garmin/CGarminTyp.cpp" line="838"/>
-        <source>Warning...</source>
-        <translation>Aviso...</translation>
-    </message>
-    <message>
-        <location filename="../map/garmin/CGarminTyp.cpp" line="457"/>
-        <source>This is a typ file with unknown polygon encoding. Please report!</source>
-        <translation>Este es un fichero TYP con una codificación de polígonos desconocida. ¡Por favor repórtelo!</translation>
-    </message>
-    <message>
-        <location filename="../map/garmin/CGarminTyp.cpp" line="838"/>
-        <source>This is a typ file with unknown polyline encoding. Please report!</source>
-        <translation>Este es un fichero TYP con una codificación de polilíneas desconocida. ¡Por favor repórtelo!</translation>
-    </message>
-</context>
-<context>
-    <name>CGisItemOvlArea</name>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="36"/>
-        <source>thin</source>
-        <translation>fino</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="37"/>
-        <source>normal</source>
-        <translation>normal</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="38"/>
-        <source>wide</source>
-        <translation>ancho</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="39"/>
-        <source>strong</source>
-        <translation>intenso</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="78"/>
-        <source>_Clone</source>
-        <translation>Duplicar</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
-        <source>Area: %1%2</source>
-        <translation>Área: %1%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
-        <source>Changed area shape.</source>
-        <translation>Se cambió la forma del área.</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="459"/>
-        <source>Changed name.</source>
-        <translation>Se cambió el nombre.</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="465"/>
-        <source>Changed border width.</source>
-        <translation>Se cambió la anchura del borde.</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="471"/>
-        <source>Changed fill pattern.</source>
-        <translation>Se cambió el patró de relleno.</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="477"/>
-        <source>Changed opacity.</source>
-        <translation>Se cambió la opacidad.</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="483"/>
-        <source>Changed comment.</source>
-        <translation>Se cambió el comentario.</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="489"/>
-        <source>Changed description.</source>
-        <translation>Se cambió la descripción.</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="495"/>
-        <source>Changed links</source>
-        <translation>Se cambió el enlace</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="506"/>
-        <source>Changed color</source>
-        <translation>Se cambió el color</translation>
-    </message>
-</context>
-<context>
-    <name>CGisItemRte</name>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="66"/>
-        <source>_Clone</source>
-        <translation>_Duplicar</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
-        <source>track</source>
-        <translation>track</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
-        <source>Changed name.</source>
-        <translation>Se cambió el nombre.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
-        <source>Changed comment</source>
-        <translation>Se cambió el comentario</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
-        <source>Changed description</source>
-        <translation>Se cambió la descripción</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
-        <source>Changed links</source>
-        <translation>Se cambió el enlace</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
-        <source>Length: %1 %2</source>
-        <translation>Longitud: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
-        <source>Length: -</source>
-        <translation>Longitud: -</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
-        <source>Time: %1 %2</source>
-        <translation>Tiempo: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
-        <source>Time: -</source>
-        <translation>Tiempo: -</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
-        <source>%1%2 %3, %4%5 %6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
-        <source>Last time routed:<br/>%1</source>
-        <translation>Última vez enrutado:<br/>%1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
-        <source>with %1</source>
-        <translation>con %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
-        <source>Distance: %1 %2</source>
-        <translation>Distancia: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
-        <source>Changed route points.</source>
-        <translation>Puntos de ruta modificados.</translation>
-    </message>
-</context>
-<context>
-    <name>CGisItemTrk</name>
-    <message>
-        <location filename="../gis/fit/serialization.cpp" line="285"/>
-        <source>FIT file %1 contains no GPS data.</source>
-        <translation>Archivo FIT %1 no contiene datos GPS.</translation>
-    </message>
-    <message>
-        <location filename="../gis/tnv/serialization.cpp" line="211"/>
-        <location filename="../gis/tnv/serialization.cpp" line="347"/>
-        <location filename="../gis/tnv/serialization.cpp" line="376"/>
-        <location filename="../gis/tnv/serialization.cpp" line="387"/>
-        <location filename="../gis/tnv/serialization.cpp" line="420"/>
-        <source>Error...</source>
-        <translation>Error...</translation>
-    </message>
-    <message>
-        <location filename="../gis/tnv/serialization.cpp" line="211"/>
-        <location filename="../gis/tnv/serialization.cpp" line="347"/>
-        <source>Failed to open %1.</source>
-        <translation>Fallo al abrir %1.</translation>
-    </message>
-    <message>
-        <location filename="../gis/tnv/serialization.cpp" line="376"/>
-        <location filename="../gis/tnv/serialization.cpp" line="387"/>
-        <source>Only support lon/lat WGS 84 format.</source>
-        <translation>Solamente soporta formato lon/lat WGS84.</translation>
-    </message>
-    <message>
-        <location filename="../gis/tnv/serialization.cpp" line="420"/>
-        <source>Failed to read data.</source>
-        <translation>Fallo al leer los datos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="80"/>
-        <source>_Clone</source>
-        <translation>_Duplicar</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="251"/>
-        <source>Changed trackpoints, sacrificed all previous data.</source>
-        <translation>Se cambiaron los puntos del track, y descartados todos los datos previos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
-        <source>Length: %1 %2</source>
-        <translation>Longitud: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
-        <source>, %1%2 %3, %4%5 %6</source>
-        <translation>, %1%2 %3, %4%5 %6</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
-        <source>Start: %1</source>
-        <translation>Inicio: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
-        <source>Start: -</source>
-        <translation>Inicio: -</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
-        <source>End: %1</source>
-        <translation>Final: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
-        <source>End: -</source>
-        <translation>Final: -</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
-        <source>Points: %1 (%2)</source>
-        <translation>Puntos: %1 (%2)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
-        <source>Invalid elevations!</source>
-        <translation>¡Datos de altitud invalidos!</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
-        <source>Invalid timestamps!</source>
-        <translation>¡Marcas de tiempo no válidas!</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
-        <source>Invalid positions!</source>
-        <translation>¡Posiciones invalidas!</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
-        <source>Activities: %1</source>
-        <translation>Actividades: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
-        <source>Index: %1</source>
-        <translation>Indice: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
-        <source>Index: visible %1, total %2</source>
-        <translation>Indice: visible %1. total %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
-        <source>Ele.: %1 %2</source>
-        <translation>Altitud: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
-        <source> slope: %1%3 (%2%)</source>
-        <translation> pendiente: %1%3 (%2%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
-        <source> speed: %1%2</source>
-        <translation> velocidad: %1%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
-        <source>... and %1 tags not displayed</source>
-        <translation>Y %1 etiquetas no mostradas</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
-        <source>Distance: - (-)</source>
-        <translation>Distancia: - (-)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
-        <source>Moving: - (-)</source>
-        <translation>En movimiento: - (-)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
-        <source>track</source>
-        <translation>track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
-        <source>Hide point %1.</source>
-        <translation>Ocultar punto %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
-        <source>Hide points %1..%2.</source>
-        <translation>Ocultar puntos %1..%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
-        <source> Moving: %1%2 (%3%)</source>
-        <translation> En movimiento: %1%2 (%3%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
-        <source>, %1%2</source>
-        <translation>, %1%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
-        <source> Time: %1%2</source>
-        <translation>Tiempo: %1%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
-        <source>, %1-, %2-</source>
-        <translation>, %1-, %2-</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
-        <source>Time: %1, Speed: %2 %3</source>
-        <translation>Tiempo: %1, Velocidad: %2 %3</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
-        <source>Time: -, Speed: -</source>
-        <translation>Tiempo: -, Velocidad: -</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
-        <source>Moving: %1, Speed: %2 %3</source>
-        <translation>En movimiento: %1, Velocidad: %2 %3</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
-        <source>Moving: -, Speed: -</source>
-        <translation>En movimiento: -, Velocidad: -</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
-        <source>Ascent: - (-)</source>
-        <translation>Ascenso: - (-)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
-        <source>Descent: - (-)</source>
-        <translation>Descenso: - (-)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
-        <source>Ascent: %1%2 (%3%)</source>
-        <translation>Ascenso: %1%2 (%3%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
-        <source> Descent: %1%2 (%3%)</source>
-        <translation> Descenso: %1%2 (%3%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
-        <source>Distance: %1%2 (%3%)</source>
-        <translation>Distancia: %1%2 (%3%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
-        <source>Ascent: -</source>
-        <translation>Ascenso: -</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
-        <source>Descent: -</source>
-        <translation>Descenso: -</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
-        <source>Ascent: %1%2</source>
-        <translation>Ascenso: %1%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
-        <source> Descent: %1%2</source>
-        <translation>Descenso: %1%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
-        <source>Distance: %1%2</source>
-        <translation>Distancia: %1%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
-        <source>Permanently removed points %1..%2</source>
-        <translation>Puntos eliminados definitivamente %1..%2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
-        <source>Show points.</source>
-        <translation>Mostrar puntos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
-        <source>Changed name</source>
-        <translation>Se cambió el nombre</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
-        <source>Changed comment</source>
-        <translation>Se cambió el comentario</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
-        <source>Changed description</source>
-        <translation>Se cambió la descripción</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
-        <source>Changed links</source>
-        <translation>Se cambió el enlace</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
-        <source>Changed elevation of point %1 to %2 %3</source>
-        <translation>Se cambió altitud de los puntos %1 a %2 %3</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
-        <source>Changed activity to '%1' for complete track.</source>
-        <translation>Actividad cambiada a '%1' para todo el track.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
-        <source>Changed activity to '%1' for range(%2..%3).</source>
-        <translation>Actividad cambiada a '%1' para el rango (%2..%3).</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="96"/>
-        <source>Hide points by Douglas Peuker algorithm (%1%2)</source>
-        <translation>Ocultar puntos con algoritmo Douglas Peuker (%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="122"/>
-        <source>Hide points with invalid data.</source>
-        <translation>Ocultar puntos con datos inválidos</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="132"/>
-        <source>Reset all hidden track points to visible</source>
-        <translation>Restaurados todos los puntos a visible</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="162"/>
-        <source>Permanently removed all hidden track points</source>
-        <translation>Elminados definitivamente todos los puntos ocultos del track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="199"/>
-        <source>Smoothed profile with a Median filter of size %1</source>
-        <translation>Pefil suavizado con Mediana de %1 puntos</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="221"/>
-        <source>Added terrain slope from DEM file.</source>
-        <translation>Añadida pendiente del terreno desde archivo DEM</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="243"/>
-        <source>Replaced elevation data with data from DEM files.</source>
-        <translation>Datos de altitud sustituidos por valores de fichero DEM.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="261"/>
-        <source>Replaced elevation data with interpolated values. (M=%1, RMSErr=%2)</source>
-        <translation>Reemplazados datos de altitud con valores interpolados. (M=%1, RMSErr=%2)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="277"/>
-        <source>Offset elevation data by %1%2.</source>
-        <translation>altitud desplazada %1%2.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="290"/>
-        <source>Changed start of track to %1.</source>
-        <translation>Cambiado el inicio de track a %1.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="303"/>
-        <source>Remove timestamps.</source>
-        <translation>Eliminadas las marcas de tiempo.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="320"/>
-        <source>Set artificial timestamps with delta of %1 sec.</source>
-        <translation>Marcas de tiempo ficticias con incremento de %1 sec.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="346"/>
-        <source>Changed speed to %1%2.</source>
-        <translation>Velocidad modificada a %1%2.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="365"/>
-        <source>%1 (Segment %2)</source>
-        <translation>%1 (Segmento %2)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="383"/>
-        <source>Removed extension %1 from all Track Points</source>
-        <translation>Eliminada extensión %1 a todos los puntos del track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="394"/>
-        <source>Converted subpoints from routing to track points</source>
-        <translation>Convertidos puntos secundarios del ruteo a puntos de track</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/converter.cpp" line="195"/>
-        <source>Copy flag information from QLandkarte GT track</source>
-        <translation>Copiar información del encabezado del track de QLandkarte GT</translation>
-    </message>
-</context>
-<context>
-    <name>CGisItemWpt</name>
-    <message>
-        <location filename="../gis/gpx/serialization.cpp" line="609"/>
-        <source>Archived</source>
-        <translation>Archivado</translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/serialization.cpp" line="613"/>
-        <source>Available</source>
-        <translation>Disponible</translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/serialization.cpp" line="617"/>
-        <source>Not Available</source>
-        <translation>No Disponible</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
-        <source>_Clone</source>
-        <translation>Duplicar</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
-        <source>Elevation: %1 %2</source>
-        <translation>Altitud: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
-        <source>Proximity: %1 %2</source>
-        <translation>Proximidad: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
-        <source>Changed name</source>
-        <translation>Se cambió el nombre</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
-        <source>Changed position</source>
-        <translation>Se cambió la posición</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
-        <source>Changed elevation</source>
-        <translation>Se cambió la altitud</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
-        <source>Changed proximity</source>
-        <translation>Se cambió la proximidad</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
-        <source>Changed icon</source>
-        <translation>Se cambió el icono</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
-        <source>Changed comment</source>
-        <translation>Se cambió el comentario</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
-        <source>Changed description</source>
-        <translation>Se cambió la descripción</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
-        <source>Changed links</source>
-        <translation>Se cambió el enlace</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
-        <source>Changed images</source>
-        <translation>Se cambió la imagen</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
-        <source>Add image</source>
-        <translation>Añadir Imagen</translation>
-    </message>
-</context>
-<context>
-    <name>CGisListDB</name>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="84"/>
-        <source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
-        <translation>Debido a cambios en el sistema de base de datos QMapShack olvidó el nombre de archivo de su base de datos  '%1'. Debe seleccionarlo de nuevo en el siguiente paso.</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="85"/>
-        <source>Select database file.</source>
-        <translation>Seleccionar archivo de base de datos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="118"/>
-        <source>Add Database</source>
-        <translation>Añadir Base de Datos</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="121"/>
-        <source>Add Folder</source>
-        <translation>Añadir carpeta</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="122"/>
-        <source>Rename Folder</source>
-        <translation>Renombrar carpeta</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="123"/>
-        <source>Copy Folder</source>
-        <translation>Copiar carpeta</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="124"/>
-        <source>Move Folder</source>
-        <translation>Mover carpeta</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="125"/>
-        <source>Delete Folder</source>
-        <translation>Eliminar Carpeta</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="127"/>
-        <source>Import from Files...</source>
-        <translation>Importar desde archivos..</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="128"/>
-        <source>Export to GPX...</source>
-        <translation>Exportar a GPX...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="131"/>
-        <location filename="../gis/CGisListDB.cpp" line="147"/>
-        <source>Delete Item</source>
-        <translation>Eliminar Elemento</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="135"/>
-        <source>Search Database</source>
-        <translation>Buscar base de datos</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="136"/>
-        <source>Sync. with Database</source>
-        <translation>Sincronizar con base de datos</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="137"/>
-        <source>Remove Database</source>
-        <translation>Quitar Base de Datos</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="144"/>
-        <source>Empty</source>
-        <translation>Vacío</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="444"/>
-        <source>Remove database...</source>
-        <translation>Quitar Base de Datos...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="444"/>
-        <source>Do you really want to remove '%1' from the list?</source>
-        <translation>¿Seguro que quiere eliminar '%1' de la lista?</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="508"/>
-        <source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
-        <translation>¿Está seguro que quiere borrar las carpetas seleccionadas y sus subcarpetas de la base de datos?</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="676"/>
-        <source>Bad operation....</source>
-        <translation>Mala operación...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="676"/>
-        <source>The target folder is a subfolder of the one to move. This will not work.</source>
-        <translation>La carpeta de destino es una subcarpeta de la que se va a mover. Esto no funcionará.</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="735"/>
-        <source>Folder name...</source>
-        <translation>Nombre de carpeta...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="735"/>
-        <source>Rename folder:</source>
-        <translation>Renombrar carpeta:</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="864"/>
-        <source>Are you sure you want to delete '%1' from folder '%2'?</source>
-        <translation>¿Desea realmente eleiminar '%1' de la carpeta '%2'?</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="865"/>
-        <source>Delete...</source>
-        <translation>Borrar...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="1055"/>
-        <source>Import GIS Data...</source>
-        <translation>Importar datos GIS...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="508"/>
-        <source>Delete database folder...</source>
-        <translation>Eliminar Carpeta de la Base de Datos...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="756"/>
-        <location filename="../gis/CGisListDB.cpp" line="777"/>
-        <source>Remove items...</source>
-        <translation>Eliminar elementos...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="756"/>
-        <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
-        <translation>¿Desea realmente eliminar todos los elementos de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListDB.cpp" line="777"/>
-        <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
-        <translation>¿Desea realmente eliminar todos los elementos.seleccionados de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
-    </message>
-</context>
-<context>
-    <name>CGisListWks</name>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="117"/>
-        <source>Save</source>
-        <translation>Guardar</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="101"/>
-        <source>Edit..</source>
-        <translation>Editar..</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="126"/>
-        <source>Close</source>
-        <translation>Cerrar</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
-        <source>Update Project on Device</source>
-        <translation>Actualizar Proyecto en Dsipositivo</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="149"/>
-        <source>Edit...</source>
-        <translation>Editar...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="102"/>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
-        <source>Copy to...</source>
-        <translation>Copiar a...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="113"/>
-        <source>Autom. Save</source>
-        <translation>Guardado Automático</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="118"/>
-        <source>Save as...</source>
-        <translation>Guardar como...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="159"/>
-        <source>Copy Track with Waypoints</source>
-        <translation>Copiar tracks y waypoints</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="167"/>
-        <source>Show Bubble</source>
-        <translation>Mostrar burbuja de texto</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="169"/>
-        <source>Move Waypoint</source>
-        <translation>Mover Waypoint</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="170"/>
-        <source>Proj. Waypoint...</source>
-        <translation>Proyectar Waypoint...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="178"/>
-        <source>Route Instructions</source>
-        <translation>Instrucciones de ruta</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="180"/>
-        <source>Calculate Route</source>
-        <translation>Calcular ruta</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="181"/>
-        <source>Reset Route</source>
-        <translation>Recalcular ruta</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
-        <source>Edit Route</source>
-        <translation>Editar ruta</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="183"/>
-        <source>Convert to Track</source>
-        <translation>Convertir en track</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="199"/>
-        <source>Create Route</source>
-        <translation>Crear ruta</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="200"/>
-        <source>Change Icon (sel. waypt. only)</source>
-        <translation>Cambiar icono</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="158"/>
-        <source>Set Track Activity</source>
-        <translation>Establecer actividad del track</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="634"/>
-        <source>Drop items...</source>
-        <translation>Descartar elementos</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="659"/>
-        <location filename="../gis/CGisListWks.cpp" line="1691"/>
-        <location filename="../gis/CGisListWks.cpp" line="1729"/>
-        <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
-        <translation><b>Actualizar dispositivos</b><p>Actualizar %1<br/>Por favor espere...</p></translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
-        <source>Delete project...</source>
-        <translation>Eliminar Proyecto...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
-        <source>Do you really want to delete %1?</source>
-        <translation>¿Desea realmente eliminar %1?</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
-        <source>Track Profile</source>
-        <translation>Perfil del Track</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
-        <source>Show on Map</source>
-        <translation>Mostrar en el mapa</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
-        <source>Hide from Map</source>
-        <translation>Ocultar en el mapa</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="109"/>
-        <source>Sort by Time</source>
-        <translation>Ordenar por fecha</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="110"/>
-        <source>Sort by Name</source>
-        <translation>Ordenar por nombre</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="119"/>
-        <source>Save as GPX 1.1 w/o ext...</source>
-        <translation>Guardar como GPX 1.1 w/o ext...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="122"/>
-        <source>Send to Devices</source>
-        <translation>Enviar a dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
-        <source>Sync. with Database</source>
-        <translation>Sincronizar con base de datos</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="154"/>
-        <source>Select Range</source>
-        <translation>Seleccionar Rango</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="155"/>
-        <source>Edit Track Points</source>
-        <translation>Editar Puntos del Track</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="156"/>
-        <source>Reverse Track</source>
-        <translation>Invertir Track</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="157"/>
-        <source>Combine Tracks</source>
-        <translation>Combinar Tracks</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="192"/>
-        <source>Edit Area Points</source>
-        <translation>Editar Puntos del Área</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
-        <source>Delete</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="785"/>
-        <source>Saving workspace. Please wait.</source>
-        <translation>Guardando espacio de trabajo. Por favor espere.</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="831"/>
-        <source>Loading workspace. Please wait.</source>
-        <translation>Cargando espacio de trabajo. Por favor espere.</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
-        <source>Close all projects...</source>
-        <translation>Cerrar todos los proyectos...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
-        <source>This will remove all projects from the workspace.</source>
-        <translation>Esto eliminará todos los proyectos del espacio de trabajo.</translation>
-    </message>
-</context>
-<context>
-    <name>CGisWidget</name>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
-        <source>Load project...</source>
-        <translation>Cargar proyecto</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
-        <source>The project "%1" is already in the workspace.</source>
-        <translation>El proyecto "%1" ya está en el area de trabajo.</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="559"/>
-        <source>Copy items...</source>
-        <translation>Copia elementos....</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="578"/>
-        <source>Change waypoint symbols.</source>
-        <translation>Cambiar símbolos de waypoint</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
-        <source>Cut Track...</source>
-        <translation>Dividir Track...</translation>
-    </message>
-    <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
-        <source>Do you want to delete the original track?</source>
-        <translation>¿Desea borrar el track original?</translation>
-    </message>
-</context>
-<context>
-    <name>CGpxProject</name>
-    <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
-        <source>Failed to load file %1...</source>
-        <translation>Fallo al cargar archivo %1...</translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
-        <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="125"/>
-        <source>Failed to read: %1
-line %2, column %3:
- %4</source>
-        <translation>Fallo al leer: %1
-línea %2, columna %3.
- %4</translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="133"/>
-        <source>Not a GPX file: %1</source>
-        <translation>No es un archivo GPX: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="268"/>
-        <source>File exists ...</source>
-        <translation>El archivo ya existe ...</translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="269"/>
-        <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
-        <translation>El archivo ya existe y no lo ha creado QMapShack. Si pulsa 'sí' todos los datos de este archivo se perderán. Incluso si el archivo contiene datos GPX y QMapShack lo ha leído, QMapShack podría no ser capaz de leer y almacenar todos los elementos en el archivo, y aquellos que no haya leído se perderán. Se le recomienda usar otro archivo distinto. <b>¿Quiere realmente sobrescribir el archivo</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="386"/>
-        <source>Failed to create file '%1'</source>
-        <translation>Fallo al crear el archivo '%1'</translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="396"/>
-        <source>Failed to write file '%1'</source>
-        <translation>Fallo al escribir en el archivo '%1'</translation>
-    </message>
-    <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="408"/>
-        <source>Saving GIS data failed...</source>
-        <translation>Fallo guardando datos GIS...</translation>
-    </message>
-</context>
-<context>
-    <name>CGrid</name>
-    <message>
-        <location filename="../grid/CGrid.cpp" line="61"/>
-        <source>%1 %2 </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../grid/CGrid.cpp" line="65"/>
-        <source>%1%2%5 %3%4%5 </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../grid/CGrid.cpp" line="72"/>
-        <source>%1m, %2m </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../grid/CGrid.cpp" line="76"/>
-        <source>N %1m, E %2m </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CHistoryListWidget</name>
-    <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="65"/>
-        <source> by %1</source>
-        <translation>de %1</translation>
-    </message>
-    <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
-        <source>Cut history before</source>
-        <translation>Cortar historial antes</translation>
-    </message>
-    <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="38"/>
-        <source>Cut history after</source>
-        <translation>Cortar historial despues</translation>
-    </message>
-    <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="155"/>
-        <source>History removal</source>
-        <translation>Borrar historial</translation>
-    </message>
-    <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
-        <source>The removal is permanent and cannot be undone. <b>Do you really want to delete history before this step?</b></source>
-        <translation>El borrado es permanente y no se puede deshacer. <b>¿Esta seguro de querer borrar el historial anterior a este paso?</b></translation>
-    </message>
-</context>
-<context>
-    <name>CImportDatabase</name>
-    <message>
-        <location filename="../tool/CImportDatabase.cpp" line="29"/>
-        <source>Import QLandkarte Database</source>
-        <translation>Importar Base de Datos de QLandKarteGT</translation>
-    </message>
-    <message>
-        <location filename="../tool/CImportDatabase.cpp" line="75"/>
-        <source>Select source database...</source>
-        <translation>Seleccionar origen de base de datos...</translation>
-    </message>
-    <message>
-        <location filename="../tool/CImportDatabase.cpp" line="97"/>
-        <source>Select target database...</source>
-        <translation>Seleecionar destino de base de datos...</translation>
-    </message>
-</context>
-<context>
-    <name>CKnownExtension</name>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
-        <source>Air Temperature</source>
-        <translation>Temperatura del aire</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
-        <source>Water Temperature</source>
-        <translation>Temperatura del agua</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
-        <source>Depth</source>
-        <translation>Profundidad</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
-        <source>Heart Rate</source>
-        <translation>Ritmo cardiaco</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="93"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="112"/>
-        <source>Cadence</source>
-        <translation>Cadencia</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
-        <source>Speed</source>
-        <translation>Velocidad</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
-        <source>Acceleration</source>
-        <translation>Aceleración</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
-        <source>Course</source>
-        <translation>Rumbo</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
-        <source>Distance</source>
-        <translation>Distancia</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
-        <source>Energy</source>
-        <translation>Energía</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
-        <source>Sea Level Pressure</source>
-        <translation>Presión a nivel del mar</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
-        <source>Speed (vertical)</source>
-        <translation>Velocidad vertical</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
-        <source>Slope*</source>
-        <translation>Pendiente</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
-        <source>Speed*</source>
-        <translation>Velocidad</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
-        <source>Elevation</source>
-        <translation>Altitud</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
-        <source>Progress</source>
-        <translation>Progreso</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
-        <source>Terrain slope</source>
-        <translation>Pendiente del terreno</translation>
-    </message>
-</context>
-<context>
-    <name>CLostFoundProject</name>
-    <message>
-        <location filename="../gis/db/CLostFoundProject.cpp" line="39"/>
-        <source>Lost & Found</source>
-        <translation>Objetos Perdidos</translation>
-    </message>
-</context>
-<context>
-    <name>CMainWindow</name>
-    <message>
-        <location filename="../CMainWindow.cpp" line="813"/>
-        <source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
-        <translation>Usar <b>Menu->ver->Añadir vista de mapa</b> para abrir nueva vista, o <b>Menu->archivo->cargar vista de mapa</b> para restaurar una vista guardada. Or click <a href='newview'>here</a>.</translation>
-    </message>
-    <message>
-        <location filename="../CMainWindow.cpp" line="941"/>
-        <source>Ele: %1%2</source>
-        <translation>Alt: %1%2</translation>
-    </message>
-    <message>
-        <location filename="../CMainWindow.cpp" line="953"/>
-        <source>Slope: %1%2</source>
-        <translation>Pendiente: %1%2</translation>
-    </message>
-    <message>
-        <location filename="../CMainWindow.cpp" line="969"/>
-        <source>[Grid: %1]</source>
-        <translation>[Malla: %1]</translation>
-    </message>
-    <message>
-        <location filename="../CMainWindow.cpp" line="1110"/>
-        <source>Load GIS Data...</source>
-        <translation>Cargar Datos GIS...</translation>
-    </message>
-    <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
-        <source>Select output file</source>
-        <translation>Seleccionar archivo de salida</translation>
-    </message>
-    <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
-        <location filename="../CMainWindow.cpp" line="1170"/>
-        <source>QMapShack View (*.view)</source>
-        <translation>Vista de QMapShack (*.view)</translation>
-    </message>
-    <message>
-        <location filename="../CMainWindow.cpp" line="1170"/>
-        <source>Select file to load</source>
-        <translation>Seleccionar archivo a cargar</translation>
-    </message>
-    <message>
-        <location filename="../CMainWindow.cpp" line="1481"/>
-        <source>Fatal...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../CMainWindow.cpp" line="1482"/>
-        <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
-        <translation>QMapShack detectó una biblioteca Proj4 mal instalada. Las tablas de traducción para las proyecciones EPSG usualmente almacenadas en / usr / share / proj faltan. Póngase en contacto con el responsable del paquete de su distribución para solucionarlo.</translation>
-    </message>
-</context>
-<context>
-    <name>CMapDraw</name>
-    <message>
-        <location filename="../map/CMapDraw.cpp" line="457"/>
-        <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
-
-If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
-        <translation>No hay mapas en este momento. QMapShack no es divertido sin mapas. Puede instalar mapas al presionar la tecla Ayuda! ¡Quiero mapas! En el botón ' mapas ',o puede presionar la tecla F1 para abrir la documentación en línea que le indica cómo usar QMapShack.
-
-Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas listos para descargar e instalar requiere un buen servidor. Y esto no es un servicio gratuito. El proyecto carece de dinero. Además, los datos de mapa y DEM tienen un copyright. Por lo tanto, el titular de los derechos de autor tiene que ser preguntado antes de empaquetar los datos. Esto no es tan fácil como podría sonar y para algunos datos que tiene que pagar royalties. El proyecto simplemente carece de recursos [...]
-    </message>
-</context>
-<context>
-    <name>CMapIMG</name>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="146"/>
-        <source>Failed ...</source>
-        <translation>Falló ...</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="175"/>
-        <source>Unspecified</source>
-        <translation>No especificado</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="176"/>
-        <source>French</source>
-        <translation>Francés</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="177"/>
-        <source>German</source>
-        <translation>Alemán</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="178"/>
-        <source>Dutch</source>
-        <translation>Holandés</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="179"/>
-        <source>English</source>
-        <translation>Inglés</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="180"/>
-        <source>Italian</source>
-        <translation>Italiano</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="181"/>
-        <source>Finnish</source>
-        <translation>Finés</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="182"/>
-        <source>Swedish</source>
-        <translation>Sueco</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="183"/>
-        <source>Spanish</source>
-        <translation>Español</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="184"/>
-        <source>Basque</source>
-        <translation>Euskera</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="185"/>
-        <source>Catalan</source>
-        <translation>Catalán</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="186"/>
-        <source>Galician</source>
-        <translation>Gallego</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="187"/>
-        <source>Welsh</source>
-        <translation>Galés</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="188"/>
-        <source>Gaelic</source>
-        <translation>Gaélico</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="189"/>
-        <source>Danish</source>
-        <translation>Danés</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="190"/>
-        <source>Norwegian</source>
-        <translation>Noruego</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="191"/>
-        <source>Portuguese</source>
-        <translation>Portugués</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="192"/>
-        <source>Slovak</source>
-        <translation>Eslovaco</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="193"/>
-        <source>Czech</source>
-        <translation>Checo</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="194"/>
-        <source>Croatian</source>
-        <translation>Croata</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="195"/>
-        <source>Hungarian</source>
-        <translation>Húngaro</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="196"/>
-        <source>Polish</source>
-        <translation>Polaco</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="197"/>
-        <source>Turkish</source>
-        <translation>Turco</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="198"/>
-        <source>Greek</source>
-        <translation>Griego</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="199"/>
-        <source>Slovenian</source>
-        <translation>Esloveno</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="200"/>
-        <source>Russian</source>
-        <translation>Ruso</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="201"/>
-        <source>Estonian</source>
-        <translation>Estonio</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="202"/>
-        <source>Latvian</source>
-        <translation>Letón</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="203"/>
-        <source>Romanian</source>
-        <translation>Rumano</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="204"/>
-        <source>Albanian</source>
-        <translation>Albanés</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="205"/>
-        <source>Bosnian</source>
-        <translation>Bosnio</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="206"/>
-        <source>Lithuanian</source>
-        <translation>Lituano</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="207"/>
-        <source>Serbian</source>
-        <translation>Serbio</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="208"/>
-        <source>Macedonian</source>
-        <translation>Macedonio</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="209"/>
-        <source>Bulgarian</source>
-        <translation>Búlgaro</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="266"/>
-        <source>Major highway</source>
-        <translation>Autovía Primaria</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="267"/>
-        <source>Principal highway</source>
-        <translation>Autovía secundaria</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="268"/>
-        <source>Other highway</source>
-        <translation>Otras autovías</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="269"/>
-        <source>Arterial road</source>
-        <translation>Carretera principal</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="270"/>
-        <source>Collector road</source>
-        <translation>Carretera secundaria</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="271"/>
-        <source>Residential street</source>
-        <translation>Calle residencial</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="272"/>
-        <source>Alley/Private road</source>
-        <translation>Callejón/Carretera privada</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="273"/>
-        <source>Highway ramp, low speed</source>
-        <translation>Acceso a autopista, baja velocidad</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="274"/>
-        <source>Highway ramp, high speed</source>
-        <translation>Acceso a autopista, alta velocidad</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="275"/>
-        <source>Unpaved road</source>
-        <translation>Carretera sin asfaltar</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="276"/>
-        <source>Major highway connector</source>
-        <translation>Conexión con autovía principal</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="277"/>
-        <source>Roundabout</source>
-        <translation>Rotonda</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="278"/>
-        <source>Railroad</source>
-        <translation>Ferrocarril</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="279"/>
-        <source>Shoreline</source>
-        <translation>Línea de costa</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="280"/>
-        <source>Trail</source>
-        <translation>Sendero</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="281"/>
-        <source>Stream</source>
-        <translation>Arroyo</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="282"/>
-        <source>Time zone</source>
-        <translation>Zona horaria</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="283"/>
-        <location filename="../map/CMapIMG.cpp" line="284"/>
-        <source>Ferry</source>
-        <translation>Ferry</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="285"/>
-        <source>State/province border</source>
-        <translation>Frontera de estado/provincia</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="286"/>
-        <source>County/parish border</source>
-        <translation>Frontera de condado/término municipal</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="287"/>
-        <source>International border</source>
-        <translation>Frontera internacional</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="288"/>
-        <source>River</source>
-        <translation>Río</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="289"/>
-        <source>Minor land contour</source>
-        <translation>Curva altimétrica menor</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="290"/>
-        <source>Intermediate land contour</source>
-        <translation>Curva altimétrica intermedia</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="291"/>
-        <source>Major land contour</source>
-        <translation>Curva altimétrica principal</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="292"/>
-        <source>Minor depth contour</source>
-        <translation>Curva batimétrica menor</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="293"/>
-        <source>Intermediate depth contour</source>
-        <translation>Curva batimétrica intermedia</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="294"/>
-        <source>Major depth contour</source>
-        <translation>Curva batimétrica principal</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="295"/>
-        <source>Intermittent stream</source>
-        <translation>Curso intermitente</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="296"/>
-        <location filename="../map/CMapIMG.cpp" line="378"/>
-        <source>Airport runway</source>
-        <translation>Pista de aterrizaje</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="297"/>
-        <source>Pipeline</source>
-        <translation>Tubería</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="298"/>
-        <source>Powerline</source>
-        <translation>Línea eléctrica</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="299"/>
-        <source>Marine boundary</source>
-        <translation>Límite marítimo</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="300"/>
-        <source>Hazard boundary</source>
-        <translation>Límite de peligro</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="365"/>
-        <source>Large urban area (&gt;200K)</source>
-        <translation>Área urbana grande (&gt;200K)</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="366"/>
-        <source>Small urban area (&lt;200K)</source>
-        <translation>Área urbana pequeña (&lt;200K)</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="367"/>
-        <source>Rural housing area</source>
-        <translation>Área de alojamienos rurales</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="368"/>
-        <source>Military base</source>
-        <translation>Base militar</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="369"/>
-        <source>Parking lot</source>
-        <translation>Aparcamiento</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="370"/>
-        <source>Parking garage</source>
-        <translation>Garaje</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="371"/>
-        <source>Airport</source>
-        <translation>Aeropuerto</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="372"/>
-        <source>Shopping center</source>
-        <translation>Centro comercial</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="373"/>
-        <source>Marina</source>
-        <translation>Puerto deportivo</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="374"/>
-        <source>University/College</source>
-        <translation>Universidad/Facultad</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="375"/>
-        <source>Hospital</source>
-        <translation>Hospital</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="376"/>
-        <source>Industrial complex</source>
-        <translation>Complejo industrial</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="377"/>
-        <source>Reservation</source>
-        <translation>Reserva natural</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="379"/>
-        <source>Man-made area</source>
-        <translation>Área creada por el hombre</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="380"/>
-        <source>Sports complex</source>
-        <translation>Complejo deportivo</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="381"/>
-        <source>Golf course</source>
-        <translation>Recorrido de golf</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="382"/>
-        <source>Cemetery</source>
-        <translation>Cementerio</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="383"/>
-        <location filename="../map/CMapIMG.cpp" line="384"/>
-        <location filename="../map/CMapIMG.cpp" line="385"/>
-        <source>National park</source>
-        <translation>Parque nacional</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="386"/>
-        <source>City park</source>
-        <translation>Parque urbano</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="387"/>
-        <location filename="../map/CMapIMG.cpp" line="388"/>
-        <location filename="../map/CMapIMG.cpp" line="389"/>
-        <source>State park</source>
-        <translation>Parque regional</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="390"/>
-        <source>Forest</source>
-        <translation>Bosque</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="391"/>
-        <source>Ocean</source>
-        <translation>Océano</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="392"/>
-        <location filename="../map/CMapIMG.cpp" line="394"/>
-        <location filename="../map/CMapIMG.cpp" line="404"/>
-        <source>Blue (unknown)</source>
-        <translation>Azul (desconocido)</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="393"/>
-        <source>Sea</source>
-        <translation>Mar</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="395"/>
-        <location filename="../map/CMapIMG.cpp" line="396"/>
-        <location filename="../map/CMapIMG.cpp" line="403"/>
-        <source>Large lake</source>
-        <translation>Lago grande</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="397"/>
-        <location filename="../map/CMapIMG.cpp" line="398"/>
-        <source>Medium lake</source>
-        <translation>Lago mediano</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="399"/>
-        <location filename="../map/CMapIMG.cpp" line="400"/>
-        <source>Small lake</source>
-        <translation>Lago pequeño</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="401"/>
-        <location filename="../map/CMapIMG.cpp" line="402"/>
-        <source>Major lake</source>
-        <translation>Lago principal</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="405"/>
-        <source>Major River</source>
-        <translation>Río Principal</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="406"/>
-        <source>Large River</source>
-        <translation>Río Grande</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="407"/>
-        <source>Medium River</source>
-        <translation>Río Mediano</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="408"/>
-        <source>Small River</source>
-        <translation>Río Pequeño</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="411"/>
-        <source>Intermittent water</source>
-        <translation>Agua intermitente</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="412"/>
-        <source>Wetland/Swamp</source>
-        <translation>Marisma/Ciénaga</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="413"/>
-        <source>Glacier</source>
-        <translation>Glaciar</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="414"/>
-        <source>Orchard/Plantation</source>
-        <translation>Invernadero/Plantación</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="415"/>
-        <source>Scrub</source>
-        <translation>Monte bajo</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="416"/>
-        <source>Tundra</source>
-        <translation>Tundra</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="417"/>
-        <source>Flat</source>
-        <translation>Llanura</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="418"/>
-        <source>???</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="432"/>
-        <source>Read external type file...</source>
-        <translation>Cargar archivo TYP externo...</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="432"/>
-        <source>Failed to read type file: %1
-Fall back to internal types.</source>
-        <translation>Fallo al cargar archivo TYP: %1
-Se vuelve al TYP interno.</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="474"/>
-        <source>Failed to read: </source>
-        <translation>Fallo al leer: </translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="517"/>
-        <source>Failed to open: </source>
-        <translation>Fallo al abrir: </translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="541"/>
-        <location filename="../map/CMapIMG.cpp" line="545"/>
-        <source>Bad file format: </source>
-        <translation>Formato de archivo incorrecto: </translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="634"/>
-        <source>Failed to read file structure: </source>
-        <translation>Fallo al leer la estructura del archivo: </translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="669"/>
-        <source>Loading %1</source>
-        <translation>Cargando %1</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="675"/>
-        <source>User abort: </source>
-        <translation>Cancelado por el usuario: </translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="678"/>
-        <source>File is NT format. QMapShack is unable to read map files with NT format: </source>
-        <translation>El archivo está en formato NT. QMapShack no puede leer archivos en formato NT: </translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="769"/>
-        <source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
-        <translation>El archivo contiene datos bloqueados y/o encriptados. Garmin no desea que utilice este archivo con ningún otro software que el suministrado por ellos.</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="2388"/>
-        <location filename="../map/CMapIMG.cpp" line="2394"/>
-        <location filename="../map/CMapIMG.cpp" line="2398"/>
-        <source>Point of Interest</source>
-        <translation>Punto de Interés</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="2484"/>
-        <source>Unknown</source>
-        <translation>Desconocido</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapIMG.cpp" line="2526"/>
-        <location filename="../map/CMapIMG.cpp" line="2534"/>
-        <location filename="../map/CMapIMG.cpp" line="2541"/>
-        <source>Area</source>
-        <translation>Área</translation>
-    </message>
-</context>
-<context>
-    <name>CMapList</name>
-    <message>
-        <location filename="../map/CMapList.cpp" line="202"/>
-        <source>Deactivate</source>
-        <translation>Desactivar</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapList.cpp" line="202"/>
-        <source>Activate</source>
-        <translation>Activar</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapList.cpp" line="227"/>
-        <source>Where do you want to store maps?</source>
-        <translation>¿Dónde desea almacenar mapas?</translation>
-    </message>
-</context>
-<context>
-    <name>CMapMAP</name>
-    <message>
-        <location filename="../map/CMapMAP.cpp" line="46"/>
-        <source>Failed ...</source>
-        <translation>Falló...</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapMAP.cpp" line="63"/>
-        <source>Failed to open: </source>
-        <translation>Fallo al abrir: </translation>
-    </message>
-    <message>
-        <location filename="../map/CMapMAP.cpp" line="73"/>
-        <source>Bad file format: </source>
-        <translation>Formato de archivo incorrecto: </translation>
-    </message>
-</context>
-<context>
-    <name>CMapPathSetup</name>
-    <message>
-        <location filename="../map/CMapPathSetup.cpp" line="47"/>
-        <source>Add or remove paths containing maps. There can be multiple maps in a path but no sub-path is parsed. Supported formats are: %1</source>
-        <translation>Añada o elimine rutas que contengan mapas. Puede haber múltiples mapas en una ruta, pero no se buscará en subdirectorios. Los formatos soportados son: %1</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapPathSetup.cpp" line="62"/>
-        <source>Select map path...</source>
-        <translation>Selecciona la ruta del mapa...</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapPathSetup.cpp" line="81"/>
-        <source>Select root path...</source>
-        <translation>Seleccionar carpeta raiz...</translation>
-    </message>
-</context>
-<context>
-    <name>CMapPropSetup</name>
-    <message>
-        <location filename="../map/CMapPropSetup.cpp" line="196"/>
-        <source>Select type file...</source>
-        <translation>Seleccionar archivo TYP...</translation>
-    </message>
-</context>
-<context>
-    <name>CMapRMAP</name>
-    <message>
-        <location filename="../map/CMapRMAP.cpp" line="48"/>
-        <location filename="../map/CMapRMAP.cpp" line="57"/>
-        <location filename="../map/CMapRMAP.cpp" line="127"/>
-        <location filename="../map/CMapRMAP.cpp" line="144"/>
-        <location filename="../map/CMapRMAP.cpp" line="165"/>
-        <location filename="../map/CMapRMAP.cpp" line="187"/>
-        <location filename="../map/CMapRMAP.cpp" line="209"/>
-        <location filename="../map/CMapRMAP.cpp" line="237"/>
-        <source>Error...</source>
-        <translation>Error...</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapRMAP.cpp" line="48"/>
-        <source>This is not a TwoNav RMAP file.</source>
-        <translation>Éste no es un archivo en formato RMAP de TwoNav.</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapRMAP.cpp" line="57"/>
-        <source>Unknown sub-format.</source>
-        <translation>Sub-formato desconocido.</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapRMAP.cpp" line="127"/>
-        <source>Unknown version.</source>
-        <translation>Versión desconocida.</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapRMAP.cpp" line="144"/>
-        <location filename="../map/CMapRMAP.cpp" line="165"/>
-        <location filename="../map/CMapRMAP.cpp" line="187"/>
-        <location filename="../map/CMapRMAP.cpp" line="209"/>
-        <source>Failed to read reference point.</source>
-        <translation>Fallo al leer el punto de referencia.</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapRMAP.cpp" line="237"/>
-        <source>Unknown projection and datum (%1%2).</source>
-        <translation>Proyección y datum desconocidos (%1%2).</translation>
-    </message>
-</context>
-<context>
-    <name>CMapTMS</name>
-    <message>
-        <location filename="../map/CMapTMS.cpp" line="68"/>
-        <location filename="../map/CMapTMS.cpp" line="78"/>
-        <source>Error...</source>
-        <translation>Error...</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapTMS.cpp" line="68"/>
-        <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapTMS.cpp" line="78"/>
-        <source>Failed to read: %1
-line %2, column %3:
- %4</source>
-        <translation>Fallo al leer: %1
-línea %2, columna %3.
- %4</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapTMS.cpp" line="116"/>
-        <source>Layer %1</source>
-        <translation>Capa %1</translation>
-    </message>
-</context>
-<context>
-    <name>CMapVRT</name>
-    <message>
-        <location filename="../map/CMapVRT.cpp" line="45"/>
-        <location filename="../map/CMapVRT.cpp" line="59"/>
-        <location filename="../map/CMapVRT.cpp" line="83"/>
-        <location filename="../map/CMapVRT.cpp" line="133"/>
-        <source>Error...</source>
-        <translation>Error...</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapVRT.cpp" line="45"/>
-        <location filename="../map/CMapVRT.cpp" line="59"/>
-        <source>Failed to load file: %1</source>
-        <translation>Fallo al leer el archivo: %1</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapVRT.cpp" line="83"/>
-        <source>File must be 8 bit palette or gray indexed.</source>
-        <translation>El archivo debe ser con paleta de 8 bits o escala de grises indexada.</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapVRT.cpp" line="133"/>
-        <source>No georeference information found.</source>
-        <translation>No se encontró información de georreferenciación.</translation>
-    </message>
-</context>
-<context>
-    <name>CMapVrtBuilder</name>
-    <message>
-        <location filename="../tool/CMapVrtBuilder.cpp" line="29"/>
-        <source>Build GDAL VRT</source>
-        <translation>Crear GDAL VRT</translation>
-    </message>
-    <message>
-        <location filename="../tool/CMapVrtBuilder.cpp" line="63"/>
-        <source>Select files...</source>
-        <translation>Seleccionar ficheros de origen...</translation>
-    </message>
-    <message>
-        <location filename="../tool/CMapVrtBuilder.cpp" line="87"/>
-        <source>Select target file...</source>
-        <translation>Seleccionar fichero VRT de salida...</translation>
-    </message>
-    <message>
-        <location filename="../tool/CMapVrtBuilder.cpp" line="150"/>
-        <source>!!! done !!!
-</source>
-        <translation>¡¡¡ hecho !!!</translation>
-    </message>
-</context>
-<context>
-    <name>CMapWMTS</name>
-    <message>
-        <location filename="../map/CMapWMTS.cpp" line="43"/>
-        <location filename="../map/CMapWMTS.cpp" line="53"/>
-        <location filename="../map/CMapWMTS.cpp" line="63"/>
-        <location filename="../map/CMapWMTS.cpp" line="72"/>
-        <location filename="../map/CMapWMTS.cpp" line="209"/>
-        <source>Error...</source>
-        <translation>Error...</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapWMTS.cpp" line="43"/>
-        <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapWMTS.cpp" line="53"/>
-        <source>Failed to read: %1
-line %2, column %3:
- %4</source>
-        <translation>Fallo al leer: %1
-línea %2, columna %3.
- %4</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapWMTS.cpp" line="63"/>
-        <source>Failed to read: %1
-Unknown structure.</source>
-        <translation>Fallo al leer: %1
-Estructura desconocida.</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapWMTS.cpp" line="72"/>
-        <source>Unexpected service. '* WMTS 1.0.0' is expected. '%1 %2' is read.</source>
-        <translation>Servicio inesperado. '* WMTS 1.0.0' es el esperado. pero se ha leido '%1 %2'.</translation>
-    </message>
-    <message>
-        <location filename="../map/CMapWMTS.cpp" line="209"/>
-        <source>No georeference information found.</source>
-        <translation>No se encontró información de georreferenciación.</translation>
-    </message>
-</context>
-<context>
-    <name>CMouseEditArea</name>
-    <message>
-        <location filename="../mouse/CMouseEditArea.cpp" line="28"/>
-        <location filename="../mouse/CMouseEditArea.cpp" line="35"/>
-        <source>Area</source>
-        <translation>Área</translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseEditArea.cpp" line="37"/>
-        <source><b>Edit Area</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
-        <translation><b>Editar área</b><br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseEditArea.cpp" line="94"/>
-        <source>area</source>
-        <translation>área</translation>
-    </message>
-</context>
-<context>
-    <name>CMouseEditRte</name>
-    <message>
-        <location filename="../mouse/CMouseEditRte.cpp" line="30"/>
-        <location filename="../mouse/CMouseEditRte.cpp" line="37"/>
-        <source>Route</source>
-        <translation>Ruta</translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseEditRte.cpp" line="39"/>
-        <source><b>Edit Route Points</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
-        <translation></b>Editar puntos de ruta<br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseEditRte.cpp" line="105"/>
-        <source>route</source>
-        <translation>Ruta</translation>
-    </message>
-</context>
-<context>
-    <name>CMouseEditTrk</name>
-    <message>
-        <location filename="../mouse/CMouseEditTrk.cpp" line="28"/>
-        <location filename="../mouse/CMouseEditTrk.cpp" line="35"/>
-        <source>Track</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseEditTrk.cpp" line="38"/>
-        <source><b>Edit Track Points</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
-        <translation><b>Editar puntos del track</b><br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseEditTrk.cpp" line="80"/>
-        <source>Warning!</source>
-        <translation>¡Cuidado!</translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseEditTrk.cpp" line="80"/>
-        <source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
-        <translation>Esto sustituirá todos los datos del original con una simple línea de coordenadas. Todos los demás datos se perderán definitivamente.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseEditTrk.cpp" line="110"/>
-        <source>track</source>
-        <translation>track</translation>
-    </message>
-</context>
-<context>
-    <name>CMouseNormal</name>
-    <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="39"/>
-        <source>Add POI as Waypoint</source>
-        <translation>Añadir POI como Waypoint </translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
-        <source>Add Waypoint</source>
-        <translation>Añadir Waypoint</translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
-        <source>Add Track</source>
-        <translation>Añadir Track</translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
-        <source>Add Route</source>
-        <translation>Añadir ruta</translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
-        <source>Add Area</source>
-        <translation>Añadir Área</translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="45"/>
-        <source>Select Items On Map</source>
-        <translation>Seleccionar elementos del mapa</translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="47"/>
-        <source>Copy position</source>
-        <translation>Copiar posición</translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
-        <source>Copy position (Grid)</source>
-        <translation>Copiar posicion (malla)</translation>
-    </message>
-</context>
-<context>
-    <name>CMousePrint</name>
-    <message>
-        <location filename="../mouse/CMousePrint.cpp" line="31"/>
-        <source><b>Save(Print) Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
-        <translation><b>Guardar/imprimir mapa</b><br/>Seleccione un area rectangular en el mapa pulsando el boton izquierdo del ratón y moviendolo hacia la esquina opuesta. Cancele con el boton derecho. Ajuste la seleccion haciendo clic y moviendo las esquinas.</translation>
-    </message>
-</context>
-<context>
-    <name>CMouseRangeTrk</name>
-    <message>
-        <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
-        <source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
-        <translation><b>Seleccionar rango</b><br/>Seleccione el punto inicial con el botón izquierdo del raton. Fije el punto final con una segunda pulsacion. El rango seleccionado se marca en verde. Un clic con el botón derecho del ratón abandona la selección del rango<br/></translation>
-    </message>
-</context>
-<context>
-    <name>CMouseSelect</name>
-    <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="32"/>
-        <source><b>Select Items On Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
-        <translation><b>Seleccionar elementos en el mapa</b><br/>Seleccione un area rectangular con el boton izquierdo del ratón. Cancelar con clic derecho. Ajuste la seleccion haciendo clic y desplazando en las esquinas.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
-        <source><b>Selected:</b><br/></source>
-        <translation><b>Seleccionado:</b><br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="107"/>
-        <source>%1 waypoints<br/></source>
-        <translation>%1 waypoints<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="102"/>
-        <source>%1 tracks<br/></source>
-        <translation>%1 tracks<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="112"/>
-        <source>%1 routes<br/></source>
-        <translation>%1 rutas<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="117"/>
-        <source>%1 areas<br/></source>
-        <translation>%1 áreas<br/></translation>
-    </message>
-</context>
-<context>
-    <name>CPhotoAlbum</name>
-    <message>
-        <location filename="../widgets/CPhotoAlbum.cpp" line="73"/>
-        <source>Select images...</source>
-        <translation>Seleccionar imagenes...</translation>
-    </message>
-</context>
-<context>
-    <name>CPlot</name>
-    <message>
-        <location filename="../plot/CPlot.cpp" line="55"/>
-        <source>distance [%1]</source>
-        <translation>distancia [%1]</translation>
-    </message>
-    <message>
-        <location filename="../plot/CPlot.cpp" line="60"/>
-        <source>time</source>
-        <translation>tiempo</translation>
-    </message>
-</context>
-<context>
-    <name>CPlotProfile</name>
-    <message>
-        <location filename="../plot/CPlotProfile.cpp" line="79"/>
-        <source>distance [%1]</source>
-        <translation>distancia [%1]</translation>
-    </message>
-    <message>
-        <location filename="../plot/CPlotProfile.cpp" line="80"/>
-        <source>alt. [%1]</source>
-        <translation>alt. [%1]</translation>
-    </message>
-</context>
-<context>
-    <name>CPrintDialog</name>
-    <message>
-        <location filename="../print/CPrintDialog.cpp" line="67"/>
-        <source>Print Map...</source>
-        <translation>Imprimir mapa...</translation>
-    </message>
-    <message>
-        <location filename="../print/CPrintDialog.cpp" line="74"/>
-        <source>Save Map as Image...</source>
-        <translation>Guardar mapa como imagen...</translation>
-    </message>
-    <message>
-        <location filename="../print/CPrintDialog.cpp" line="94"/>
-        <source>Printer Properties...</source>
-        <translation>Imprimir propiedades...</translation>
-    </message>
-    <message>
-        <location filename="../print/CPrintDialog.cpp" line="169"/>
-        <source>Pages: %1 x %2</source>
-        <translation>Páginas: %1 x %2</translation>
-    </message>
-    <message>
-        <location filename="../print/CPrintDialog.cpp" line="170"/>
-        <source>Zoom with mouse wheel on map below to change resolution:
-
-%1x%2 pixel
-x: %3 m/px
-y: %4 m/px</source>
-        <translation>Zoom con la rueda del ratón en el mapa inferior para cambiar la resolución:
-
-%1x%2 pixel
-x: %3 m/px
-y: %4 m/px</translation>
-    </message>
-    <message>
-        <location filename="../print/CPrintDialog.cpp" line="216"/>
-        <source>Printing pages.</source>
-        <translation>Imprimir páginas.</translation>
-    </message>
-    <message>
-        <location filename="../print/CPrintDialog.cpp" line="260"/>
-        <source>Save map...</source>
-        <translation>Guardar mapa...</translation>
-    </message>
-</context>
-<context>
-    <name>CProgressDialog</name>
-    <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="46"/>
-        <source>Elapsed time: %1</source>
-        <translation>Tiempo transcurrido: %1</translation>
-    </message>
-    <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="132"/>
-        <source>Elapsed time: %1 seconds.</source>
-        <translation>Tiempo transcurrido: %1 segundos.</translation>
-    </message>
-</context>
-<context>
-    <name>CProjWizard</name>
-    <message>
-        <location filename="../grid/CProjWizard.cpp" line="62"/>
-        <source>north</source>
-        <translation>norte</translation>
-    </message>
-    <message>
-        <location filename="../grid/CProjWizard.cpp" line="63"/>
-        <source>south</source>
-        <translation>sur</translation>
-    </message>
-    <message>
-        <location filename="../grid/CProjWizard.cpp" line="222"/>
-        <source>Error...</source>
-        <translation>Error...</translation>
-    </message>
-    <message>
-        <location filename="../grid/CProjWizard.cpp" line="222"/>
-        <source>The value
-'%1'
-is not a valid coordinate system definition:
-%2</source>
-        <translation>El valor
-'%1'
-no es una definición de sistema de coordenadas válido:
-%2</translation>
-    </message>
-</context>
-<context>
-    <name>CProjWpt</name>
-    <message>
-        <location filename="../gis/wpt/CProjWpt.cpp" line="62"/>
-        <source>Edit name...</source>
-        <translation>Editar nombre...</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/CProjWpt.cpp" line="62"/>
-        <source>Enter new waypoint name.</source>
-        <translation>Introduzca el nuevo nombre del waypoint.</translation>
-    </message>
-</context>
-<context>
-    <name>CQlgtDb</name>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="308"/>
-        <source>Migrating database from version 4 to 5.</source>
-        <translation>Convirtiendo base de datos de version 4 a 5.</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="362"/>
-        <source>Migrating database from version 5 to 6.</source>
-        <translation>Convirtiendo base de datos de version 5 a 6.</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="420"/>
-        <source>Migrating database from version 6 to 7.</source>
-        <translation>Convirtiendo base de datos de version 6 a 7.</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="486"/>
-        <source>Migrating database from version 7 to 8.</source>
-        <translation>Convirtiendo base de datos de version 7 a 8.</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="515"/>
-        <source>Migrating database from version 8 to 9.</source>
-        <translation>Convirtiendo base de datos de version 8 a 9.</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="538"/>
-        <source>Open database: %1</source>
-        <translation>Abrir base de datos:%1</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="547"/>
-        <source>Folders:          %1</source>
-        <translation>Carpetas:          %1</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="556"/>
-        <source>Tracks:           %1</source>
-        <translation>Tracks:           %1</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="564"/>
-        <source>Routes:           %1 (Only the basic route will be copied)</source>
-        <translation>Rutas:           %1 (Sólo se copiará la ruta básica)</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="572"/>
-        <source>Waypoints:        %1</source>
-        <translation>Waypoints:        %1</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="580"/>
-        <source>Overlays:         %1 (areas will be converted as areas, distance lines will be converted to tracks, all other overlay items will be lost)</source>
-        <translation>Superposiciones:         %1 (las áreas se convertirán como áreas, las líneas de distancia se convertirán en tracks, todos los demás elementos de superposición se perderán</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="587"/>
-        <source>Diaries:          %1</source>
-        <translation>Diarios:          %1</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="594"/>
-        <source>Map selections:   %1 (can't be converted to QMapShack)</source>
-        <translation>Selecciones de mapa:   %1 (NO pueden convertirse a QMapShack)</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="600"/>
-        <source>------ Start to convert database to %1------</source>
-        <translation>------ Comenzar a convertir base de datos a %1------</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="604"/>
-        <source>Failed to create target database.</source>
-        <translation>Fallo al crear la base de datos de destino.</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="605"/>
-        <source>------ Abort ------</source>
-        <translation>------ Cancelar ------</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="633"/>
-        <source>------ Done ------</source>
-        <translation>------ Hecho ------</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="641"/>
-        <source>Restore folders...</source>
-        <translation>Restaurar carpetas...</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="661"/>
-        <source>Imported %1 folders and %2 diaries</source>
-        <translation>Importadas %1 carpetas y %2 diarios</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="667"/>
-        <source>Copy items...</source>
-        <translation>Copia elementos....</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="685"/>
-        <source>Imported %1 tracks, %2 waypoints, %3 routes, %4 areas</source>
-        <translation>Importado: %1 tracks, %2 waypoints, %3 routes, %4 areas</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="686"/>
-        <source>Import folders...</source>
-        <translation>Importar carpetas...</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtDb.cpp" line="751"/>
-        <source>Overlay of type '%1' cant be converted</source>
-        <translation>No puede convertirse superposición del tipo '%1' </translation>
-    </message>
-</context>
-<context>
-    <name>CQlgtTrack</name>
-    <message>
-        <location filename="../qlgt/CQlgtTrack.cpp" line="164"/>
-        <location filename="../qlgt/CQlgtTrack.cpp" line="218"/>
-        <location filename="../qlgt/CQlgtTrack.cpp" line="265"/>
-        <location filename="../qlgt/CQlgtTrack.cpp" line="291"/>
-        <source>Corrupt track ...</source>
-        <translation>Track corrupto...</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtTrack.cpp" line="164"/>
-        <source>Number of trackpoints is not equal the number of training data trackpoints.</source>
-        <translation>El número de puntos del track no es igual al número de puntos de datos de entrenamiento.</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtTrack.cpp" line="218"/>
-        <source>Number of trackpoints is not equal the number of extended data trackpoints.</source>
-        <translation>El número de puntos de track no es igual al número de datos extendidos</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQlgtTrack.cpp" line="265"/>
-        <location filename="../qlgt/CQlgtTrack.cpp" line="291"/>
-        <source>Number of trackpoints is not equal the number of shadow data trackpoints.</source>
-        <translation>El número de puntos del track no es igual al número de datos extendidos ocultos.</translation>
-    </message>
-</context>
-<context>
-    <name>CQmsDb</name>
-    <message>
-        <location filename="../qlgt/CQmsDb.cpp" line="47"/>
-        <source>Existing file...</source>
-        <translation>Archivo existente...</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQmsDb.cpp" line="47"/>
-        <source>Remove existing %1?</source>
-        <translation>¿Eliminar los %1?</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQmsDb.cpp" line="52"/>
-        <source>Remove existing file %1</source>
-        <translation>Eliminar el archivo %1</translation>
-    </message>
-    <message>
-        <location filename="../qlgt/CQmsDb.cpp" line="164"/>
-        <source>%1: drop item with QLGT DB ID %2</source>
-        <translation>Descartar elemento %2 de la base de datos de QLandKarteGT</translation>
-    </message>
-</context>
-<context>
-    <name>CQmsProject</name>
-    <message>
-        <location filename="../gis/qms/CQmsProject.cpp" line="48"/>
-        <location filename="../gis/qms/CQmsProject.cpp" line="80"/>
-        <source>Failed to open...</source>
-        <translation>Fallo al abrir...</translation>
-    </message>
-    <message>
-        <location filename="../gis/qms/CQmsProject.cpp" line="48"/>
-        <location filename="../gis/qms/CQmsProject.cpp" line="80"/>
-        <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
-    </message>
-</context>
-<context>
-    <name>CRouterBRouter</name>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
-        <source>original</source>
-        <translation>original</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
-        <source>first alternative</source>
-        <translation>Primera alternativa</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
-        <source>second alternative</source>
-        <translation>Segunda alternativa</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
-        <source>third alternative</source>
-        <translation>Tercera alternativa</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
-        <source>BRouter (offline)</source>
-        <translation>BRouter (offline)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
-        <source>BRouter (online)</source>
-        <translation>BRouter (online)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
-        <source>profile: %1, alternative: %2</source>
-        <translation>perfil: %1, alternativa: %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
-        <source>response is empty</source>
-        <translation>La respuesta está vacía</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
-        <source>Bad response from server: %1</source>
-        <translation>Mala respuesta del servidor: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
-        <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
-        <translation><b>BRouter</b><br/>Solicitud de enrutamiento enviada al servidor. por favor espere...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
-        <source>Calculate route with %1</source>
-        <translation>Calcular ruta con %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
-        <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
-        <translation><b>BRouter</b><br/>Mala respuesta del servidor:<br/>%1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
-        <source><br/>Calculation time: %1s</source>
-        <translation>Tiempo empleado en el cálculo: %1s</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
-        <source>running</source>
-        <translation>En marcha</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
-        <source>starting</source>
-        <translation>comenzando</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
-        <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local  [...]
-        <translation>QMapShack se comunica con BRouter a través de una conexión de red. Por lo general, esto se hace en una dirección especial que no se puede alcanzar desde fuera de su dispositivo. Sin embargo BRouter escucha las conexiones en todas las interfaces disponibles. Si usted está en su propia red privada con un cortafuegos activo, esto no es un gran problema. Si usted está en una red pública cada puerto abierto es un riesgo, ya que puede ser utilizado por otra persona para co [...]
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
-        <source>Warning...</source>
-        <translation>Aviso...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
-        <source>I understand the risk. Don't tell me again.</source>
-        <translation>Comprendo el riesgo. No avisar de nuevo</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
-        <source>stopped</source>
-        <translation>Parado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
-        <source>not installed</source>
-        <translation>No instalado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
-        <source>online</source>
-        <translation>online</translation>
-    </message>
-</context>
-<context>
-    <name>CRouterBRouterSetup</name>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
-        <source>%1 not accessible</source>
-        <translation>%1 no accessible</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
-        <source>%1 invalid result</source>
-        <translation>%1 resultado inválido</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
-        <source>Error parsing online-config:</source>
-        <translation>Error al analizar configuración online:</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="538"/>
-        <source>Network error:</source>
-        <translation>Error de red</translation>
-    </message>
-</context>
-<context>
-    <name>CRouterBRouterSetupWizard</name>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
-        <source>Restore Default Values</source>
-        <translation>Restablecer valores por defecto</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
-        <source>Open Directory</source>
-        <translation>Abrir carpeta</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
-        <source>select Java Executable</source>
-        <translation>Seleccionar ejecutable Java</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="414"/>
-        <source>please select BRouter installation directory</source>
-        <translation>Seleccione carpeta de instalacion de BRouter</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="419"/>
-        <source>selected directory does not exist</source>
-        <translation>La carpeta seleccionada no existe</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="420"/>
-        <source>create directory and install BRouter there</source>
-        <translation>Cree una carpeta e instale BRouter allí</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="427"/>
-        <source>existing BRouter installation</source>
-        <translation>Instalacion de BRouter exixtente</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="428"/>
-        <source>update existing BRouter installation</source>
-        <translation>Actualizar instalación de BRouter</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="433"/>
-        <source>empty directory, create new BRouter installation here</source>
-        <translation>Carpeta vacia, instale BRouter aquí</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
-        <source>create new BRouter installation</source>
-        <translation>Crear nueva instalacion de BRouter</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
-        <source>seems to be a valid Java-executable</source>
-        <translation>Parece ser un ejecutable Java válido</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
-        <source>doesn't seem to be a valid Java-executable</source>
-        <translation>no parece un ejecutable Java válido</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
-        <source>Java Executable not found</source>
-        <translation>Ejecutable Java no encontrado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="496"/>
-        <source>Error loading installation-page at %1</source>
-        <translation>Error al cargar la página de instalación en %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="505"/>
-        <source>no brouter-version to install selected</source>
-        <translation>Ninguna versión de BRouter para instalar seleccionada</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="513"/>
-        <source>selected %1 for download and installation</source>
-        <translation>Seleccione %1 para descargar e instalar</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
-        <source>Warning...</source>
-        <translation>Aviso...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
-        <source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
-        <translation>Descarga:%1<br/><br/> Esto descargará e instalará un archivo zip desde una ubicación de descarga que no está protegida por ningún estándar, usando HTTP normal. Normalmente esto debe ser HTTPS. El riesgo es que alguien redireccione la solicitud y le envíe un código postal de reemplazo con malware. No es posible que QMapShack lo detecte. <br/> Si no entiende esto o si tiene alguna duda, no proceda y cancele. Utilice la versión web de BRouter en su lug [...]
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
-        <source>I understand the risk and wish to proceed.</source>
-        <translation>Entiendo el riesgo, continuar.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
-        <source>download %1 started</source>
-        <translation>Iniciada descarga %1 </translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
-        <source>Network Error: %1</source>
-        <translation>Error de red: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
-        <source>download %1 finished</source>
-        <translation>Finalizada descarga %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
-        <source>unzipping:</source>
-        <translation>Descomprimiendo:</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
-        <source>ready.</source>
-        <translation>Preparado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="613"/>
-        <source>download of brouter failed: %1</source>
-        <translation>Descarga de BRouter fallida: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="623"/>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="630"/>
-        <source>retrieving available profiles from %1</source>
-        <translation>Recuperar los perfiles disponibles de %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="654"/>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="736"/>
-        <source>content of profile</source>
-        <translation>Contenido del perfil</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
-        <source>Error:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
-        <source>Error creating directory %1</source>
-        <translation>Error creando la carpeta %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="571"/>
-        <source>Error directory %1 does not exist</source>
-        <translation>Error: La carpeta %1 no existe</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="578"/>
-        <source>Error creating file %1</source>
-        <translation>Error creando archivo %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="582"/>
-        <source>Error writing to file %1</source>
-        <translation>Error escribiendo el archivo %1</translation>
-    </message>
-</context>
-<context>
-    <name>CRouterBRouterTilesPage</name>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
-        <source>Continue with Setup</source>
-        <translation>Continuar con la configuración</translation>
-    </message>
-</context>
-<context>
-    <name>CRouterBRouterTilesSelect</name>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
-        <source>available routing-data is being determined.</source>
-        <translation>Se están determinando los datos de enrutamiento disponibles.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="108"/>
-        <source>Select outdated</source>
-        <translation>Selección caducada</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
-        <source>Clear Selection</source>
-        <translation>Borrar selección</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
-        <source>Delete selection</source>
-        <translation>Borrar Selección</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
-        <source>Download</source>
-        <translation>Descargar</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="281"/>
-        <source>Error creating segments directory %1</source>
-        <translation>Error al crear la carpeta de segmentos</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="365"/>
-        <source>cannot parse: %1 is not a date</source>
-        <translation>No se puede analizar: %1 no es una fecha</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="390"/>
-        <source>cannot parse: %1 is not a valid size</source>
-        <translation>No se puede analizar: %1 No es un tamaño válido</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="409"/>
-        <source>Error retrieving available routing data from %1: %2</source>
-        <translation>Error al recuperar los datos de enrutamiento disponibles de %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="490"/>
-        <source>segments directory does not exist: </source>
-        <translation>Carpeta de segmentos no existe:</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="504"/>
-        <source>error creating file %1: %2</source>
-        <translation>Error creando archivo %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="536"/>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="576"/>
-        <source>no valid request for filename %1</source>
-        <translation>%1 : Solicitud no válida de nombre de archivo</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="541"/>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="584"/>
-        <source>no open file assigned to request for %1</source>
-        <translation>Ningún archivo abierto asignado a la solicitud de %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="551"/>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="594"/>
-        <source>error writing to file %1: %2</source>
-        <translation>Error al escribir el archivo %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="620"/>
-        <source>error renaming file %1 to %2: %3</source>
-        <translation>Error renombrando archivo %1 a %2: %3</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="694"/>
-        <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
-        <translation>actualizado: %1 (%2), obsoleto: %3 (%4), Para descargar: %5 (%6)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
-        <source>being downloaded: %1 of %2</source>
-        <translation>Descargando: %1 of %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
-        <source>no local data, online available: %1 (%2)</source>
-        <translation>Sin datos locales, disponible online: %1 (%2)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="798"/>
-        <source>local data outdated (%1, %2 - remote %3, %4)</source>
-        <translation>Datos locales obsoletos (%1, %2 - remoto%3, %4)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
-        <source>Error removing %1: %2</source>
-        <translation>Error eliminando %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
-        <source>Network Error</source>
-        <translation>Error de red</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
-        <source>invalid result, no files found</source>
-        <translation>Resultado no válido, no se encuentran archivos</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="806"/>
-        <source>local data up to date (%1, %2)</source>
-        <translation>Datos locales actualizados (%1, %2)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="818"/>
-        <source>no routing-data available</source>
-        <translation>Datos de ruteo no disponibles</translation>
-    </message>
-</context>
-<context>
-    <name>CRouterBRouterToolShell</name>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
-        <source>!!! done !!!
-</source>
-        <translation>¡¡¡Hecho!!!</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
-        <source>!!! failed !!!
-</source>
-        <translation>!!! fallo !!!</translation>
-    </message>
-</context>
-<context>
-    <name>CRouterMapQuest</name>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
-        <source>Fastest</source>
-        <translation>Más rapido</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="38"/>
-        <source>Shortest</source>
-        <translation>Más corto</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="39"/>
-        <source>Bicycle</source>
-        <translation>Bicicleta</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="40"/>
-        <source>Pedestrian</source>
-        <translation>Peatón</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="42"/>
-        <source>US English</source>
-        <translation>Inglés USA</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="43"/>
-        <source>British English</source>
-        <translation>Inglés UK</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="44"/>
-        <source>Danish</source>
-        <translation>Danés</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="45"/>
-        <source>Dutch</source>
-        <translation>Holandés</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="46"/>
-        <source>French</source>
-        <translation>Francés</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="47"/>
-        <source>German</source>
-        <translation>Alemán</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="48"/>
-        <source>Italian</source>
-        <translation>Italiano</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="49"/>
-        <source>Norwegian</source>
-        <translation>Noruego</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="50"/>
-        <source>Spanish</source>
-        <translation>Español</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="51"/>
-        <source>Swedish</source>
-        <translation>Sueco</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="110"/>
-        <source>mode "%1"</source>
-        <translation>modo "%1"</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="114"/>
-        <source>no highways</source>
-        <translation>Evitar autopistas</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="125"/>
-        <source>no toll roads</source>
-        <translation>Evitar peajes</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="136"/>
-        <source>no seasonal</source>
-        <translation>Evitar estacionales</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="147"/>
-        <source>no unpaved</source>
-        <translation>Evitar no pavimentadas</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="158"/>
-        <source>no ferry</source>
-        <translation>Evitar Ferrys</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="169"/>
-        <source>no crossing of country borders</source>
-        <translation>No cruzar fronteras</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="301"/>
-        <source><b>MapQuest</b><br/>Routing request sent to server. Please wait...</source>
-        <translation><b>MapQuest</b><br/>Solicitud de ruta enviada al servidor. Por favor,espere...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="312"/>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="346"/>
-        <source><b>MapQuest</b><br/>Bad response from server:<br/>%1</source>
-        <translation><b>MapQuest</b><br/>Mala respuesta del servidor:<br/>%1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="363"/>
-        <source><br/>Calculation time: %1s</source>
-        <translation>Tiempo calculando: %1s</translation>
-    </message>
-</context>
-<context>
-    <name>CRouterRoutino</name>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="78"/>
-        <source>Foot</source>
-        <translation>A pie</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="79"/>
-        <source>Horse</source>
-        <translation>A caballo</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="80"/>
-        <source>Wheelchair</source>
-        <translation>Silla de ruedas</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="81"/>
-        <source>Bicycle</source>
-        <translation>Bicicleta</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="82"/>
-        <source>Moped</source>
-        <translation>Ciclomotor</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="83"/>
-        <source>Motorcycle</source>
-        <translation>Moto</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="84"/>
-        <source>Motorcar</source>
-        <translation>Automóvil</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="85"/>
-        <source>Goods</source>
-        <translation>Mercancias</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="59"/>
-        <source>Shortest</source>
-        <translation>El más corto</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
-        <source>Found Routino with a wrong version. Expected %1 found %2</source>
-        <translation>Routino se encuentra en una versión incorrecta. Esperado %1 encontrado %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="60"/>
-        <source>Quickest</source>
-        <translation>El más rápido</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="87"/>
-        <source>English</source>
-        <translation>Inglés</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="88"/>
-        <source>German</source>
-        <translation>Alemán</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="89"/>
-        <source>French</source>
-        <translation>Francés</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="90"/>
-        <source>Hungarian</source>
-        <translation>Húngaro</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="91"/>
-        <source>Dutch</source>
-        <translation>Holandés</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="92"/>
-        <source>Russian</source>
-        <translation>Ruso</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="93"/>
-        <source>Polish</source>
-        <translation>Polaco</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="128"/>
-        <source>A function was called without the database variable set.</source>
-        <translation>Se llamó una función sin la variable de base de datos establecida.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="131"/>
-        <source>A function was called without the profile variable set.</source>
-        <translation>Se llamó una función sin la variable de perfil establecida.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="134"/>
-        <source>A function was called without the translation variable set.</source>
-        <translation>Se llamó una función sin el conjunto de variables de traducción</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="137"/>
-        <source>The specified database to load did not exist.</source>
-        <translation>La base de datos especificada no existe</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="140"/>
-        <source>The specified database could not be loaded.</source>
-        <translation>No se pudo cargar la base de datos especificada</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="143"/>
-        <source>The specified profiles XML file did not exist.</source>
-        <translation>El archivo XML de perfiles no existe</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="146"/>
-        <source>The specified profiles XML file could not be loaded.</source>
-        <translation>El archivo XML de perfiles especificado no está cargado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="149"/>
-        <source>The specified translations XML file did not exist.</source>
-        <translation>El archivo XML de traducción especificado no existe</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="152"/>
-        <source>The specified translations XML file could not be loaded.</source>
-        <translation>El archivo XML de traducción especificado no está cargado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="155"/>
-        <source>The requested profile name does not exist in the loaded XML file.</source>
-        <translation>El nombre del perfil solicitado no existe en el archivo XML cargado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="158"/>
-        <source>The requested translation language does not exist in the loaded XML file.</source>
-        <translation>El idioma solicitado no existe en el archivo XML cargado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="164"/>
-        <source>The profile and database do not work together.</source>
-        <translation>El perfil y la base de datos no funcionan juntos</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="167"/>
-        <source>The profile being used has not been validated.</source>
-        <translation>El perfil que se utiliza no ha sido validado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="170"/>
-        <source>The user specified profile contained invalid data.</source>
-        <translation>El perfil especificado por el usuario contenía datos no válidos</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="173"/>
-        <source>The routing options specified are not consistent with each other.</source>
-        <translation>Las opciones de enrutamiento especificadas no son coherentes entre sí</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="176"/>
-        <source>There is a mismatch between the library and caller API version.</source>
-        <translation>Hay un desajuste entre la biblioteca y la versión de la API del llamante</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="179"/>
-        <source>Route calculation was aborted by user.</source>
-        <translation>El cálculo de la ruta ha sido cancelado por el usuario</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="185"/>
-        <source>A route could not be found to waypoint %1.</source>
-        <translation>No se pudo encontrar una ruta al waypoint %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="188"/>
-        <source>Unknown error: %1</source>
-        <translation>Error desconocido: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="200"/>
-        <source>profile "%1"</source>
-        <translation>perfil "%1"</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="201"/>
-        <source>, mode "%1"</source>
-        <translation>, modo "%1"</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
-        <source>Warning...</source>
-        <translation>Aviso...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="161"/>
-        <source>In the routing database there is no highway near the coordinates to place a waypoint.</source>
-        <translation>En la base de datos de enrutamiento no hay ninguna carretera cerca de las coordenadas para colocar un waypoint.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="415"/>
-        <source>Calculate route with %1</source>
-        <translation>Calcular ruta con %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="340"/>
-        <source><br/>Calculation time: %1s</source>
-        <translation><br/>Tiempo de cálculo: %1s</translation>
-    </message>
-</context>
-<context>
-    <name>CRouterRoutinoPathSetup</name>
-    <message>
-        <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="40"/>
-        <source>Add or remove paths containing Routino data. There can be multiple databases in a path but no sub-path is parsed.</source>
-        <translation>Agregar o quitar carpetas que contienen datos de Routino. Puede haber varias bases de datos en una carpeta, pero no se analiza ninguna subcarpeta.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="55"/>
-        <source>Select routing data file path...</source>
-        <translation>Seleccione la carpeta del archivo de datos de enrutamiento</translation>
-    </message>
-</context>
-<context>
-    <name>CRouterSetup</name>
-    <message>
-        <location filename="../gis/rte/router/CRouterSetup.cpp" line="38"/>
-        <source>Routino (offline)</source>
-        <translation>Routino (offline)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterSetup.cpp" line="39"/>
-        <source>MapQuest (online)</source>
-        <translation>MapQuest (online)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
-        <source>BRouter (online)</source>
-        <translation>BRouter (online)</translation>
-    </message>
-</context>
-<context>
-    <name>CRoutinoDatabaseBuilder</name>
-    <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="33"/>
-        <source>Create Routino Database</source>
-        <translation>Crear base de datos de Routino</translation>
-    </message>
-    <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
-        <source>Select files...</source>
-        <translation>Seleccionar ficheros de origen...</translation>
-    </message>
-    <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
-        <source>Select target path...</source>
-        <translation>Seleccionar carpeta de destino...</translation>
-    </message>
-    <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
-        <source>!!! done !!!
-</source>
-        <translation>¡¡¡Hecho!!!</translation>
-    </message>
-</context>
-<context>
-    <name>CScrOptRangeTrk</name>
-    <message>
-        <location filename="../mouse/CScrOptRangeTrk.cpp" line="38"/>
-        <source>No range selected</source>
-        <translation>No hay rango seleccionado</translation>
-    </message>
-</context>
-<context>
-    <name>CScrOptSelect</name>
-    <message>
-        <location filename="../mouse/CScrOptSelect.cpp" line="93"/>
-        <source><b>Exact Mode</b><br/>All selected items have to be completely inside the selected area.<br/></source>
-        <translation><b>Modo exacto</b><br/>Todos los elementos seleccionados estan completamente dentro del área.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CScrOptSelect.cpp" line="97"/>
-        <source><b>Intersecting Mode</b><br/>All selected items have to be inside or at least intersect the selected area.<br/></source>
-        <translation>Modo de intersección</b><br/>Todos los elementos seleccionados deben estar dentro o al menos intersecar el área seleccionada.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CScrOptSelect.cpp" line="101"/>
-        <source><b>Add Tracks</b><br/>Add tracks to list of selected items<br/></source>
-        <translation><b>Agregar tracks</b><br/>Agregar tracks a la lista de elementos seleccionados<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CScrOptSelect.cpp" line="105"/>
-        <source><b>Add Waypoints</b><br/>Add waypoints to list of selected items<br/></source>
-        <translation><b>Agregar waypoints</b><br/>Agregar waypoints a la lista de elementos seleccionados<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CScrOptSelect.cpp" line="109"/>
-        <source><b>Add Routes</b><br/>Add routes to list of selected items<br/></source>
-        <translation><b>Agregar rutas</b><br/>Agregar rutas a la lista de elementos seleccionados <br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CScrOptSelect.cpp" line="113"/>
-        <source><b>Add Areas</b><br/>Add areas to list of selected items<br/></source>
-        <translation><b>Agregar áreas</b><br/>Agregar áreas a la lista de elementos seleccionados<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CScrOptSelect.cpp" line="124"/>
-        <source><b>Ignore Tracks</b><br/>Ignore tracks in list of selected items<br/></source>
-        <translation><b>Ignorar tracks</b><br/>Ignorar tracks de la lista de elementos seleccionados<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CScrOptSelect.cpp" line="128"/>
-        <source><b>Ignore Waypoints</b><br/>Ignore waypoints in list of selected items<br/></source>
-        <translation><b>Ignorar Waypoints</b><br/>Ignorar waypoints de la lista de elementos seleccionados<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CScrOptSelect.cpp" line="132"/>
-        <source><b>Ignore Routes</b><br/>Ignore routes in list of selected items<br/></source>
-        <translation><b>Ignorar rutas</b><br/>Ignorar rutas en la lista de elementos seleccionados<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/CScrOptSelect.cpp" line="136"/>
-        <source><b>Ignore Areas</b><br/>Ignore areas in list of selected items<br/></source>
-        <translation>Ignorar áreas</b><br/>Ignorar áreas de la lista de elementos seleccionados<br/></translation>
-    </message>
-</context>
-<context>
-    <name>CSearchDatabase</name>
-    <message>
-        <location filename="../gis/db/CSearchDatabase.cpp" line="38"/>
-        <source>Search database '%1':</source>
-        <translation>Buscar base de datos '%1':</translation>
-    </message>
-</context>
-<context>
-    <name>CSearchGoogle</name>
-    <message>
-        <location filename="../gis/search/CSearchGoogle.cpp" line="118"/>
-        <source>Unknown response</source>
-        <translation>Respuesta desconocida</translation>
-    </message>
-    <message>
-        <location filename="../gis/search/CSearchGoogle.cpp" line="128"/>
-        <source>Error: </source>
-        <translation>Error: </translation>
-    </message>
-</context>
-<context>
-    <name>CSetupDatabase</name>
-    <message>
-        <location filename="../gis/db/CSetupDatabase.cpp" line="47"/>
-        <source>Missing Requirement</source>
-        <translation>Falta un requisito</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CSetupDatabase.cpp" line="48"/>
-        <source>MySQL cannot be used at this point, because the corresponding driver (QMYSQL) is not available.<br />Please make sure you have installed the corresponding package.<br />If you don't know what to do now you should have <a href="%1">a look at the wiki</a>.</source>
-        <translation>SQL no se puede utilizar en este momento, ya que el controlador correspondiente (QMYSQL) no está disponible.<br />Asegúrese de haber instalado el paquete correspondiente.<br />Si usted no sabe qué hacer ahora debe <a href="%1">consultar la wiki</a>.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CSetupDatabase.cpp" line="102"/>
-        <source>Error...</source>
-        <translation>Error...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CSetupDatabase.cpp" line="102"/>
-        <source>There is already a database with name '%1'</source>
-        <translation>Ya existe una base de datos con el nombre '%1'</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CSetupDatabase.cpp" line="115"/>
-        <source>New database...</source>
-        <translation>Nueva base de datos...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CSetupDatabase.cpp" line="140"/>
-        <source>Open database...</source>
-        <translation>Abrir base de datos...</translation>
-    </message>
-</context>
-<context>
-    <name>CSetupWorkspace</name>
-    <message>
-        <location filename="../gis/db/CSetupWorkspace.cpp" line="55"/>
-        <source>Setup database...</source>
-        <translation>Configurar la base de datos...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/CSetupWorkspace.cpp" line="55"/>
-        <source>Changes will become active after an application's restart.</source>
-        <translation>Los cambios surtirán efecto tras reiniciar la aplicación.</translation>
-    </message>
-</context>
-<context>
-    <name>CSlfProject</name>
-    <message>
-        <location filename="../gis/slf/CSlfProject.cpp" line="42"/>
-        <source>Failed to load file %1...</source>
-        <translation>Fallo al cargar el archivo %1...</translation>
-    </message>
-</context>
-<context>
-    <name>CSlfReader</name>
-    <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="63"/>
-        <source>Failed to parse timestamp `%1`</source>
-        <translation>Error al analizar la marca de tiempo %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="76"/>
-        <source>%1 does not exist</source>
-        <translation>%1 no existe</translation>
-    </message>
-    <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="81"/>
-        <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="92"/>
-        <source>Failed to read: %1
-line %2, column %3:
- %4</source>
-        <translation>Fallo al leer: %1
-línea %2, columna %3.
- %4</translation>
-    </message>
-    <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="99"/>
-        <source>Not a SLF file: %1</source>
-        <translation>%1 no es un archivo SLF</translation>
-    </message>
-    <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="106"/>
-        <source>Unsupported revision %1: %2</source>
-        <translation>Revisión no admitida %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="181"/>
-        <source>Break %1</source>
-        <translation>Pausa %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
-        <source>Lap %1</source>
-        <translation>Vuelta %1</translation>
-    </message>
-</context>
-<context>
-    <name>CTableTrk</name>
-    <message>
-        <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
-        <source>Double click to edit elevation value</source>
-        <translation>Doble clic para editar datos de altitud</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
-        <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
-        <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
-        <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
-        <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
-        <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
-        <source>%1 %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CTcxProject</name>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
-        <source>Failed to load file %1...</source>
-        <translation>Fallo al cargar el archivo %1...</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="73"/>
-        <source>Failed to open %1</source>
-        <translation>Fallo al abrir %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="84"/>
-        <source>Failed to read: %1
-line %2, column %3:
- %4</source>
-        <translation>Fallo al leer: %1
-línea %2, columna %3.
- %4</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="91"/>
-        <source>Not a TCX file: %1</source>
-        <translation>%1 no es un archivo TCX</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="101"/>
-        <source>This TCX file contains at least 1 workout, but neither an activity nor a course. As workouts do not contain position data, they can not be imported to QMapShack.</source>
-        <translation>Este archivo TCX contiene al menos un entrenamiento, pero ninguna actividad ni carrera. Como los entrenamientos no contienen datos de posición, no se pueden importar a QMapShack</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="106"/>
-        <source>This TCX file does not contain any activity or course: %1</source>
-        <translation>El archivo TCX %1 no contiene ninguna actividad ni carrera</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="275"/>
-        <source>File exists ...</source>
-        <translation>El archivo ya existe ...</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="276"/>
-        <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
-        <translation>El archivo existe y no ha sido creado por QMapShack. Si pulsa 'yes' Se perderán todos los datos de este archivo. Incluso si este archivo contiene datos y ha sido cargado por QMapShack, QMapShack puede no ser capaz de cargar y almacenar todos los elementos de este archivo. Estos elementos se perderán. Se recomienda usar otro archivo. <b>¿Realmente desea sobrescribir el archivo?</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="315"/>
-        <source>The track <b>%1</b> you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. <b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b></source>
-        <translation>El track <b>%1</b> Que ha seleccionado contiene puntos y marcas de tiempo no válidas. Es posible que el dispositivo no acepte el archivo de curso TCX generado si se deja como está <b>¿Desea aplicar un filtro con velocidad constante (10 m / s) y continuar?</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
-        <source>Course</source>
-        <translation>Carrera</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
-        <source>Activity</source>
-        <translation>Actividad</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
-        <source>Track with invalid timestamps...</source>
-        <translation>Track con marcas de tiempo inválidas.</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="334"/>
-        <source>Activity or course?</source>
-        <translation>¿Actividad o carrera?</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
-        <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
-        <translation>QMapShack no sabe cómo <b>%1</b> Debe ser guardado. <b>¿Desea guardarlo como carrera o como actividad? </b>Recuerde que sólo se guardarán waypoints lo suficientemente cerca del track al guardar como carrera. Los waypoints no se guardarán al guardar como actividad.</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
-        <source>Failed to create file '%1'</source>
-        <translation>Fallo al crear el archivo '%1'</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
-        <source>Failed to write file '%1'</source>
-        <translation>Fallo al escribir en el archivo '%1'</translation>
-    </message>
-    <message>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="435"/>
-        <location filename="../gis/tcx/CTcxProject.cpp" line="454"/>
-        <source>Saving GIS data failed...</source>
-        <translation>Error al guardar datos GIS</translation>
-    </message>
-</context>
-<context>
-    <name>CTemplateWidget</name>
-    <message>
-        <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
-        <source>choose one...</source>
-        <translation>elige una...</translation>
-    </message>
-    <message>
-        <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
-        <source>Hiking Tour Summary (built-in)</source>
-        <translation>Datos de la actividad (genérico)</translation>
-    </message>
-    <message>
-        <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
-        <source>Template path...</source>
-        <translation>Ruta de las Plantillas...</translation>
-    </message>
-    <message>
-        <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
-        <source>Failed to read template file %1.</source>
-        <translation>Fallo al leer la plantilla %1.</translation>
-    </message>
-    <message>
-        <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
-        <source>Preview...</source>
-        <translation>Previsualizar...</translation>
-    </message>
-</context>
-<context>
-    <name>CTextEditWidget</name>
-    <message>
-        <location filename="../widgets/CTextEditWidget.cpp" line="71"/>
-        <source>&Color...</source>
-        <translation>&Color...</translation>
-    </message>
-    <message>
-        <location filename="../widgets/CTextEditWidget.cpp" line="117"/>
-        <source>Reset format</source>
-        <translation>Restablecer formato</translation>
-    </message>
-</context>
-<context>
-    <name>CToolBarSetupDialog</name>
-    <message>
-        <location filename="../helpers/CToolBarSetupDialog.cpp" line="43"/>
-        <source>Available Actions</source>
-        <translation>Acciones disponibles</translation>
-    </message>
-    <message>
-        <location filename="../helpers/CToolBarSetupDialog.cpp" line="44"/>
-        <source>Selected Actions</source>
-        <translation>Acciones seleccionadas</translation>
-    </message>
-</context>
-<context>
-    <name>CTwoNavProject</name>
-    <message>
-        <location filename="../gis/tnv/serialization.cpp" line="560"/>
-        <location filename="../gis/tnv/serialization.cpp" line="588"/>
-        <location filename="../gis/tnv/serialization.cpp" line="599"/>
-        <location filename="../gis/tnv/serialization.cpp" line="617"/>
-        <location filename="../gis/tnv/serialization.cpp" line="645"/>
-        <location filename="../gis/tnv/serialization.cpp" line="719"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
-        <source>Error...</source>
-        <translation>Error...</translation>
-    </message>
-    <message>
-        <location filename="../gis/tnv/serialization.cpp" line="560"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
-        <source>Failed to open %1.</source>
-        <translation>Fallo al abrir %1.</translation>
-    </message>
-    <message>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="160"/>
-        <source>Save GIS data to...</source>
-        <translation>Guardar los datos GIS en...</translation>
-    </message>
-    <message>
-        <location filename="../gis/tnv/serialization.cpp" line="588"/>
-        <location filename="../gis/tnv/serialization.cpp" line="599"/>
-        <source>Only support lon/lat WGS 84 format.</source>
-        <translation>Solamente soporta formato lon/lat WGS84.</translation>
-    </message>
-    <message>
-        <location filename="../gis/tnv/serialization.cpp" line="617"/>
-        <location filename="../gis/tnv/serialization.cpp" line="645"/>
-        <location filename="../gis/tnv/serialization.cpp" line="719"/>
-        <source>Failed to read data.</source>
-        <translation>Fallo al leer los datos.</translation>
-    </message>
-</context>
-<context>
-    <name>CWptIconDialog</name>
-    <message>
-        <location filename="../helpers/CWptIconDialog.cpp" line="161"/>
-        <source>Path to user icons...</source>
-        <translation>Carpeta de iconos de usuario...</translation>
-    </message>
-</context>
-<context>
-    <name>Form</name>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
-        <source>Form</source>
-        <translation>Ficha</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
-        <source>Participants</source>
-        <translation>Participantes</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
-        <source>Weather</source>
-        <translation>Meteo</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
-        <source>rain</source>
-        <translation>lluvia</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
-        <source>sunny</source>
-        <translation>sol</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
-        <source>snow</source>
-        <translation>nieve</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
-        <source>clouds</source>
-        <translation>nubes</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
-        <source>windy</source>
-        <translation>viento</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
-        <source>hot</source>
-        <translation>caluroso</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
-        <source>warm</source>
-        <translation>templado</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
-        <source>cold</source>
-        <translation>frío</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
-        <source>freezing</source>
-        <translation>bajo cero</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
-        <source>foggy</source>
-        <translation>niebla</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
-        <source>humid</source>
-        <translation>humedad</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
-        <source>Character</source>
-        <translation>Carácter</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
-        <source>easy hiking</source>
-        <translation>Excursión fácil</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
-        <source>climbing</source>
-        <translation>escalada</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
-        <source>alpine</source>
-        <translation>Actividad alpina</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
-        <source>large ascend</source>
-        <translation>gran desnivel</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
-        <source>long distance</source>
-        <translation>larga distancia</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
-        <source>via ferrata</source>
-        <translation>ferrata</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
-        <source>hail/soft hail</source>
-        <translation>granizo</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
-        <source>Rating</source>
-        <translation>Calificación</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
-        <source>Rating 5 stars</source>
-        <translation>***** Excepcional</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
-        <source>Rating 4 stars</source>
-        <translation>**** Muy buena</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
-        <source>Rating 3 stars</source>
-        <translation>*** Buena</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
-        <source>Rating 2 stars</source>
-        <translation>** Regular</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
-        <source>Rating 1 star</source>
-        <translation>* Mala</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
-        <source>aborted</source>
-        <translation>Intento frustrado</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
-        <source>Equipment</source>
-        <translation>Material</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
-        <source>ferrata gear</source>
-        <translation>ferrata</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
-        <source>night gear</source>
-        <translation>iluminación</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
-        <source>snow shoes</source>
-        <translation>raquetas</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
-        <source>climbing gear</source>
-        <translation>escalada</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
-        <source>ski</source>
-        <translation>ski</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
-        <source>camping gear</source>
-        <translation>acampada / vivac</translation>
-    </message>
-    <message>
-        <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
-        <source>Details</source>
-        <translation>Detalles</translation>
-    </message>
-</context>
-<context>
-    <name>IAbout</name>
-    <message>
-        <location filename="../IAbout.ui" line="14"/>
-        <source>About....</source>
-        <translation>Acerca de...</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="55"/>
-        <source><b>QMapShack</b>, Version</source>
-        <translation><b>QMapShack</b>, Versión</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="62"/>
-        <location filename="../IAbout.ui" line="113"/>
-        <location filename="../IAbout.ui" line="127"/>
-        <location filename="../IAbout.ui" line="141"/>
-        <location filename="../IAbout.ui" line="155"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="106"/>
-        <source>Qt</source>
-        <translation>Qt</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="120"/>
-        <source>GDAL</source>
-        <translation>GDAL</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="134"/>
-        <source>Proj4</source>
-        <translation>Proj4</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="148"/>
-        <source>Routino</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="179"/>
-        <source>Czech:</source>
-        <translation>checo:</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="202"/>
-        <source>German:</source>
-        <translation>Alemán:</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="212"/>
-        <source>Oliver Eichler</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="225"/>
-        <source>Dutch:</source>
-        <translation>holandés:</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="248"/>
-        <source>French:</source>
-        <translation>Francés:</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="258"/>
-        <source>Rainer Unseld </source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="295"/>
-        <source>Russian:</source>
-        <translation>Ruso:</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="302"/>
-        <source>Wolfgang Thämelt</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="428"/>
-        <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="189"/>
-        <source>Pavel Fric</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="288"/>
-        <source><b>Translation:</b></source>
-        <translation><b>Traducción:</b></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="235"/>
-        <source>Harrie Klomp</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="278"/>
-        <source>Spanish:</source>
-        <translation>Español:</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="326"/>
-        <source>Win64:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="342"/>
-        <source>OS X:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="366"/>
-        <source><b>Binaries:</b></source>
-        <translation><b>Binarios:</b></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="395"/>
-        <source><b>Contributors:</b></source>
-        <translation><b>Colaboradores:</b></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="265"/>
-        <source>Jose Luis Domingo Lopez</source>
-        <translation>Jose Luis Domingo, Javi Segovia</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="359"/>
-        <source>Ivo Kronenberg</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="352"/>
-        <source>Helmut Schmidt</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="375"/>
-        <source>...and thanks to all Linux binary maintainers for doing a great job. Special thanks to Dan Horák and Bas Couwenberg for showing presence on the mailing list to discuss distribution related topics.</source>
-        <translation>... y gracias a todos los mantenedores  de Linux por hacer un gran trabajo. Agradecimientos especiales a Dan Horák y Bas Couwenberg por estar presentes en la lista de correo para discutir temas relacionados con la distribución</translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="402"/>
-        <source>Christian Eichler (qms at christian-eichler.de)
-Ivo Kronenberg
-Norbert Truchsess (norbert.truchsess at t-online.de)</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../IAbout.ui" line="421"/>
-        <source>This software is licensed under GPL3 or any later version</source>
-        <translation>Este software esta bajo licencia GPL3 o posterior</translation>
-    </message>
-</context>
-<context>
-    <name>ICanvasSetup</name>
-    <message>
-        <location filename="../canvas/ICanvasSetup.ui" line="14"/>
-        <source>Setup Map View...</source>
-        <translation>Configurar Vista de Mapa...</translation>
-    </message>
-    <message>
-        <location filename="../canvas/ICanvasSetup.ui" line="22"/>
-        <source>Projection & Datum</source>
-        <translation>Proyección y Datum</translation>
-    </message>
-    <message>
-        <location filename="../canvas/ICanvasSetup.ui" line="32"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../canvas/ICanvasSetup.ui" line="53"/>
-        <source>Scales</source>
-        <translation>Escalas</translation>
-    </message>
-    <message>
-        <location filename="../canvas/ICanvasSetup.ui" line="59"/>
-        <source>Logarithmic</source>
-        <translation>Logarítmica</translation>
-    </message>
-    <message>
-        <location filename="../canvas/ICanvasSetup.ui" line="66"/>
-        <source>Square (optimized for TMS and WMTS tiles)</source>
-        <translation>Cuadrada (optimizada para teselas TMS y WMTS)</translation>
-    </message>
-</context>
-<context>
-    <name>IColorChooser</name>
-    <message>
-        <location filename="../widgets/IColorChooser.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-</context>
-<context>
-    <name>ICombineTrk</name>
-    <message>
-        <location filename="../gis/trk/ICombineTrk.ui" line="14"/>
-        <source>Combine Tracks...</source>
-        <translation>Combinar Tracks...</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
-        <source>Available Tracks</source>
-        <translation>Tracks disponibles</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
-        <location filename="../gis/trk/ICombineTrk.ui" line="81"/>
-        <location filename="../gis/trk/ICombineTrk.ui" line="139"/>
-        <location filename="../gis/trk/ICombineTrk.ui" line="166"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
-        <source>Combined Tracks</source>
-        <translation>Tracks combinados</translation>
-    </message>
-</context>
-<context>
-    <name>ICoordFormatSetup</name>
-    <message>
-        <location filename="../units/ICoordFormatSetup.ui" line="14"/>
-        <source>Coordinate Format...</source>
-        <translation>Formato de coordenadas...</translation>
-    </message>
-    <message>
-        <location filename="../units/ICoordFormatSetup.ui" line="36"/>
-        <source>N48° 53.660 E013° 31.113</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../units/ICoordFormatSetup.ui" line="29"/>
-        <source>N48.8943° E013.51855°</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../units/ICoordFormatSetup.ui" line="22"/>
-        <source>N48° 53' 39.6" E13° 31' 6.78"</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ICreateRouteFromWpt</name>
-    <message>
-        <location filename="../gis/rte/ICreateRouteFromWpt.ui" line="14"/>
-        <source>Create Route from Waypoints</source>
-        <translation>Crear rutas con los waypoints</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/ICreateRouteFromWpt.ui" line="30"/>
-        <location filename="../gis/rte/ICreateRouteFromWpt.ui" line="50"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>ICutTrk</name>
-    <message>
-        <location filename="../gis/trk/ICutTrk.ui" line="14"/>
-        <source>Cut Track</source>
-        <translation>Dividir track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/ICutTrk.ui" line="20"/>
-        <source>Delete first part of the track and keep second one</source>
-        <translation>Borrar primera parte del track y conservar la segunda</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/ICutTrk.ui" line="30"/>
-        <source>Keep both parts of the track</source>
-        <translation>Mantener ambas partes del track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/ICutTrk.ui" line="43"/>
-        <source>Keep first part of the track and delete second one</source>
-        <translation>Conservar primera parte del track y borrar la segunda</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/ICutTrk.ui" line="55"/>
-        <source>Cut Mode:</source>
-        <translation>Modo de división</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/ICutTrk.ui" line="136"/>
-        <source>Check this to store the result into a new track. 
-
-If you keep both parts of the track you have to create new ones. 
-
-If you want to keep just one half you can simply remove the points, or check this to create a new track.</source>
-        <translation>Compruebe esto para almacenar el resultado en un nuevo track.
-
-Si mantiene ambas partes del track, tiene que crear otros nuevos.
-
-Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marcar esto para crear un nuevo track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/ICutTrk.ui" line="143"/>
-        <source>Create a new track</source>
-        <translation>Crear nuevo track</translation>
-    </message>
-</context>
-<context>
-    <name>IDB</name>
-    <message>
-        <location filename="../gis/db/IDB.cpp" line="60"/>
-        <source>The internal database format of '%1' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
-        <translation>El formato interno de base de datos de  '%1' ha cambiado. QMapShack hará la conversión de tu base de datos ahora.Después de esta conversión la nueva base de datos no puede utilizarse en versiones más antiguas de QMapShack. Se recomienda hacer una copia de seguridad antes de comenzar.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDB.cpp" line="64"/>
-        <source>Migrate database...</source>
-        <translation>Migrar base de datos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDB.cpp" line="69"/>
-        <source>Migration aborted by user</source>
-        <translation>Migracion cancelada por el usuario</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDB.cpp" line="75"/>
-        <source>Failed to migrate '%1'.</source>
-        <translation>Fallo al migrar '%1'.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDB.cpp" line="77"/>
-        <location filename="../gis/db/IDB.cpp" line="106"/>
-        <source>Error...</source>
-        <translation>Error...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDB.cpp" line="81"/>
-        <source>Migration failed</source>
-        <translation>La migración falló</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDB.cpp" line="88"/>
-        <source>The database version of '%1' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
-        <translation>La versión de base de datos '%1' Está más avanzado que el entendido por su instalación de QMapShack. Esto no funcionará.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDB.cpp" line="110"/>
-        <source>Initialization failed</source>
-        <translation>Inicializacion fallida</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDB.cpp" line="91"/>
-        <source>Wrong database version...</source>
-        <translation>Versión errónea de la base de datos</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDB.cpp" line="95"/>
-        <source>Database created by newer version of QMapShack</source>
-        <translation>Base de datos creada por la nueva versión de QMapShack</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDB.cpp" line="104"/>
-        <source>Failed to initialize '%1'.</source>
-        <translation>Fallo al iniciar '%1'.</translation>
-    </message>
-</context>
-<context>
-    <name>IDBMysql</name>
-    <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
-        <source>Password...</source>
-        <translation>Contraseña...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
-        <source>Password for database '%1':</source>
-        <translation>Contraseña de la base de datos '%1':</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="222"/>
-        <source>Update to database version 5. Migrate all GIS items.</source>
-        <translation>Actualizar a versión 5 de base de datos. Migrar todos los elementos GIS.</translation>
-    </message>
-</context>
-<context>
-    <name>IDBSqlite</name>
-    <message>
-        <location filename="../gis/db/IDBSqlite.cpp" line="306"/>
-        <source>Update to database version 3. Migrate all GIS items.</source>
-        <translation>Actualizar base de datos a versión 3. Migrar todos los elementos GIS</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDBSqlite.cpp" line="375"/>
-        <source>Update to database version 5. Migrate all GIS items.</source>
-        <translation>Actualizar base de datos a versión 5. Migrar todos los elementos GIS</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IDBSqlite.cpp" line="449"/>
-        <source>Update to database version 6. Migrate all GIS items.</source>
-        <translation>Actualizar base de datos a versión 6. Migrar todos los elementos GIS</translation>
-    </message>
-</context>
-<context>
-    <name>IDemPathSetup</name>
-    <message>
-        <location filename="../dem/IDemPathSetup.ui" line="14"/>
-        <source>Setup DEM file paths</source>
-        <translation>Configurar carpeta de archivos DEM</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPathSetup.ui" line="31"/>
-        <location filename="../dem/IDemPathSetup.ui" line="51"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPathSetup.ui" line="112"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-</context>
-<context>
-    <name>IDemPropSetup</name>
-    <message>
-        <location filename="../dem/IDemPropSetup.ui" line="14"/>
-        <source>Form</source>
-        <translation>ficha</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPropSetup.ui" line="35"/>
-        <source><html><head/><body><p>Change opacity of map</p></body></html></source>
-        <translation><html><head/><body><p>Cambiar la opacidad del mapa</p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPropSetup.ui" line="50"/>
-        <source><html><head/><body><p>Click to use current scale as minimum scale to display the map.</p></body></html></source>
-        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala mínima a la que mostrar el mapa.</p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPropSetup.ui" line="53"/>
-        <location filename="../dem/IDemPropSetup.ui" line="90"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPropSetup.ui" line="74"/>
-        <source><html><head/><body><p>Control the range of scale the map is displayed. Use the two buttons left and right to define the actual scale as either minimum or maximum scale.</p></body></html></source>
-        <translation><html><head/><body><p>Controle el rango de escalas para las cuales desea que se muestre el mapa. Use los dos botones a izquierda y derecha para definir la escala actual como  la escala mínima o máxima para el mapa.</p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPropSetup.ui" line="87"/>
-        <source><html><head/><body><p>Click to use current scale as maximum scale to display the map.</p></body></html></source>
-        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala máxima a la que mostrar el mapa</p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPropSetup.ui" line="118"/>
-        <source>Hillshading</source>
-        <translation>Sombreado</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPropSetup.ui" line="144"/>
-        <source>Slope </source>
-        <translation>Pendiente</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPropSetup.ui" line="226"/>
-        <location filename="../dem/IDemPropSetup.ui" line="326"/>
-        <location filename="../dem/IDemPropSetup.ui" line="410"/>
-        <location filename="../dem/IDemPropSetup.ui" line="494"/>
-        <location filename="../dem/IDemPropSetup.ui" line="578"/>
-        <source>°</source>
-        <translation>º</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPropSetup.ui" line="229"/>
-        <location filename="../dem/IDemPropSetup.ui" line="329"/>
-        <location filename="../dem/IDemPropSetup.ui" line="413"/>
-        <location filename="../dem/IDemPropSetup.ui" line="497"/>
-        <location filename="../dem/IDemPropSetup.ui" line="581"/>
-        <source>> </source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemPropSetup.ui" line="251"/>
-        <location filename="../dem/IDemPropSetup.ui" line="270"/>
-        <location filename="../dem/IDemPropSetup.ui" line="354"/>
-        <location filename="../dem/IDemPropSetup.ui" line="438"/>
-        <location filename="../dem/IDemPropSetup.ui" line="522"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-</context>
-<context>
-    <name>IDemsList</name>
-    <message>
-        <location filename="../dem/IDemList.ui" line="14"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemList.ui" line="118"/>
-        <source>To add files with elevation data use <b>File->Setup DEM Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
-        <translation>Para añadir archivos con datos de altitud <b>File->configure rutas de DEM</b>.  O clic <a href='setup'><b>aqui</b></a></translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemList.ui" line="131"/>
-        <source>Use the context menu (right mouse button click on entry) to activate a file. Use drag-n-drop to move the activated file in the process order. </source>
-        <translation>Use el menú contextual (botón derecho del ratón y seleccione) para activar un archivo. Use arrastrar y soltar para mover el archivo activado en el orden de procesamiento.</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemList.ui" line="156"/>
-        <source>Activate</source>
-        <translation>Activar</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemList.ui" line="165"/>
-        <source>Move Up</source>
-        <translation>Subir</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemList.ui" line="168"/>
-        <source>Hide DEM behind previous one</source>
-        <translation>Ocultar DEM detrás del anterior</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemList.ui" line="177"/>
-        <source>Move down</source>
-        <translation>Bajar</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemList.ui" line="180"/>
-        <source>Show DEM on top of next one</source>
-        <translation>Mostrar DEM encima del siguiente</translation>
-    </message>
-    <message>
-        <location filename="../dem/IDemList.ui" line="189"/>
-        <source>Reload DEM</source>
-        <translation>Recargar DEM's</translation>
-    </message>
-</context>
-<context>
-    <name>IDetailsGeoCache</name>
-    <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="20"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="47"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="73"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="86"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="99"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="112"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="125"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="151"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="164"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="177"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="190"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="203"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="252"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="267"/>
-        <source>about:blank</source>
-        <translation>about:blank</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="40"/>
-        <source>Position:</source>
-        <translation>Posición:</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="60"/>
-        <source>Difficulty</source>
-        <translation>Dificultad</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="138"/>
-        <source>Terrain</source>
-        <translation>Terreno</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="214"/>
-        <source>Update spoilers</source>
-        <translation>Actualizar spoilers</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="217"/>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="275"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="293"/>
-        <source>Hint:</source>
-        <translation>Consejo:</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="324"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-</context>
-<context>
-    <name>IDetailsOvlArea</name>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
-        <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation>El área se importó a QMapShack y se cambió. Ya no muestra los datos originales. Consulte el historial de cambios</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="148"/>
-        <source>Toggle read only mode. You have to open the lock to edit the item.</source>
-        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="151"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="181"/>
-        <source>Color</source>
-        <translation>Color</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="202"/>
-        <source>Border width</source>
-        <translation>Ancho del borde</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="216"/>
-        <source>Style</source>
-        <translation>Estilo</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="235"/>
-        <source>Opacity</source>
-        <translation>Opacidad</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="248"/>
-        <source>Info</source>
-        <translation>Información</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="277"/>
-        <source>Points</source>
-        <translation>Puntos</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="304"/>
-        <source>Position</source>
-        <translation>Posición</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="313"/>
-        <source>Hist.</source>
-        <translation>Historial</translation>
-    </message>
-</context>
-<context>
-    <name>IDetailsPrj</name>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="14"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="50"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="57"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
-        <source>Print diary</source>
-        <translation>Imprimir diario</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="71"/>
-        <source>Keep order of project</source>
-        <translation>Mantenga el orden del proyecto</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
-        <source>Sort along track (multiple)</source>
-        <translation>Ordenar a lo largo del track (múltiples)</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
-        <source>Sort along track (single)</source>
-        <translation>Ordenar a lo largo del track (único)</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
-        <source>Rebuild diary.</source>
-        <translation>Recargar diario.</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="43"/>
-        <source>Keywords:</source>
-        <translation>Etiquetas:</translation>
-    </message>
-</context>
-<context>
-    <name>IDetailsRte</name>
-    <message>
-        <location filename="../gis/rte/IDetailsRte.ui" line="36"/>
-        <source>Info</source>
-        <translation>Información</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
-        <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation>La ruta se importó a QMapShack y se cambió. Ya no muestra los datos originales. Consulte el historial de cambios.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IDetailsRte.ui" line="205"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IDetailsRte.ui" line="170"/>
-        <source>Toggle read only mode. You have to open the lock to edit the item.</source>
-        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IDetailsRte.ui" line="173"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IDetailsRte.ui" line="229"/>
-        <source>Hist.</source>
-        <translation>Historial</translation>
-    </message>
-</context>
-<context>
-    <name>IDetailsTrk</name>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="14"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="81"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="105"/>
-        <source>-
--</source>
-        <translation>-
--</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
-        <source>Use/edit user defined visibility of arrows for this track</source>
-        <translation>Utilizar / editar la visibilidad definida por el usuario de las flechas de este track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="480"/>
-        <source>Use/edit system's visibility of arrows for all tracks</source>
-        <translation>Utilizar / editar la visibilidad definida por el usuario de las flechas de todos los track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="689"/>
-        <source>Use/edit user defined scale factor for this track</source>
-        <translation>Utilizar / editar el factor de escala de este track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="718"/>
-        <source>Use/edit system's default factor for all tracks</source>
-        <translation>Utilice / edite el factor predeterminado del sistema para todas los tracks</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
-        <source>max.</source>
-        <translation>max.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="994"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1001"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1015"/>
-        <source>min.</source>
-        <translation>min.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="545"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1047"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1144"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1241"/>
-        <source>User defined limits for this track</source>
-        <translation>Límites definidos por el usuario para este track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1076"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1173"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1270"/>
-        <source>Automatic limits</source>
-        <translation>Límites automáticos</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
-        <source>User defined limits for all tracks</source>
-        <translation>Límites definidos por el usuario para todos los track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1495"/>
-        <source>Speed</source>
-        <translation>Velocidad</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="287"/>
-        <source>Toggle read only mode. You have to open the lock to edit the item.</source>
-        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="290"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="454"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="548"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="574"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="603"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="692"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="721"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1050"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1079"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1111"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1147"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1176"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1208"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1244"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1273"/>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1305"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="387"/>
-        <source>Style</source>
-        <translation>Estilo</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="429"/>
-        <source>Source</source>
-        <translation>Atributo</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="634"/>
-        <source>Maximum</source>
-        <translation>Máximo</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="774"/>
-        <source>Minimum</source>
-        <translation>Mínimo</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
-        <source>x </source>
-        <translation>x </translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
-        <source>-
--
--</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
-        <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation>El track se ha importado a QMapShack y se ha editado. No muestra los datos originales. Consulte el historial de cambios.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
-        <source>Width</source>
-        <translation>Anchura</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
-        <source>with arrows</source>
-        <translation>Con flechas</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
-        <source>Color</source>
-        <translation>Color</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
-        <source>Graphs</source>
-        <translation>Gráficos</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
-        <source>Activity</source>
-        <translation>Actividad</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
-        <source>Set Track Activity</source>
-        <translation>Establecer actividad del track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1400"/>
-        <source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
-        <translation>Para diferenciar las estadísticas seleccione una actividad de la lista para todo el track,o bien, seleccione una parte para asignar una actividad.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1427"/>
-        <source>Points</source>
-        <translation>Puntos</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
-        <source>Time</source>
-        <translation>Tiempo</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
-        <source>Ele.</source>
-        <translation>Altitud.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
-        <source>Delta</source>
-        <translation>Delta</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
-        <source>Dist.</source>
-        <translation>Distancia</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1500"/>
-        <source>Slope</source>
-        <translation>Pendiente</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1515"/>
-        <source>Position</source>
-        <translation>Posición</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
-        <source>Info</source>
-        <translation>Información</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1505"/>
-        <source>Ascent</source>
-        <translation>Ascenso</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1510"/>
-        <source>Descent</source>
-        <translation>Descenso</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1524"/>
-        <source>Filter</source>
-        <translation>Filtro</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1561"/>
-        <source>Hist.</source>
-        <translation>Historial</translation>
-    </message>
-</context>
-<context>
-    <name>IDetailsWpt</name>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
-        <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation>El waypoint se importó a QMapShack y se cambió. Ya no muestra los datos originales. Consulte el historial de cambios.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="284"/>
-        <source>Toggle read only mode. You have to open the lock to edit the item.</source>
-        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="287"/>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="342"/>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="362"/>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="394"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="77"/>
-        <source>Position:</source>
-        <translation>Posición:</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="43"/>
-        <source>Info</source>
-        <translation>Información</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="84"/>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="110"/>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="136"/>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="328"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="97"/>
-        <source>Ele.</source>
-        <translation>Altitud.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="123"/>
-        <source>Proximity:</source>
-        <translation>Proximidad:</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="413"/>
-        <source>Hist.</source>
-        <translation>Historial</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="339"/>
-        <source>Add images.</source>
-        <translation>Añadir imagenes.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="359"/>
-        <source>Delete selected image.</source>
-        <translation>Eliminar imagen seleccionada.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IDetailsWpt.ui" line="321"/>
-        <source>Date/Time:</source>
-        <translation>Fecha/Hora:</translation>
-    </message>
-</context>
-<context>
-    <name>IDevice</name>
-    <message>
-        <location filename="../device/IDevice.cpp" line="292"/>
-        <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
-        <translation>Hay otro proyecto con el mismo nombre. Si pulsa 'ok'será eliminado y reemplazado.</translation>
-    </message>
-</context>
-<context>
-    <name>IElevationDialog</name>
-    <message>
-        <location filename="../helpers/IElevationDialog.ui" line="14"/>
-        <source>Edit elevation...</source>
-        <translation>Editar altitud...</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IElevationDialog.ui" line="22"/>
-        <source>Elevation</source>
-        <translation>Altitud</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IElevationDialog.ui" line="32"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IElevationDialog.ui" line="39"/>
-        <source>Get elevation from active digital elevation model.</source>
-        <translation>Obtener la altitud desde el DEM activo.</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IElevationDialog.ui" line="42"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IExportDatabase</name>
-    <message>
-        <location filename="../gis/db/IExportDatabase.ui" line="14"/>
-        <source>Export database to GPX...</source>
-        <translation>Exportar base de datos a GPX</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IExportDatabase.ui" line="22"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IExportDatabase.ui" line="33"/>
-        <source>Export Path:</source>
-        <translation>Carpeta de exportación</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IExportDatabase.ui" line="46"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IExportDatabase.ui" line="55"/>
-        <source>GPX 1.1 without extensions</source>
-        <translation>GPX 1.1 sin extensiones</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IExportDatabase.ui" line="83"/>
-        <source>Start</source>
-        <translation>Comenzar</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IExportDatabase.ui" line="93"/>
-        <source>Abort</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/IExportDatabase.ui" line="100"/>
-        <source>Close</source>
-        <translation>Cerrar</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterDelete</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDelete.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDelete.ui" line="51"/>
-        <source><b>Remove Track Points</b></source>
-        <translation><b>Eliminar puntos del Track</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDelete.ui" line="63"/>
-        <source>Remove all hidden track points permanently.</source>
-        <translation>Eliminar todos los puntos ocultos del track definitavamente.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDelete.ui" line="70"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterDeleteExtension</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="51"/>
-        <source><b>Remove Extension from all Track Points</b></source>
-        <translation><b>Eliminar extensión para todos los puntos del track</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="63"/>
-        <source>Remove </source>
-        <translation>Eliminar</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="83"/>
-        <source>from all Track Points</source>
-        <translation>de todos los puntos del track</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="103"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterDouglasPeuker</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="45"/>
-        <source><b>Hide Points (Douglas Peuker)</b></source>
-        <translation><b>Ocultar Puntos (Douglas Peuker)</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="57"/>
-        <source>Hide track points if the distance to a line between neighboring points is less than</source>
-        <translation>Ocultar puntos del track si la distancia a una linea entre puntos vecinos es menor que</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="70"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="93"/>
-        <source>Apply filter now.</source>
-        <translation>Aplicar filtro ahora.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="96"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterInterpolateElevation</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="51"/>
-        <source><b>Interpolate Elevation Data</b></source>
-        <translation><b>Interpolar datos de altitud</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="69"/>
-        <source>Replace elevation of track points with interpolated data.</source>
-        <translation>Sustituir la altitud de los puntos del track con datos interpolados.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="76"/>
-        <source>Quality</source>
-        <translation>Calidad</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="105"/>
-        <source>Preview</source>
-        <translation>Vista previa</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="112"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterInvalid</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterInvalid.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterInvalid.ui" line="41"/>
-        <source>Hide Invalid Points</source>
-        <translation>Ocultar puntos inválidos</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterInvalid.ui" line="56"/>
-        <source>Hide points with invalid data.</source>
-        <translation>Ocultar puntos con datos no válidos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterInvalid.ui" line="63"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterMedian</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterMedian.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterMedian.ui" line="51"/>
-        <source><b>Smooth Profile (Median Method)</b></source>
-        <translation><b>Suavizar Perfil (Mediana)</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterMedian.ui" line="63"/>
-        <source>Smooth deviation of the track points elevation with a Median filter of size </source>
-        <translation>Suavizar el desvio de la altitud de los puntos del track con la Mediana de</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterMedian.ui" line="76"/>
-        <source>points</source>
-        <translation>puntos</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterMedian.ui" line="105"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterNewDate</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="35"/>
-        <source><b>Change Time</b></source>
-        <translation><b>Cambiar Fecha/hora</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="44"/>
-        <source>Change start of track to </source>
-        <translation>Modificar el inicio del track a </translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="51"/>
-        <source>dd.MM.yy HH:mm:ss</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="61"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="81"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterObscureDate</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="45"/>
-        <source><b>Obscure Timestamps</b></source>
-        <translation><b>Ocultar Marcas de tiempo</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="54"/>
-        <source>Increase timestamp by</source>
-        <translation>Incrementar marca de tiempo en</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="61"/>
-        <source> sec.</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="68"/>
-        <source>with each track point. 0 sec. will remove timestamps.</source>
-        <translation>con cada punto del track. ( 0 sec. eliminará las marcas de tiempo).</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="88"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterOffsetElevation</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="51"/>
-        <source><b>Offset Elevation</b></source>
-        <translation><b>Desplazar altitud</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="69"/>
-        <source>Add offset of</source>
-        <translation>Añadir corrección de </translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="95"/>
-        <source>to track points elevation.</source>
-        <translation>a la altitud de los puntos del track.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="115"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterReplaceElevation</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="51"/>
-        <source><b>Replace Elevation Data</b></source>
-        <translation><b>Reemplazar Datos de altitud</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="63"/>
-        <source>Replace elevation of track points with the values from loaded DEM files.</source>
-        <translation>Reemplazar altitud de los puntos del track utilizando los valores del fichero DEM cargado.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="70"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterReset</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterReset.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterReset.ui" line="35"/>
-        <source><b>Reset Hidden Track Points</b></source>
-        <translation><b>Restaurar Puntos Ocultos del Track</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterReset.ui" line="47"/>
-        <source>Make all trackpoints visible again.</source>
-        <translation>Hacer visibles de nuevo todos los puntos del track.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterReset.ui" line="54"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterSpeed</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSpeed.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSpeed.ui" line="35"/>
-        <source><b>Change Speed</b></source>
-        <translation><b>Modificar Velocidad</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSpeed.ui" line="44"/>
-        <source>Set speed to </source>
-        <translation>Ajustar velocidad a </translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSpeed.ui" line="51"/>
-        <source> km/h</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSpeed.ui" line="102"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterSplitSegment</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="51"/>
-        <source><html><head/><body><p><span style=" font-weight:600;">Split Segments into Tracks</span></p></body></html></source>
-        <translation><html><head/><body><p><span style=" font-weight:600;">Dividir el track en segmentos</span></p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="63"/>
-        <source>Creates a new track for every segment within this track.</source>
-        <translation>Crea un nuevo track por cada segmento de este track.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="70"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterSubPt2Pt</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="35"/>
-        <source><b>Convert track subpoints to points</b></source>
-        <translation><b>Convertir subpuntos de track en puntos</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="47"/>
-        <source>Convert subpoints obtained from routing to ordinary track points </source>
-        <translation>Convierta subpuntos obtenidos por el enrutamiento a puntos de track ordinarios</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="54"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFilterTerrainSlope</name>
-    <message>
-        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="51"/>
-        <source><b>Calculate Terrain Slope</b></source>
-        <translation><b>Calcular pendiente del terreno</b></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="63"/>
-        <source>Calculate slope of the terrain based on loaded DEM files.</source>
-        <translation>Calcular pendiente del terreno en base a los DEM cargados.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="70"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IFitDecoderState</name>
-    <message>
-        <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="31"/>
-        <source>FIT decoding error: Decoder not in correct state %1 after last data byte in file.</source>
-        <translation>Error decodificando FIT: El decodificador no está en el estado correcto %1 después del último byte de datos en el archivo.</translation>
-    </message>
-    <message>
-        <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="124"/>
-        <source>FIT decoding error: a development field with the field_definition_number %1 already exists.</source>
-        <translation>Error decodificando FIT: Ya existe un campo con el número de definición %1.</translation>
-    </message>
-</context>
-<context>
-    <name>IGisItem</name>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="44"/>
-        <source>[no name]</source>
-        <translation>[sin nombre]</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
-        <source>The item is not part of the project in the database.</source>
-        <translation>El elemento no forma parte del proyecto en la base de datos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="317"/>
-        <source>
-It is either a new item or it has been deleted in the database by someone else.</source>
-        <translation>
-Es un elemento nuevo o ha sido eliminado en la base de datos por otra persona</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="323"/>
-        <source>The item is not in the database.</source>
-        <translation>El elemento no está en la base de datos</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="329"/>
-        <source>The item might need to be saved</source>
-        <translation>Es posible que deba guardar el elemento</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="413"/>
-        <source>Initial version.</source>
-        <translation>Versión inicial</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="529"/>
-        <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
-        <translation><h3>%1</h3> Posiblemente este elemento es de sólo lectura porque no lo creó QMapShack. Por lo general no es conveniente cambiar los datos importados. Pero si piensa que esta bien, presione 'Ok'.</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="530"/>
-        <source>Read Only Mode...</source>
-        <translation>Modo Sólo Lectura...</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="700"/>
-        <location filename="../gis/IGisItem.cpp" line="753"/>
-        <source><h4>Description:</h4></source>
-        <translation><h4>Descripción:</h4></translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="703"/>
-        <location filename="../gis/IGisItem.cpp" line="756"/>
-        <source><p>--- no description ---</p></source>
-        <translation><p>---sin descripción---</p></translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="714"/>
-        <source><h4>Comment:</h4></source>
-        <translation><h4>Comentario:</h4></translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="717"/>
-        <source><p>--- no comment ---</p></source>
-        <translation><p>--- Sin comentario ---</p></translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="728"/>
-        <location filename="../gis/IGisItem.cpp" line="767"/>
-        <source><h4>Links:</h4></source>
-        <translation><h4>Enlaces:</h4></translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="731"/>
-        <location filename="../gis/IGisItem.cpp" line="770"/>
-        <source><p>--- no links ---</p></source>
-        <translation><p>--- sin enlaces ---</p></translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
-        <source>Edit name...</source>
-        <translation>Editar nombre...</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
-        <source>Enter new %1 name.</source>
-        <translation>Introducir nuevo nombre de %1</translation>
-    </message>
-</context>
-<context>
-    <name>IGisProject</name>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
-        <source>Save project?</source>
-        <translation>¿Guardar proyecto?</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
-        <source><h3>%1</h3>The project was changed. Save before closing it?</source>
-        <translation><h3>%1</h3>Ha habido cambios en el proyecto. ¿Guardar antes de cerrar?</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="356"/>
-        <source>%1: Correlate tracks and waypoints.</source>
-        <translation>%1: Correlacionar tracks y waypoints</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="366"/>
-        <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
-        <translation><h3>%1</h3>¿Desea omitir la correlación de pistas y waypoints para este proyecto en el futuro?</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="367"/>
-        <source>Canceled correlation...</source>
-        <translation>Correlación cancelada</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="412"/>
-        <location filename="../gis/prj/IGisProject.cpp" line="469"/>
-        <source>Save "%1" to...</source>
-        <translation>Guardar "%1" como...</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="554"/>
-        <source><br/>
-Filename: %1</source>
-        <translation><br/>
-Nombre de archivo %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="559"/>
-        <source>Waypoints: %1</source>
-        <translation>Waypoints: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="563"/>
-        <source>Tracks: %1</source>
-        <translation>Tracks: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="567"/>
-        <source>Routes: %1</source>
-        <translation>Rutas: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="571"/>
-        <source>Areas: %1</source>
-        <translation>Áreas: %1</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="691"/>
-        <source>Are you sure you want to delete '%1' from project '%2'?</source>
-        <translation>¿Desea realmente eliminar '%1' del proyecto '%2'?</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="692"/>
-        <source>Delete...</source>
-        <translation>Borrar...</translation>
-    </message>
-</context>
-<context>
-    <name>IGisWidget</name>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="43"/>
-        <source>Opacity</source>
-        <translation>Opacidad</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="50"/>
-        <source>Change the opacity of all GIS Items on the map.</source>
-        <translation>Cambiar opacidad para todos los elementos GIS del mapa</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="66"/>
-        <source>Filter</source>
-        <translation>Filtro</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="116"/>
-        <location filename="../gis/IGisWidget.ui" line="146"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="151"/>
-        <source>Age</source>
-        <translation>Edad</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="185"/>
-        <source>To add a database do a right click on the database list above.</source>
-        <translation>Para añadir una base de datos haga click-derecho en el espacio superior.  </translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="205"/>
-        <source>Clear Filter</source>
-        <translation>Borrar filtro</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="214"/>
-        <source>Setup Filter</source>
-        <translation>Configurar filtro</translation>
-    </message>
-</context>
-<context>
-    <name>IGridSetup</name>
-    <message>
-        <location filename="../grid/IGridSetup.ui" line="14"/>
-        <source>Setup Grid...</source>
-        <translation>Configurar Malla...</translation>
-    </message>
-    <message>
-        <location filename="../grid/IGridSetup.ui" line="22"/>
-        <source>Projection</source>
-        <translation>Proyección</translation>
-    </message>
-    <message>
-        <location filename="../grid/IGridSetup.ui" line="37"/>
-        <source>restore default</source>
-        <translation>restaurar valores predeterminados</translation>
-    </message>
-    <message>
-        <location filename="../grid/IGridSetup.ui" line="40"/>
-        <location filename="../grid/IGridSetup.ui" line="66"/>
-        <location filename="../grid/IGridSetup.ui" line="92"/>
-        <location filename="../grid/IGridSetup.ui" line="146"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../grid/IGridSetup.ui" line="63"/>
-        <source>Get projection from current map.</source>
-        <translation>Obtener la proyección desde el mapa actual.</translation>
-    </message>
-    <message>
-        <location filename="../grid/IGridSetup.ui" line="89"/>
-        <source>projection wizzard</source>
-        <translation>asistente de proyección</translation>
-    </message>
-    <message>
-        <location filename="../grid/IGridSetup.ui" line="130"/>
-        <source>Grid color</source>
-        <translation>Color de la malla</translation>
-    </message>
-    <message>
-        <location filename="../grid/IGridSetup.ui" line="143"/>
-        <source>setup grid color</source>
-        <translation>Configurar el color de la malla</translation>
-    </message>
-</context>
-<context>
-    <name>IImportDatabase</name>
-    <message>
-        <location filename="../tool/IImportDatabase.ui" line="14"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../tool/IImportDatabase.ui" line="45"/>
-        <source>Source Database:</source>
-        <translation>Origen de Base de datos:</translation>
-    </message>
-    <message>
-        <location filename="../tool/IImportDatabase.ui" line="52"/>
-        <location filename="../tool/IImportDatabase.ui" line="93"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../tool/IImportDatabase.ui" line="22"/>
-        <location filename="../tool/IImportDatabase.ui" line="63"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../tool/IImportDatabase.ui" line="86"/>
-        <source>Target Database:</source>
-        <translation>Destino de Base de Datos:</translation>
-    </message>
-    <message>
-        <location filename="../tool/IImportDatabase.ui" line="102"/>
-        <source>Start</source>
-        <translation>Comenzar</translation>
-    </message>
-</context>
-<context>
-    <name>IInputDialog</name>
-    <message>
-        <location filename="../helpers/IInputDialog.ui" line="14"/>
-        <source>Edit...</source>
-        <translation>Editar...</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IInputDialog.ui" line="20"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-</context>
-<context>
-    <name>ILineOp</name>
-    <message>
-        <location filename="../mouse/line/ILineOp.cpp" line="212"/>
-        <source>Routing</source>
-        <translation>Enrutamiento</translation>
-    </message>
-</context>
-<context>
-    <name>ILinksDialog</name>
-    <message>
-        <location filename="../helpers/ILinksDialog.ui" line="14"/>
-        <source>Links...</source>
-        <translation>Enlaces...</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ILinksDialog.ui" line="23"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ILinksDialog.ui" line="28"/>
-        <source>Text</source>
-        <translation>Texto</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ILinksDialog.ui" line="33"/>
-        <source>Uri</source>
-        <translation>Uri</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ILinksDialog.ui" line="43"/>
-        <location filename="../helpers/ILinksDialog.ui" line="63"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IMainWindow</name>
-    <message>
-        <location filename="../IMainWindow.ui" line="17"/>
-        <source>QMapShack</source>
-        <translation>QMapShack</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="63"/>
-        <source>File</source>
-        <translation>Archivo</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="80"/>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="103"/>
-        <source>Window</source>
-        <translation>Ventana</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="113"/>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="121"/>
-        <source>Project</source>
-        <translation>Proyecto</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="132"/>
-        <source>Tool</source>
-        <translation>Herramientas</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="157"/>
-        <source>Maps</source>
-        <translation>Mapas</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="200"/>
-        <source>Dig. Elev. Model (DEM)</source>
-        <translatorcomment>la traducción literal "Modelo Digital del Terreno " es demasiado larga para el titulo de las pestaña, y hace que se oculten otras pestañas. Por ello  se ha sustituido por su abreviatura "MDT" de uso frecuente, y también empleada por el IGN</translatorcomment>
-        <translation>MDT (DEM)</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="239"/>
-        <source>Data</source>
-        <translation>Datos</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="257"/>
-        <source>Route</source>
-        <translation>Ruta</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="287"/>
-        <source>Toolbar</source>
-        <translation>Barra de herramientas</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="302"/>
-        <location filename="../IMainWindow.ui" line="305"/>
-        <source>Add Map View</source>
-        <translation>Añadir Vista de Mapa</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="308"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="323"/>
-        <source>Show Scale</source>
-        <translation>Mostrar Escala</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="335"/>
-        <source>Setup Map Font</source>
-        <translation>Configurar Fuente del Mapa</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="350"/>
-        <source>Show Grid</source>
-        <translation>Mostrar Malla</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="353"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="365"/>
-        <source>Setup Grid</source>
-        <translation>Configurar Malla</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="368"/>
-        <source>Ctrl+Alt+G</source>
-        <translation>Ctrl+Alt+G</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="383"/>
-        <source>Flip Mouse Wheel</source>
-        <translation>Invertir la Rueda del Ratón</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="395"/>
-        <location filename="../IMainWindow.ui" line="398"/>
-        <source>Setup Map Paths</source>
-        <translation>Configurar Rutas de Mapas</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="413"/>
-        <source>POI Text</source>
-        <translation>Texto del POI</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="428"/>
-        <source>Night / Day</source>
-        <translation>Noche / Día</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="443"/>
-        <source>Map Tool Tip</source>
-        <translation>Mostrar descripción emergente en los Mapas</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="446"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="458"/>
-        <source>Setup DEM Paths</source>
-        <translation>Configurar Rutas a los DEM</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="470"/>
-        <source>About</source>
-        <translation>Acerca de</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="482"/>
-        <source>Help</source>
-        <translation>Ayuda</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="485"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="497"/>
-        <location filename="../IMainWindow.ui" line="500"/>
-        <source>Setup Map View</source>
-        <translation>Configurar Vista de Mapa</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="644"/>
-        <source>VRT Builder</source>
-        <translation>Asistente VRT</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="647"/>
-        <source>GUI front end to gdalbuildvrt</source>
-        <translation>GUI front end para gdalbuildvrt</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="659"/>
-        <source>Store Map View</source>
-        <translation>Guardar vista de mapa</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="662"/>
-        <source>Write current active map and DEM list including the properties to a file</source>
-        <translation>Guardar en un archivo el mapa activo actual y la lista de DEM's incluyendo sus propiedades</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="674"/>
-        <source>Load Map View</source>
-        <translation>Cargar vista de mapa</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="677"/>
-        <source>Restore view with active map and DEM list including the properties from a file</source>
-        <translation>Restaurar vista de mapa activo y lista de DEM's incluyendo sus propiedades desde un archivo</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="692"/>
-        <source>Ext. Profile</source>
-        <translation>Perfil en ventana externa</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="695"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="707"/>
-        <source>Close</source>
-        <translation>Cerrar</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="710"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="722"/>
-        <source>Clone Map View</source>
-        <translation>Duplicar vista de mapa</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="725"/>
-        <source>Ctrl+Shift+T</source>
-        <translation>Ctrl+Shift+T</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="737"/>
-        <source>Create Routino Database</source>
-        <translation>Crear base de datos de Routino</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="749"/>
-        <source>Save(Print) Map Screenshot</source>
-        <translation>Guardar/Imprimir captura de pantalla de mapa</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="752"/>
-        <source>Print a selected area of the map</source>
-        <translation>Imprimir area seleccionada del mapa</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="755"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="767"/>
-        <source>Setup Coord. Format</source>
-        <translation>Configurar formato de coordenadas</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="770"/>
-        <source>Change the format coordinates are displayed</source>
-        <translation>Cambiar el formato de coordenadas que se muestran</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="782"/>
-        <source>Setup Map Background</source>
-        <translation>Configuración del Mapa de Fondo</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="794"/>
-        <source>Setup Waypoint Icons</source>
-        <translation>Configurar iconos de Waypoint</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="797"/>
-        <source>Setup path to custom icons</source>
-        <translation>Configurar ruta de iconos personalizados</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="806"/>
-        <source>Close Tab</source>
-        <translation>Cerrar pestaña</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="809"/>
-        <source>Ctrl+W</source>
-        <translation>Ctrl+W</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="818"/>
-        <source>Quickstart Help</source>
-        <translation>Guia de inicio rápido</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="827"/>
-        <source>Setup Toolbar</source>
-        <translation>Configurar barra de herramientas</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="839"/>
-        <source>Toggle Docks</source>
-        <translation>Panel de herramientas</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="842"/>
-        <source>Toggle visibility of dockable windows</source>
-        <translation>Ver panel de herramientas</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="845"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="854"/>
-        <source>Full Screen</source>
-        <translation>Pantalla Completa</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="857"/>
-        <source>F11</source>
-        <translation>F11</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="512"/>
-        <source>Load GIS Data</source>
-        <translation>Cargar Datos GIS</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="515"/>
-        <source>Load projects from file</source>
-        <translation>Cargar proyectos desde archivo</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="518"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="530"/>
-        <source>Save All GIS Data</source>
-        <translation>Guardar todos los Datos GIS</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="533"/>
-        <source>Save all projects in the workspace</source>
-        <translation>Guardar todos los proyectos del espacio de trabajo</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="536"/>
-        <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="548"/>
-        <source>Setup Time Zone</source>
-        <translation>Configurar Zona Horaria</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="560"/>
-        <source>Add empty project</source>
-        <translation>Añadir proyecto vacío</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="575"/>
-        <source>Search Google</source>
-        <translation>Buscar en Google</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="587"/>
-        <source>Close all projects</source>
-        <translation>Cerrar todos los proyectos</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="590"/>
-        <source>F8</source>
-        <translation>F8</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="602"/>
-        <source>Setup Units</source>
-        <translation>Configurar Unidades</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="614"/>
-        <source>Setup Workspace</source>
-        <translation>Configurar Espacio de trabajo</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="617"/>
-        <source>Setup save on exit.</source>
-        <translation>Guardar configuración al salir.</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="629"/>
-        <source>Import Database from QLandkarte</source>
-        <translation>Importar base de datos de Qlandkarte</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="632"/>
-        <source>Import QLandkarte GT database</source>
-        <translation>Importar base de datos de QLandKarteGT</translation>
-    </message>
-</context>
-<context>
-    <name>IMapList</name>
-    <message>
-        <location filename="../map/IMapList.ui" line="14"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../map/IMapList.ui" line="103"/>
-        <source>To add maps use <b>File->Setup Map Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
-        <translation>Para añadir mapas haga<b>Archivo->Configurar rutas de mapas</b>.  O haga clic <a href='setup'><b>aqui</b></a></translation>
-    </message>
-    <message>
-        <location filename="../map/IMapList.ui" line="116"/>
-        <source>Use the context menu (right mouse button click on entry) to activate a map. Use drag-n-drop to move the activated map in the draw order. </source>
-        <translation>Use el menú contextual (botón derecho del ratón, y seleccione) para activar un mapa. Use arrastrar y soltar para mover el mapa activado en el orden de dibujado. </translation>
-    </message>
-    <message>
-        <location filename="../map/IMapList.ui" line="129"/>
-        <source>Help! I want maps!
-I don't want to read the documentation!</source>
-        <translation>Quiero mapas
-No quiero leer la documentación!</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapList.ui" line="149"/>
-        <source>Activate</source>
-        <translation>Activar</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapList.ui" line="158"/>
-        <source>Move Up</source>
-        <translation>Subir</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapList.ui" line="161"/>
-        <source>Hide map behind previous map</source>
-        <translation>Ocultar mapa detrás del anterior</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapList.ui" line="170"/>
-        <source>Move down</source>
-        <translation>Bajar</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapList.ui" line="173"/>
-        <source>Show map on top of next map</source>
-        <translation>Mostrar mapa encima del siguiente</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapList.ui" line="182"/>
-        <source>Reload Maps</source>
-        <translation>Recargar mapas</translation>
-    </message>
-</context>
-<context>
-    <name>IMapOnline</name>
-    <message>
-        <location filename="../map/IMapOnline.cpp" line="41"/>
-        <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
-        <translation>Este mapa requiere soporte de OpenSSL. Sin embargo, debido a restricciones legales en algunos países, OpenSSL no se incluye con QMapShack. Puede consultar la página < a href = < https: //www.openssl.org/community/binaries.html '> OpenSSL Homepage</a> Para binarios. Tienes que copiar libeay32.dll y ssleay32.dll en el directorio del programa QMapShack.</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapOnline.cpp" line="47"/>
-        <source>Error...</source>
-        <translation>Error...</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapOnline.cpp" line="98"/>
-        <source><b>%1</b>: %2 tiles pending<br/></source>
-        <translation><b>%1</b>: %2 teselas pendientes<br/></translation>
-    </message>
-</context>
-<context>
-    <name>IMapPathSetup</name>
-    <message>
-        <location filename="../map/IMapPathSetup.ui" line="14"/>
-        <source>Setup map paths</source>
-        <translation>Configurar rutas de mapas</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPathSetup.ui" line="20"/>
-        <source>Root path of tile cache for online maps:</source>
-        <translation>Carpeta para la caché de mapas online</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPathSetup.ui" line="36"/>
-        <location filename="../map/IMapPathSetup.ui" line="73"/>
-        <location filename="../map/IMapPathSetup.ui" line="93"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPathSetup.ui" line="185"/>
-        <source>Help! I want maps!
-I don't want to read the documentation!</source>
-        <translation>¡Quiero mapas!
-¡No quiero ver la documentación!</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPathSetup.ui" line="29"/>
-        <location filename="../map/IMapPathSetup.ui" line="154"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-</context>
-<context>
-    <name>IMapPropSetup</name>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="14"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="35"/>
-        <source><html><head/><body><p>Change opacity of map</p></body></html></source>
-        <translation><html><head/><body><p>Cambiar la opacidad del mapa</p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="50"/>
-        <source><html><head/><body><p>Click to use current scale as minimum scale to display the map.</p></body></html></source>
-        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala mínima a la que mostrar el mapa.</p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="53"/>
-        <location filename="../map/IMapPropSetup.ui" line="90"/>
-        <location filename="../map/IMapPropSetup.ui" line="370"/>
-        <location filename="../map/IMapPropSetup.ui" line="384"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="74"/>
-        <source><html><head/><body><p>Control the range of scale the map is displayed. Use the two buttons left and right to define the actual scale as either minimum or maximum scale.</p></body></html></source>
-        <translation><html><head/><body><p>Controle el rango de escalas para las cuales desea que se muestre el mapa. Use los dos botones a izquierda y derecha para definir la escala actual como bien la escala mínima o máxima para el mapa.</p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="87"/>
-        <source><html><head/><body><p>Click to use current scale as maximum scale to display the map.</p></body></html></source>
-        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala máxima a la que mostrar el mapa.</p></body></html></translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="139"/>
-        <source>Areas</source>
-        <translation>Áreas</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="146"/>
-        <source>Lines</source>
-        <translation>Líneas</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="153"/>
-        <source>Points</source>
-        <translation>Puntos</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="170"/>
-        <source>Details</source>
-        <translation>Detalle</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="264"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="271"/>
-        <source>Cache Path</source>
-        <translation>Carpeta Caché</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="353"/>
-        <source>Type File:</source>
-        <translation>Archivo TYP:</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="367"/>
-        <source>Forget external type file and use internal types.</source>
-        <translation>Olvidar TYP externo y utilizar el interno.</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="381"/>
-        <source>Load an external type file.</source>
-        <translation>Cargar un archivo TYP externo.</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="227"/>
-        <source>Cache Size (MB)</source>
-        <translation>Tamaño de Caché (MiB)</translation>
-    </message>
-    <message>
-        <location filename="../map/IMapPropSetup.ui" line="247"/>
-        <source>Expiration (Days)</source>
-        <translation>Caducidad (Días)</translation>
-    </message>
-</context>
-<context>
-    <name>IMapVrtBuilder</name>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="14"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
-        <source>Advanced Options</source>
-        <translation>Opciones Avanzadas</translation>
-    </message>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
-        <source>Source No Data (-srcnodata)</source>
-        <translation>No Data origen (-srcnodata)</translation>
-    </message>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="46"/>
-        <source>Target No Data (-vrtnodata)</source>
-        <translation>No Data salida  (-vrtnodata)</translation>
-    </message>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="56"/>
-        <source>Target Projection (-a_srs)</source>
-        <translation>Proyección/Datum (-a_srs)</translation>
-    </message>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="63"/>
-        <source>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</source>
-        <translation>Estas opciones son para casos particulares y normalmente se dejan en blanco. Consulta la <a href='http://www.gdal.org/gdalbuildvrt.html'>ayuda</a> de GDAL para más información.</translation>
-    </message>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
-        <source>1. Select one or multiple source files.
-2. Select a file name for the target VRT file.
-3. Press "Start" button.
-
-Tip:
-* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
-* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
-* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
-        <translation>1. Selecciona uno o varios ficheros de origen
-2. Selecciona el nombre y la ubicación para el fichero VRT de salida 
-3. Pulsa en "Comenzar"
-
-Notas:
-* Es posible mantener los ficheros de origen en una subcarpeta y generar el fichero VRT de salida en otra carpeta diferente, como tu carpeta raíz de mapas.
-* Usa las opciones avanzadas  para asignar un valor "no data" si los ficheros de origen carecen del mismo y no forman un área rectangular. Las áreas no cubiertas por el mapa se harán transparentes.
-* La opción avanzada "-a_srs" sirve para asignar una Proyección/Datum cuando el fichero de origen carece de ella, ...pero NO reproyecta los datos.</translation>
-    </message>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
-        <location filename="../tool/IMapVrtBuilder.ui" line="139"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="156"/>
-        <source>Select source files:</source>
-        <translation>Seleccionar ficheros de origen:</translation>
-    </message>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="121"/>
-        <source>Target Filename:</source>
-        <translation>Fichero VRT de salida:</translation>
-    </message>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="128"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../tool/IMapVrtBuilder.ui" line="20"/>
-        <source>Start</source>
-        <translation>Comenzar</translation>
-    </message>
-</context>
-<context>
-    <name>IMouseEditLine</name>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="249"/>
-        <source><b>New Line</b><br/>Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.<br/></source>
-        <translation><b>Nuevo trazado</b><br/>Mueva el ratón y pulse el botón izquierdo para crear puntos. Puede alternar el modo de dibujo con los botones de herraminetas (O,A,V) sin interrumpir el trazado. Para terminar pulse botón derecho del ratón.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="289"/>
-        <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
-        <translation><b>Borrar punto</b><br/>Mueva el ratón hasta un punto y pulse el botón izquierdo para eliminarlo.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="297"/>
-        <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
-        <translation><b>Seleccionar Rango de Puntos</b><br/>Seleccione el punto inicial con el botón izquierdo del raton. Fije el punto final con una segunda pulsacion y elija entre las opciones. El rango seleccionado se marca en verde. Utilice el botón derecho del ratón para cancelar.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="305"/>
-        <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
-        <translation><b>Mover punto</b><br/>Seleccione el punto con el botón izquierdo del raton y arrastrelo hasta la nueva posición. Suelte el punto con una segunda pulsacion. Utilice el botón derecho del ratón para cancelar.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="313"/>
-        <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
-        <translation><b>Añadir punto</b><br/>Mueva el ratón cerca de una línea y presione el botón izquierdo para agregar un punto. El punto se pegará al cursor y se puede mover.Suelte el punto en la posición deseada con una segunda pulsacion. Utilice el botón derecho del ratón para cancelar..<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="321"/>
-        <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
-        <translation><b>Sin enrutamiento ni ajuste vectorial</b><br/>Todos los puntos se conectarán con una línea recta.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="327"/>
-        <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
-        <translation><b>Enrutamiento automático</b><br/>El trazado entre los puntos se calcula automáticamente atendiendo a la configuración actual del enrutador. <b>Nota:</b> El enrutador seleccionado debe ser capaz de trabajar al vuelo,por lo general, solo son capaces de hacerlo los instalados localmente.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
-        <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
-        <translation><b>Ajuste vectorial</b><br/> El trazado se dibuja ajustandose automáticamente a las lineas de un mapa vectorial.<br/></translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="504"/>
-        <source><b>%1 Metrics</b></source>
-        <translation><b>Datos %1 </b></translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="507"/>
-        <source>Distance:</source>
-        <translation>Distancia:</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="509"/>
-        <source>Ascent:</source>
-        <translation>Ascenso:</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="511"/>
-        <source>Descent:</source>
-        <translation>Descenso:</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IMouseEditLine.h" line="135"/>
-        <source><br/><b>Move the map</b><br/>If you keep the left mouse button pressed and move the mouse, you will move the map.<br/><br/></source>
-        <translation><br/><b>Mover el mapa</b><br/>Mantega pulsado el botón izquierdo mientras mueve el ratón, y moverá el mapa.<br/><br/></translation>
-    </message>
-</context>
-<context>
-    <name>IPhotoAlbum</name>
-    <message>
-        <location filename="../widgets/IPhotoAlbum.ui" line="20"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../widgets/IPhotoAlbum.ui" line="50"/>
-        <location filename="../widgets/IPhotoAlbum.ui" line="77"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>IPlot</name>
-    <message>
-        <location filename="../plot/IPlot.cpp" line="94"/>
-        <source>Reset Zoom</source>
-        <translation>Restablecer zoom</translation>
-    </message>
-    <message>
-        <location filename="../plot/IPlot.cpp" line="95"/>
-        <source>Stop Range</source>
-        <translation>Rango de parada</translation>
-    </message>
-    <message>
-        <location filename="../plot/IPlot.cpp" line="96"/>
-        <source>Save...</source>
-        <translation>Guardar...</translation>
-    </message>
-    <message>
-        <location filename="../plot/IPlot.cpp" line="98"/>
-        <source>Add Waypoint</source>
-        <translation>Añadir Waypoint</translation>
-    </message>
-    <message>
-        <location filename="../plot/IPlot.cpp" line="99"/>
-        <source>Cut...</source>
-        <translation>Cortar.</translation>
-    </message>
-    <message>
-        <location filename="../plot/IPlot.cpp" line="542"/>
-        <source>Hold CTRL key for vertical zoom, only.
-Hold ALT key for horizontal zoom, only.</source>
-        <translation>Pulse tecla CTRL para zoom vertical unicamente.
-Pulse tecla ALT para zoom horizontal unicamente</translation>
-    </message>
-    <message>
-        <location filename="../plot/IPlot.cpp" line="697"/>
-        <source>No or bad data.</source>
-        <translation>Datos incorrectos o inexistentes.</translation>
-    </message>
-    <message>
-        <location filename="../plot/IPlot.cpp" line="1298"/>
-        <source>Select output file</source>
-        <translation>Seleccione archivo de salida</translation>
-    </message>
-</context>
-<context>
-    <name>IPositionDialog</name>
-    <message>
-        <location filename="../helpers/IPositionDialog.ui" line="14"/>
-        <source>Position ...</source>
-        <translation>Posición ...</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IPositionDialog.ui" line="20"/>
-        <source>Enter new position</source>
-        <translation>Introduzca la nueva posición</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IPositionDialog.ui" line="30"/>
-        <source>Bad position format. Must be: 
-"[N|S] ddd mm.sss [W|E] ddd mm.sss"
-or
-"[N|S] ddd.ddd [W|E] ddd.ddd"</source>
-        <translation>Formato de posición incorrecto. Debe ser: 
-"[N|S] ggg mm.sss [W|E] ggg mm.sss"
-o
-"[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
-    </message>
-</context>
-<context>
-    <name>IPrintDialog</name>
-    <message>
-        <location filename="../print/IPrintDialog.ui" line="20"/>
-        <source>Print map...</source>
-        <translation>Imprimir mapa...</translation>
-    </message>
-    <message>
-        <location filename="../print/IPrintDialog.ui" line="79"/>
-        <source>When printing online maps make sure that the map has been loaded into the cache for the extent to be printed.</source>
-        <translation>Al imprimir mapas en línea asegúrese de que se haya cargado previamente en la memoria caché el mapa correspondiente a la extensión que desea imprimir.</translation>
-    </message>
-    <message>
-        <location filename="../print/IPrintDialog.ui" line="60"/>
-        <source>Save</source>
-        <translation>Guardar</translation>
-    </message>
-    <message>
-        <location filename="../print/IPrintDialog.ui" line="37"/>
-        <source>When saving online maps make sure that the map has been loaded into the cache for the extent to be saved.</source>
-        <translation>Al guardar mapas en línea asegúrese de que el mapa se ha cargado en la memoria caché en la medida en la que desea guardarlo.</translation>
-    </message>
-    <message>
-        <location filename="../print/IPrintDialog.ui" line="89"/>
-        <location filename="../print/IPrintDialog.ui" line="102"/>
-        <location filename="../print/IPrintDialog.ui" line="151"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-    <message>
-        <location filename="../print/IPrintDialog.ui" line="118"/>
-        <source>Print</source>
-        <translation>Imprimir</translation>
-    </message>
-</context>
-<context>
-    <name>IProgressDialog</name>
-    <message>
-        <location filename="../helpers/IProgressDialog.ui" line="14"/>
-        <source>Please wait...</source>
-        <translation>Por favor,espere...</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IProgressDialog.ui" line="20"/>
-        <location filename="../helpers/IProgressDialog.ui" line="27"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-</context>
-<context>
-    <name>IProjWizard</name>
-    <message>
-        <location filename="../grid/IProjWizard.ui" line="14"/>
-        <source>Proj4 Wizzard</source>
-        <translation>Asistente de Proj4</translation>
-    </message>
-    <message>
-        <location filename="../grid/IProjWizard.ui" line="29"/>
-        <source>Mercator</source>
-        <translation>Mercator</translation>
-    </message>
-    <message>
-        <location filename="../grid/IProjWizard.ui" line="38"/>
-        <source>UTM</source>
-        <translation>UTM</translation>
-    </message>
-    <message>
-        <location filename="../grid/IProjWizard.ui" line="45"/>
-        <source>zone</source>
-        <translation>zona</translation>
-    </message>
-    <message>
-        <location filename="../grid/IProjWizard.ui" line="82"/>
-        <source>user defined</source>
-        <translation>definido por el usuario</translation>
-    </message>
-    <message>
-        <location filename="../grid/IProjWizard.ui" line="94"/>
-        <source>Datum</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../grid/IProjWizard.ui" line="104"/>
-        <source>World Mercator (OSM)</source>
-        <translation>World Mercator (OSM)</translation>
-    </message>
-    <message>
-        <location filename="../grid/IProjWizard.ui" line="124"/>
-        <source>Result:</source>
-        <translation>Resultado:</translation>
-    </message>
-    <message>
-        <location filename="../grid/IProjWizard.ui" line="138"/>
-        <source>UPS North (North Pole)</source>
-        <translation>UPS Norte (Polo Norte)</translation>
-    </message>
-    <message>
-        <location filename="../grid/IProjWizard.ui" line="145"/>
-        <source>UPS South (South Pole)</source>
-        <translation>UPS Sur (Polo Sur)</translation>
-    </message>
-    <message>
-        <location filename="../grid/IProjWizard.ui" line="152"/>
-        <source>Projection</source>
-        <translation>Proyección</translation>
-    </message>
-</context>
-<context>
-    <name>IProjWpt</name>
-    <message>
-        <location filename="../gis/wpt/IProjWpt.ui" line="14"/>
-        <source>Waypoint Projection</source>
-        <translation>Proyección del Waypoint</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IProjWpt.ui" line="22"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IProjWpt.ui" line="45"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IProjWpt.ui" line="54"/>
-        <source>Clone waypoint and move by:</source>
-        <translation>Duplicar el waypoint y moverlo:</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IProjWpt.ui" line="66"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IProjWpt.ui" line="76"/>
-        <source>°</source>
-        <translation>º</translation>
-    </message>
-</context>
-<context>
-    <name>IRouterBRouter</name>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
-        <source>Alternative</source>
-        <translation>Alternativa</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
-        <source>display selected routing profile</source>
-        <translation>Mostrar el perfil de enrutamiento seleccionado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="67"/>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="128"/>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="142"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
-        <source>on-the-fly routing</source>
-        <translation>Enrutamiento al vuelo</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
-        <source>BRouter: </source>
-        <translation>BRouter: </translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
-        <source>not running</source>
-        <translation>Parado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
-        <source>start/stop BRouter</source>
-        <translation>iniciar/parar Brouter</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
-        <source>show BRouter console</source>
-        <translation>Mostrar consola de BRouter</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
-        <source>Setup</source>
-        <translation>Configuración</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterBRouter.ui" line="181"/>
-        <source>Caution! BRouter is listening on all ports for connections.</source>
-        <translation>¡Precaución! BRouter está escuchando en todos los puertos para las conexiones.</translation>
-    </message>
-</context>
-<context>
-    <name>IRouterBRouterInfo</name>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
-        <source>BRouter Profile</source>
-        <translation>Perfil de BRouter</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-</context>
-<context>
-    <name>IRouterBRouterSetupWizard</name>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
-        <source>BRouter Setup</source>
-        <translation>Configuración de BRouter</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="48"/>
-        <source>choose which BRouter to use</source>
-        <translation>Elija que BRouter usar</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
-        <source>BRouter-Web (online)</source>
-        <translation>BRouter-Web (online)</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
-        <source>local Installation</source>
-        <translation>Instalación local</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
-        <source>Expert Mode</source>
-        <translation>Modo experto</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
-        <source>local BRouter Installation directory:</source>
-        <translation>Carpeta de instalación de BRouter local:</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
-        <source>select installation directory</source>
-        <translation>Seleccionar carpeta de instalación</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="162"/>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="342"/>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="356"/>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="389"/>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="400"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="119"/>
-        <source>labelLocalDirResult</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
-        <source>create or update installation</source>
-        <translation>Crear o actualizar instalacion</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
-        <source>Java Executable</source>
-        <translation>Ejecutable Java</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
-        <source>labelLocalJavaResult</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
-        <source>search for installed java</source>
-        <translation>Buscando Java instalado</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="241"/>
-        <source>Download and install BRouter Version</source>
-        <translation>Descargar e instalar BRouter</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
-        <source>about:blank</source>
-        <translation>about:blank</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
-        <source>File to install</source>
-        <translation>Archivo para instalar</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
-        <source>Download and Install</source>
-        <translation>Descargar e instalar</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
-        <source>available Profiles</source>
-        <translation>Perfiles disponibles </translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
-        <source>install profile</source>
-        <translation>Instalar perfil</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
-        <source>remove profile</source>
-        <translation>Eliminar perfil</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
-        <source>installed Profiles</source>
-        <translation>Perfiles instalados</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
-        <source>content of profile</source>
-        <translation>Contenido del perfil</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
-        <source>BRouter-Web URL:</source>
-        <translation>BRouter-Web URL:</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
-        <source>Service-URL</source>
-        <translation>Servicio-URL</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
-        <source>Profile-URL</source>
-        <translation>Perfil-URL</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
-        <source>Hostname</source>
-        <translation>Nombre de Host</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
-        <source>Port</source>
-        <translation>Puerto</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
-        <source>Profile directory</source>
-        <translation>Carpeta de perfiles</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
-        <source>Segments directory</source>
-        <translation>Carpeta de segmentos</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
-        <source>Custom Profiles dir</source>
-        <translation>Carpeta de perfiles personalizados</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
-        <source>Max Runtime</source>
-        <translation>Tiempo máximo de ejecución </translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="621"/>
-        <source>Number Threads</source>
-        <translation>Número de hilos</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
-        <source>Java Options</source>
-        <translation>Opciones de Java</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
-        <source>Profiles Url</source>
-        <translation>URL de perfiles</translation>
-    </message>
-</context>
-<context>
-    <name>IRouterMapQuest</name>
-    <message>
-        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="22"/>
-        <source>Highways</source>
-        <translation>Autopistas</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="29"/>
-        <source>Seasonal</source>
-        <translation>Estacional</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="36"/>
-        <source>Language</source>
-        <translation>Lenguaje</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="43"/>
-        <source>Country Border</source>
-        <translation>Fronteras</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="53"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="60"/>
-        <source>Avoid:</source>
-        <translation>Evitar:</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="67"/>
-        <source>Ferry</source>
-        <translation>Ferry</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="74"/>
-        <source>Toll Road</source>
-        <translation>Carreteras de peaje</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="84"/>
-        <source>Unpaved</source>
-        <translation>Sin pavimentar</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="106"/>
-        <source><p>Directions Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> </p></source>
-        <translation><p>Direcciones cortesía de <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> </p></translation>
-    </message>
-</context>
-<context>
-    <name>IRouterRoutino</name>
-    <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="31"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="38"/>
-        <source>Mode</source>
-        <translation>Modo</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="45"/>
-        <source>Database</source>
-        <translation>Base de datos</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="52"/>
-        <source>Add paths with Routino database.</source>
-        <translation>Añadir carpeta con base de datos de Routino.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="55"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="66"/>
-        <source>Language</source>
-        <translation>Lenguaje</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="131"/>
-        <source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path. You can create your own routing data with <b>Tool->Create Routino Database</b>.</source>
-        <translation>Para utilizar el enrutamiento sin conexión es necesario definir rutas de acceso a los datos de enrutamiento locales. Utilice el botón de la herramienta de configuración para indicar una carpeta. Puede crear sus propios datos de enrutamiento con la  <b>herramienta->Crear base de datos de Routino</b>.</translation>
-    </message>
-</context>
-<context>
-    <name>IRouterRoutinoPathSetup</name>
-    <message>
-        <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
-        <source>Setup Routino database...</source>
-        <translation>Configurar base de datos de Routino...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="27"/>
-        <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="47"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="99"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-</context>
-<context>
-    <name>IRouterSetup</name>
-    <message>
-        <location filename="../gis/rte/router/IRouterSetup.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IRoutinoDatabaseBuilder</name>
-    <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="22"/>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="63"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="39"/>
-        <source>Select source files:</source>
-        <translation>Seleccionar ficheros de origen:</translation>
-    </message>
-    <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="54"/>
-        <source>Start</source>
-        <translation>Comenzar</translation>
-    </message>
-    <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="86"/>
-        <source>Target Path:</source>
-        <translation>Carpeta de destino:</translation>
-    </message>
-    <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="93"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="100"/>
-        <source>File Prefix</source>
-        <translation>Prefijo del archivo</translation>
-    </message>
-</context>
-<context>
-    <name>IScrOptEditLine</name>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="32"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="40"/>
-        <source>Save to original</source>
-        <translation>Guardar al original</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="47"/>
-        <source>Save as new</source>
-        <translation>Guardar como nuevo...</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="54"/>
-        <source>Abort</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="89"/>
-        <source>Move points. (Ctrl+M)</source>
-        <translation>Mover puntos. (Ctrl+M)</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="99"/>
-        <source>Ctrl+M</source>
-        <translation>Ctrl+M</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="115"/>
-        <source>Add new points. (Ctrl++)</source>
-        <translation>Añadir puntos. (Ctrl++)</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="125"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="138"/>
-        <source>Select a range of points. (Ctrl+R)</source>
-        <translation>Seleccionar rango de puntos. (Ctrl+R)</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="148"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="215"/>
-        <source>No auto-routing or line snapping (Ctrl+O)</source>
-        <translation>Dibuja libremente. Sin enrutamiento automático ni ajuste vectorial (Ctrl + O)</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="225"/>
-        <source>Ctrl+O</source>
-        <translation>Ctrl+O</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="238"/>
-        <source>Use auto-routing to between points. (Ctrl+A)</source>
-        <translation>Dibuja usando el enrutamiento automático entre puntos. (Ctrl+A)</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="248"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="261"/>
-        <source>Snap line along lines of a vector map. (Ctrl+V)</source>
-        <translation>Dibuja ajustandose a las lineas de un mapa vectorial. (Ctrl+V)</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="92"/>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="118"/>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="141"/>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="164"/>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="300"/>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="317"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
-        <source>Delete a point. (Ctrl+-)</source>
-        <translation>Borrar un punto. (Ctrl+-)</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
-        <source>Ctrl+-</source>
-        <translation>Ctrl+-</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
-        <source>0</source>
-        <translation>0</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="241"/>
-        <source>A</source>
-        <translation>A</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="264"/>
-        <source>V</source>
-        <translation>V</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="271"/>
-        <source>Ctrl+V</source>
-        <translation>Ctrl+V</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="297"/>
-        <source>Undo last change</source>
-        <translation>Deshacer</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptEditLine.ui" line="314"/>
-        <source>Redo last change</source>
-        <translation>Rehacer</translation>
-    </message>
-</context>
-<context>
-    <name>IScrOptOvlArea</name>
-    <message>
-        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="14"/>
-        <source>Form</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="40"/>
-        <source>View details and edit.</source>
-        <translation>Ver detalles y editar.</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="43"/>
-        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="57"/>
-        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="71"/>
-        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="92"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="54"/>
-        <source>Copy area into another project.</source>
-        <translation>Copiar área en otro proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="68"/>
-        <source>Delete area from project.</source>
-        <translation>Eliminar área de este proyecto</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="89"/>
-        <source>Edit shape of the area.</source>
-        <translation>Editar el contorno del área.</translation>
-    </message>
-    <message>
-        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="121"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-</context>
-<context>
-    <name>IScrOptPrint</name>
-    <message>
-        <location filename="../mouse/IScrOptPrint.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptPrint.ui" line="35"/>
-        <source>Save selected area as image.</source>
-        <translation>Guardar el área seleccionada como imagen.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptPrint.ui" line="38"/>
-        <location filename="../mouse/IScrOptPrint.ui" line="58"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptPrint.ui" line="55"/>
-        <source>Print selected area.</source>
-        <translation>Imprimir área seleccionada.</translation>
-    </message>
-</context>
-<context>
-    <name>IScrOptRangeLine</name>
-    <message>
-        <location filename="../mouse/line/IScrOptRangeLine.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptRangeLine.ui" line="32"/>
-        <source>Delete all points between the first and last one.</source>
-        <translation>Borre todos los puntos entre el primero y el último.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptRangeLine.ui" line="35"/>
-        <location filename="../mouse/line/IScrOptRangeLine.ui" line="49"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../mouse/line/IScrOptRangeLine.ui" line="46"/>
-        <source><html><head/><body><p>Calculate a route between the first and last selected point.</p></body></html></source>
-        <translation><html><head/><body><p>Calcular una ruta entre el primero y el último punto seleccionado.</p></body></html></translation>
-    </message>
-</context>
-<context>
-    <name>IScrOptRangeTrk</name>
-    <message>
-        <location filename="../mouse/IScrOptRangeTrk.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptRangeTrk.ui" line="40"/>
-        <source>Hide all points.</source>
-        <translation>Ocultar todos los puntos.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptRangeTrk.ui" line="43"/>
-        <location filename="../mouse/IScrOptRangeTrk.ui" line="57"/>
-        <location filename="../mouse/IScrOptRangeTrk.ui" line="71"/>
-        <location filename="../mouse/IScrOptRangeTrk.ui" line="85"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptRangeTrk.ui" line="54"/>
-        <source>Show all points.</source>
-        <translation>Mostrar todos los puntos.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
-        <source>Set an activity for the selected range.</source>
-        <translation>Asigna una Actividad para el rango seleccionado.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
-        <source>Copy track points as new track.</source>
-        <translation>Copiar los puntos del track como un nuevo track.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptRangeTrk.ui" line="117"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-</context>
-<context>
-    <name>IScrOptRte</name>
-    <message>
-        <location filename="../gis/rte/IScrOptRte.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IScrOptRte.ui" line="43"/>
-        <location filename="../gis/rte/IScrOptRte.ui" line="57"/>
-        <location filename="../gis/rte/IScrOptRte.ui" line="71"/>
-        <location filename="../gis/rte/IScrOptRte.ui" line="89"/>
-        <location filename="../gis/rte/IScrOptRte.ui" line="106"/>
-        <location filename="../gis/rte/IScrOptRte.ui" line="120"/>
-        <location filename="../gis/rte/IScrOptRte.ui" line="134"/>
-        <location filename="../gis/rte/IScrOptRte.ui" line="148"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IScrOptRte.ui" line="54"/>
-        <source>Copy route into another project.</source>
-        <translation>Copiar ruta en otro proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IScrOptRte.ui" line="40"/>
-        <source>View details and edit.</source>
-        <translation>Ver detalles y editar.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IScrOptRte.ui" line="68"/>
-        <source>Delete route from project.</source>
-        <translation>Borrar ruta del proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IScrOptRte.ui" line="103"/>
-        <source>Calculate route.</source>
-        <translation>Calcular ruta.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IScrOptRte.ui" line="117"/>
-        <source>Reset route calculation.</source>
-        <translation>Reiniciar cálculo de ruta.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IScrOptRte.ui" line="131"/>
-        <source>Move route points.</source>
-        <translation>Mover puntos de ruta.</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IScrOptRte.ui" line="145"/>
-        <source>Convert route to track</source>
-        <translation>Convertir ruta en track</translation>
-    </message>
-    <message>
-        <location filename="../gis/rte/IScrOptRte.ui" line="174"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-</context>
-<context>
-    <name>IScrOptSelect</name>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="59"/>
-        <source>Copy all selected items to a project.</source>
-        <translation>Copiar todos los elementos seleccionados a un proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="62"/>
-        <location filename="../mouse/IScrOptSelect.ui" line="82"/>
-        <location filename="../mouse/IScrOptSelect.ui" line="102"/>
-        <location filename="../mouse/IScrOptSelect.ui" line="122"/>
-        <location filename="../mouse/IScrOptSelect.ui" line="142"/>
-        <location filename="../mouse/IScrOptSelect.ui" line="156"/>
-        <location filename="../mouse/IScrOptSelect.ui" line="210"/>
-        <location filename="../mouse/IScrOptSelect.ui" line="239"/>
-        <location filename="../mouse/IScrOptSelect.ui" line="299"/>
-        <location filename="../mouse/IScrOptSelect.ui" line="326"/>
-        <location filename="../mouse/IScrOptSelect.ui" line="353"/>
-        <location filename="../mouse/IScrOptSelect.ui" line="380"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="79"/>
-        <source>Create a route from selected waypoints.</source>
-        <translation>Crear ruta con los waypoints seleccionados.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="99"/>
-        <source>Change the icon of all selected waypoints.</source>
-        <translation>Cambiar el icono a los waypoints seleccionados.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="119"/>
-        <source>Combine all selected tracks to a new one.</source>
-        <translation>Combinar todos los tracks seleccionadas en uno nuevo.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="139"/>
-        <source>Set an activity for all selected tracks.</source>
-        <translation>Asigna una Actividad para todos los tracks seleccionados.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="153"/>
-        <source>Delete all selected items.</source>
-        <translation>Borrar los elementos seleccionados.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="207"/>
-        <source>Select all items that intersect the selected area.</source>
-        <translation>Seleccione los elementos que interseccionan el área seleccionada.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="236"/>
-        <source>Select all items that are completely inside the selected area.</source>
-        <translation>Seleccione los elementos que estan dentro del area seleccionada. </translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="296"/>
-        <source>Add tracks to selection.</source>
-        <translation>Añadir tracks a la selección.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="323"/>
-        <source>Add waypoints to selection.</source>
-        <translation>Añadir waypoints a la selección.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="350"/>
-        <source>Add routes to selection.</source>
-        <translation>Añadir rutas a selección.</translation>
-    </message>
-    <message>
-        <location filename="../mouse/IScrOptSelect.ui" line="377"/>
-        <source>Add areas to selection.</source>
-        <translation>Añadir áreas a la selección.</translation>
-    </message>
-</context>
-<context>
-    <name>IScrOptTrk</name>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="89"/>
-        <source>Show on-screen profile and detailed information about points.</source>
-        <translation>Mostrar el perfil en pantalla e información detallada de los puntos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="120"/>
-        <source>Edit position of track points.</source>
-        <translation>Editar la posición de los puntos del track.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="40"/>
-        <source>View details and edit properties of track.</source>
-        <translation>Ver detalles y editar propiedades del track. </translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="43"/>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="57"/>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="71"/>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="92"/>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="109"/>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="123"/>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="137"/>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="151"/>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="170"/>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="184"/>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="198"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="54"/>
-        <source>Copy track into another project.</source>
-        <translation>Copiar track en otro proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="68"/>
-        <source>Delete track from project.</source>
-        <translation>Eliminar track del proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="106"/>
-        <source>Select a range of points.</source>
-        <translation>Seleccionar un rango de puntos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="134"/>
-        <source>Reverse track.</source>
-        <translation>Invertir track.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="148"/>
-        <source>Combine tracks.</source>
-        <translation>Combinar tracks.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="162"/>
-        <source>Cut track at selected point. You can use this to:
-
-* remove bad points at the start or end of the track
-* use the track parts to plan a new tour
-* cut a long track into stages
-</source>
-        <translation>Dividir el track por el punto seleccionado. Puede usar esto para:
-
-* Eliminar puntos erróneos del principio o del final
-* Utilizar partes del track al planificar un nuevo recorrido
-* Dividir un track muy largo en varias etapas
-</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
-        <source>Set an activity for the complete track.</source>
-        <translation>Asigna una Actividad al track completo.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
-        <source>Copy track together with all attached waypoints into another project.</source>
-        <translation>Copiar track junto con todos los waypoints conectados en otro proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/IScrOptTrk.ui" line="224"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-</context>
-<context>
-    <name>IScrOptWpt</name>
-    <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="49"/>
-        <source>View details and edit.</source>
-        <translation>Ver detalles y editar.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="52"/>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="66"/>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="80"/>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="101"/>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="118"/>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="132"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="63"/>
-        <source>Copy waypoint into another project.</source>
-        <translation>Copiar waypoint en otro proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="77"/>
-        <source>Delete waypoint from project.</source>
-        <translation>Eliminar waypoint del proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="98"/>
-        <source>Show content as static bubble.</source>
-        <translation>Mostrar contenido en globo de texto.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="115"/>
-        <source>Move waypoint to a new location.</source>
-        <translation>Mover el waypoint a una nueva ubicación.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="129"/>
-        <source>Clone waypoint and move clone a given distance and angle.</source>
-        <translation>Duplicar el waypoint y mover la copia a una distancia y un ángulo dados.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="176"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-</context>
-<context>
-    <name>ISearchDatabase</name>
-    <message>
-        <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
-        <source>Search...</source>
-        <translation>Buscar...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISearchDatabase.ui" line="34"/>
-        <source>Type the word you want to search for and press the search button. 
-If you enter 'word' a search with an exact match is done. If you enter 'word*', 'word' has to be at the beginning of a string.</source>
-        <translation>Escriba la palabra que desea buscar y pulse botón de busqueda. 
-Si introduce la 'palabra' entre apóstrofes se busca una coincidencia exacta . Si introduce 'palabra*', la 'palabra' se busca al principio de una cadena.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISearchDatabase.ui" line="51"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISearchDatabase.ui" line="79"/>
-        <source>Search</source>
-        <translation>Buscar</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISearchDatabase.ui" line="86"/>
-        <source>Close</source>
-        <translation>Cerrar</translation>
-    </message>
-</context>
-<context>
-    <name>ISelDevices</name>
-    <message>
-        <location filename="../gis/ISelDevices.ui" line="14"/>
-        <source>Select devices...</source>
-        <translation>Seleccionar dispositivos...</translation>
-    </message>
-</context>
-<context>
-    <name>ISelectActivityColor</name>
-    <message>
-        <location filename="../gis/trk/ISelectActivityColor.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ISelectCopyAction</name>
-    <message>
-        <location filename="../helpers/ISelectCopyAction.ui" line="14"/>
-        <source>Copy item...</source>
-        <translation>Copiar elemento...</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectCopyAction.ui" line="29"/>
-        <source>Replace existing item</source>
-        <translation>Sustituir el elemento existente</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectCopyAction.ui" line="36"/>
-        <location filename="../helpers/ISelectCopyAction.ui" line="46"/>
-        <location filename="../helpers/ISelectCopyAction.ui" line="79"/>
-        <location filename="../helpers/ISelectCopyAction.ui" line="89"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectCopyAction.ui" line="72"/>
-        <source>Do not copy item</source>
-        <translation>No copiar el elemento</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectCopyAction.ui" line="115"/>
-        <source>Create a clone</source>
-        <translation>Crear un duplicado</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectCopyAction.ui" line="122"/>
-        <source>Replace with:</source>
-        <translation>Sustituir por:</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectCopyAction.ui" line="129"/>
-        <source>Keep item:</source>
-        <translation>Mantener:</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectCopyAction.ui" line="136"/>
-        <source>The clone's name will be appended with '_Clone'</source>
-        <translation>Se añadirá el sufijo '_Clone' al nombre del duplicado</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectCopyAction.ui" line="153"/>
-        <source>And for all other items, too.</source>
-        <translation>Hacer igual para todos los elementos.</translation>
-    </message>
-</context>
-<context>
-    <name>ISelectDBFolder</name>
-    <message>
-        <location filename="../gis/db/ISelectDBFolder.ui" line="14"/>
-        <source>Select Parent Folder...</source>
-        <translation type="unfinished">Seleccione la carpeta principal...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectDBFolder.ui" line="26"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-</context>
-<context>
-    <name>ISelectDoubleListWidget</name>
-    <message>
-        <location filename="../widgets/ISelectDoubleListWidget.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ISelectDoubleListWidget.ui" line="22"/>
-        <source>Available</source>
-        <translation>Disponible</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ISelectDoubleListWidget.ui" line="46"/>
-        <source>Add to selected items</source>
-        <translation>Añadir a los elementos seleccionados</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ISelectDoubleListWidget.ui" line="60"/>
-        <source>Remove from selected items</source>
-        <translation>Eliminar de los elementos seleccionados</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ISelectDoubleListWidget.ui" line="78"/>
-        <source>Selected</source>
-        <translation>Seleccionado</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ISelectDoubleListWidget.ui" line="102"/>
-        <source>Move selected items up</source>
-        <translation>Mover los elementos seleccionados arriba</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ISelectDoubleListWidget.ui" line="116"/>
-        <source>Move selected items down</source>
-        <translation>Mover los elementos seleccionados abajo</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ISelectDoubleListWidget.ui" line="49"/>
-        <location filename="../widgets/ISelectDoubleListWidget.ui" line="63"/>
-        <location filename="../widgets/ISelectDoubleListWidget.ui" line="105"/>
-        <location filename="../widgets/ISelectDoubleListWidget.ui" line="119"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-</context>
-<context>
-    <name>ISelectProjectDialog</name>
-    <message>
-        <location filename="../helpers/ISelectProjectDialog.ui" line="14"/>
-        <source>Select a project...</source>
-        <translation>Seleccionar un proyecto...</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectProjectDialog.ui" line="20"/>
-        <source>Select project from list or enter new project name.</source>
-        <translation>Seleccione un proyecto de la lista, o introduzca un nuevo nombre de proyecto.</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectProjectDialog.ui" line="33"/>
-        <source>New project's name</source>
-        <translation>Nombre del nuevo proyecto</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectProjectDialog.ui" line="43"/>
-        <source>New project is created as:</source>
-        <translation>El nuevo proyecto se creará como:</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectProjectDialog.ui" line="93"/>
-        <source>*.qms</source>
-        <translation>*.qms</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectProjectDialog.ui" line="103"/>
-        <source>*.gpx</source>
-        <translation>*.gpx</translation>
-    </message>
-    <message>
-        <location filename="../helpers/ISelectProjectDialog.ui" line="110"/>
-        <source>Database</source>
-        <translation>Base de datos</translation>
-    </message>
-</context>
-<context>
-    <name>ISelectSaveAction</name>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="20"/>
-        <source>Copy item...</source>
-        <translation>Copiar elemento...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="35"/>
-        <source>Replace existing item</source>
-        <translation>Sustituir el elemento existente</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="87"/>
-        <source>Add a clone</source>
-        <translation>Añadir duplicado</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="100"/>
-        <source>The clone's name will be appended with '_Clone'</source>
-        <translation>Se añadirá el sufijo '_Clone' al nombre del duplicado</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="171"/>
-        <source>Replace with:</source>
-        <translation>Sustituir por:</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="42"/>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="68"/>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="130"/>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="140"/>
-        <source>TextLabel</source>
-        <translation>Denominación</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="61"/>
-        <source>Do not replace item</source>
-        <translation>No sustituir elemento</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="123"/>
-        <source>Use item:</source>
-        <translation>Utilizar elemento:</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISelectSaveAction.ui" line="116"/>
-        <source>And for all other items, too.</source>
-        <translation>Hacer igual para todos los elementos.</translation>
-    </message>
-</context>
-<context>
-    <name>ISetupDatabase</name>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="14"/>
-        <source>Add database...</source>
-        <translation>Añadir Base de Datos...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="68"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="25"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="252"/>
-        <source><p align="justify"><span style=" font-weight:600;">Caution!</span> It is recommended to leave the password blank, as QMapShack will store it as plain text. If you don't give a password you will be asked for it on each startup.</p></source>
-        <translation><p align="justify"><span style=" font-weight:600;">Precaución</span> Se recomienda dejar la contraseña en blanco, ya que QMapShack lo almacenará como texto sin formato. Si no introduce una contraseña, se le pedirá en cada inicio.</p></translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="239"/>
-        <source>Do not use a password.</source>
-        <translation>No usar contraseña.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="153"/>
-        <source>SQLite</source>
-        <translation>SQLite</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="115"/>
-        <source>MySQL</source>
-        <translation>MySQL</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="181"/>
-        <source>Server</source>
-        <translation>Servidor</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="193"/>
-        <source>Port</source>
-        <translation>Puerto</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="206"/>
-        <source>00000</source>
-        <translation type="unfinished">00000</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="215"/>
-        <source>User</source>
-        <translation>Usuario</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="225"/>
-        <source>Password</source>
-        <translation>Contraseña</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="275"/>
-        <source><b>Port:</b> Leave the port field empty to use the default port.</source>
-        <translation><b>Puerto:</b> Dejar vacio para usar el puerto predeterminado.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="61"/>
-        <source>File:</source>
-        <translation>Archivo:</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="75"/>
-        <source>Add new database.</source>
-        <translation>Añadir nueva base de datos.</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="78"/>
-        <location filename="../gis/db/ISetupDatabase.ui" line="92"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupDatabase.ui" line="89"/>
-        <source>Open existing database.</source>
-        <translation>Abrir base de datos existente.</translation>
-    </message>
-</context>
-<context>
-    <name>ISetupFilter</name>
-    <message>
-        <location filename="../gis/ISetupFilter.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/ISetupFilter.ui" line="38"/>
-        <source>Apply filter to</source>
-        <translation>Aplicar filtro a</translation>
-    </message>
-    <message>
-        <location filename="../gis/ISetupFilter.ui" line="45"/>
-        <source>name only</source>
-        <translation>Solo nombre</translation>
-    </message>
-    <message>
-        <location filename="../gis/ISetupFilter.ui" line="52"/>
-        <source>complete text</source>
-        <translation>Texto completo</translation>
-    </message>
-</context>
-<context>
-    <name>ISetupFolder</name>
-    <message>
-        <location filename="../gis/db/ISetupFolder.ui" line="14"/>
-        <source>Database Folder...</source>
-        <translation>Carpeta de base de datos</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupFolder.ui" line="20"/>
-        <source>Folder name</source>
-        <translation>Nombre de la carpeta</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupFolder.ui" line="30"/>
-        <source>Group</source>
-        <translation>Grupo</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupFolder.ui" line="41"/>
-        <source>Project</source>
-        <translation>Proyecto</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupFolder.ui" line="55"/>
-        <source>Other</source>
-        <translation>Otros</translation>
-    </message>
-</context>
-<context>
-    <name>ISetupNewWpt</name>
-    <message>
-        <location filename="../gis/wpt/ISetupNewWpt.ui" line="14"/>
-        <source>New Waypoint...</source>
-        <translation>Nuevo waypoint.</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/ISetupNewWpt.ui" line="22"/>
-        <source>Symbol</source>
-        <translation>Símbolo</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/ISetupNewWpt.ui" line="29"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/ISetupNewWpt.ui" line="39"/>
-        <source>Position</source>
-        <translation>Posición</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/ISetupNewWpt.ui" line="49"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../gis/wpt/ISetupNewWpt.ui" line="59"/>
-        <source>Bad position format. Must be: 
-"[N|S] ddd mm.sss [W|E] ddd mm.sss"
-or
-"[N|S] ddd.ddd [W|E] ddd.ddd"</source>
-        <translation>Formato de posición incorrecto. Debe ser: 
-"[N|S] ggg mm.sss [W|E] ggg mm.sss"
-o
-"[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
-    </message>
-</context>
-<context>
-    <name>ISetupWorkspace</name>
-    <message>
-        <location filename="../gis/db/ISetupWorkspace.ui" line="14"/>
-        <source>Setup workspace...</source>
-        <translation>Configurar espacio de trabajo...</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupWorkspace.ui" line="35"/>
-        <source>save workspace on exit, and every</source>
-        <translation>guardar el espacio de trabajo al salir, y cada</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupWorkspace.ui" line="45"/>
-        <source>minutes</source>
-        <translation>minutos</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupWorkspace.ui" line="56"/>
-        <source>listen for database changes from other instances of QMapShack. On port</source>
-        <translation>Escuchar los cambios en la base de datos de otras instancias de QMapShack en puerto</translation>
-    </message>
-    <message>
-        <location filename="../gis/db/ISetupWorkspace.ui" line="63"/>
-        <source>00000</source>
-        <translation type="unfinished">00000</translation>
-    </message>
-</context>
-<context>
-    <name>ITemplateWidget</name>
-    <message>
-        <location filename="../widgets/ITemplateWidget.ui" line="14"/>
-        <source>Insert Template...</source>
-        <translation>Insertar plantilla...</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITemplateWidget.ui" line="32"/>
-        <source>Templates</source>
-        <translation>Plantillas</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITemplateWidget.ui" line="42"/>
-        <source>Select a path with your own templates.</source>
-        <translation>Selecciona una ruta con tus propias plantillas</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITemplateWidget.ui" line="45"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITemplateWidget.ui" line="77"/>
-        <source>Preview</source>
-        <translation>Vista previa</translation>
-    </message>
-</context>
-<context>
-    <name>ITextEditWidget</name>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="14"/>
-        <source>Edit text...</source>
-        <translation>Editar texto...</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="45"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="351"/>
-        <source>Undo</source>
-        <translation>Deshacer</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="354"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="58"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="363"/>
-        <source>Redo</source>
-        <translation>Rehacer</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="366"/>
-        <source>Ctrl+Shift+Z</source>
-        <translation>Ctrl+Shift+Z</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="71"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="375"/>
-        <source>Cut</source>
-        <translation>Cortar</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="378"/>
-        <source>Ctrl+X</source>
-        <translation>Ctrl+X</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="84"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="387"/>
-        <source>Copy</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="390"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="97"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="395"/>
-        <source>Paste</source>
-        <translation>Pegar</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="25"/>
-        <source>Templ.</source>
-        <translation>Plantilla.</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="120"/>
-        <source>A:L</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="133"/>
-        <source>A:C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="146"/>
-        <source>A:R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="159"/>
-        <source>A:B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="192"/>
-        <source>B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="205"/>
-        <source>I</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="218"/>
-        <source>U</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="238"/>
-        <source>C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="285"/>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="290"/>
-        <source>Bullet List (Disc)</source>
-        <translation>Lista de viñetas (Disco)</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
-        <source>Bullet List (Circle)</source>
-        <translation>Lista de viñetas (círculos)</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="300"/>
-        <source>Bullet List (Square)</source>
-        <translation>Lista de viñetas(cuadrados)</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="305"/>
-        <source>Ordered List (Decimal)</source>
-        <translation>Lista ordenada(decimal)</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="310"/>
-        <source>Ordered List (Alpha lower)</source>
-        <translation>Lista ordenada (alfabético descendente)</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="315"/>
-        <source>Ordered List (Alpha upper)</source>
-        <translation>Lista ordenada (alfabético ascendente)</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="320"/>
-        <source>Ordered List (Roman lower)</source>
-        <translation>Lista ordenada (números romanos descendente)</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="325"/>
-        <source>Ordered List (Roman upper)</source>
-        <translation>Lista ordenada (números romanos ascendente)</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="398"/>
-        <source>Ctrl+V</source>
-        <translation>Ctrl+V</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="410"/>
-        <source>Align Left</source>
-        <translation>Alinear a la Izquierda</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="413"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="425"/>
-        <source>Align Right</source>
-        <translation>Alinear a la Derecha</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="428"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="440"/>
-        <source>Align Center</source>
-        <translation>Alinear al Centro</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="443"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="455"/>
-        <source>Align Block</source>
-        <translation>Alinear Bloque</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="458"/>
-        <source>Ctrl+J</source>
-        <translation>Ctrl+J</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="470"/>
-        <source>Underline</source>
-        <translation>Subrayar</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="473"/>
-        <source>Ctrl+U</source>
-        <translation>Ctrl+U</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="485"/>
-        <source>Bold</source>
-        <translation>Negrita</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="488"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="500"/>
-        <source>Italic</source>
-        <translation>Cursiva</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="503"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="515"/>
-        <source>Plain</source>
-        <translation>Plano</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="518"/>
-        <source>Reset the text's format before pasting</source>
-        <translation>Restablecer el formato del texto antes del pegado</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="523"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="526"/>
-        <source>Select All</source>
-        <translation>Seleccionar todo</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="529"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="534"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="537"/>
-        <source>Delete</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="542"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="545"/>
-        <source>Reset Font</source>
-        <translation>Restablecer fuente</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="550"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="553"/>
-        <source>Reset Layout</source>
-        <translation>Restablecer diseño</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="565"/>
-        <source>Normal</source>
-        <translation>Normal</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="568"/>
-        <source>Paste without resetting the text's format</source>
-        <translation>Pegar sin restablecer el formato del texto</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="577"/>
-        <source>Insert From Template</source>
-        <translation>Insertar desde plantilla</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="580"/>
-        <source>Create text from template.</source>
-        <translation>Crear texto desde plantilla.</translation>
-    </message>
-</context>
-<context>
-    <name>ITextEditWidgetSelMenu</name>
-    <message>
-        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="55"/>
-        <source>B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="68"/>
-        <source>I</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="81"/>
-        <source>U</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="101"/>
-        <source>Cut</source>
-        <translation>Cortar</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="114"/>
-        <source>Copy</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="127"/>
-        <source>Paste</source>
-        <translation>Pegar</translation>
-    </message>
-</context>
-<context>
-    <name>ITimeZoneSetup</name>
-    <message>
-        <location filename="../units/ITimeZoneSetup.ui" line="14"/>
-        <source>Setup Time Zone ...</source>
-        <translation>Configurar la Zona Horaria.</translation>
-    </message>
-    <message>
-        <location filename="../units/ITimeZoneSetup.ui" line="22"/>
-        <source>UTC</source>
-        <translation>UTC</translation>
-    </message>
-    <message>
-        <location filename="../units/ITimeZoneSetup.ui" line="32"/>
-        <source>Local</source>
-        <translation>Local</translation>
-    </message>
-    <message>
-        <location filename="../units/ITimeZoneSetup.ui" line="42"/>
-        <source>Automatic</source>
-        <translation>Automático</translation>
-    </message>
-    <message>
-        <location filename="../units/ITimeZoneSetup.ui" line="75"/>
-        <source>Print date/time in </source>
-        <translation>Imprimir fecha y hora en</translation>
-    </message>
-    <message>
-        <location filename="../units/ITimeZoneSetup.ui" line="82"/>
-        <source>long format, or</source>
-        <translation>Formato largo, o</translation>
-    </message>
-    <message>
-        <location filename="../units/ITimeZoneSetup.ui" line="92"/>
-        <source>short format</source>
-        <translation>formato corto</translation>
-    </message>
-</context>
-<context>
-    <name>IToolBarSetupDialog</name>
-    <message>
-        <location filename="../helpers/IToolBarSetupDialog.ui" line="14"/>
-        <source>Setup Toolbar</source>
-        <translation>Configuración de barra de herramientas</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
-        <source>Toolbar is visible in Fullscreen-mode</source>
-        <translation>Barra de herramientas visible en modo Pantalla Completa</translation>
-    </message>
-</context>
-<context>
-    <name>IToolShell</name>
-    <message>
-        <location filename="../tool/IToolShell.cpp" line="46"/>
-        <source>Execution of external program `%1` failed: </source>
-        <translation>La ejecución del programa externo %1 falló:</translation>
-    </message>
-    <message>
-        <location filename="../tool/IToolShell.cpp" line="50"/>
-        <source>Process cannot be started.
-</source>
-        <translation>No se puede iniciar el proceso.
-</translation>
-    </message>
-    <message>
-        <location filename="../tool/IToolShell.cpp" line="51"/>
-        <source>Make sure the required packages are installed, `%1` exists and is executable.
-</source>
-        <translation>Asegúrese de que los paquetes necesarios estén instalados, `%1` existe y es ejecutable</translation>
-    </message>
-    <message>
-        <location filename="../tool/IToolShell.cpp" line="55"/>
-        <source>External process crashed.
-</source>
-        <translation>El proceso externo falló.
-</translation>
-    </message>
-    <message>
-        <location filename="../tool/IToolShell.cpp" line="59"/>
-        <source>An unknown error occurred.
-</source>
-        <translation>A ocurrido un error desconocido</translation>
-    </message>
-    <message>
-        <location filename="../tool/IToolShell.cpp" line="172"/>
-        <source>!!! failed !!!
-</source>
-        <translation>!!!falló!!!</translation>
-    </message>
-</context>
-<context>
-    <name>IUnit</name>
-    <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
-        <location filename="../units/IUnit.cpp" line="734"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
-        <source>Bad position format. Must be: "[N|S] ddd mm.sss [W|E] ddd mm.sss" or "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
-        <translation>Formato de coordenadas incorrecto. Debe ser: "[N|S] ggg mm.sss [W|E] ggg mm.sss" o "[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
-    </message>
-    <message>
-        <location filename="../units/IUnit.cpp" line="734"/>
-        <source>Position values out of bounds. </source>
-        <translation>Valores de posición fuera del límite.</translation>
-    </message>
-</context>
-<context>
-    <name>IUnitsSetup</name>
-    <message>
-        <location filename="../units/IUnitsSetup.ui" line="14"/>
-        <source>Setup units...</source>
-        <translation>Configurar unidades...</translation>
-    </message>
-    <message>
-        <location filename="../units/IUnitsSetup.ui" line="38"/>
-        <source>Metric</source>
-        <translation>Métrico</translation>
-    </message>
-    <message>
-        <location filename="../units/IUnitsSetup.ui" line="47"/>
-        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
-        <translation><b>Nota:</b> Para algunos elementos de la interfaz de usuario, cambiar las unidades no tendrá efecto hasta que se reinicie QMapShack.</translation>
-    </message>
-    <message>
-        <location filename="../units/IUnitsSetup.ui" line="31"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
-        <location filename="../units/IUnitsSetup.ui" line="24"/>
-        <source>Nautic</source>
-        <translation>Naútico</translation>
-    </message>
-</context>
-<context>
-    <name>IWptIconDialog</name>
-    <message>
-        <location filename="../helpers/IWptIconDialog.ui" line="14"/>
-        <source>Icons...</source>
-        <translation>Iconos.</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IWptIconDialog.ui" line="68"/>
-        <source>External Icons:</source>
-        <translation>Iconos:</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IWptIconDialog.ui" line="75"/>
-        <source>-</source>
-        <translation>-</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IWptIconDialog.ui" line="82"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../helpers/IWptIconDialog.ui" line="95"/>
-        <source>All custom icons have to be *.bmp or *.png format.</source>
-        <translation>Los iconos personalizados deben de ser BMP o PNG</translation>
-    </message>
-</context>
-</TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="es_ES">
+<context>
+    <name>CAbout</name>
+    <message>
+        <location filename="../CAbout.cpp" line="38"/>
+        <source>%1 (API V%2, expected V%3)</source>
+        <translation>%1 (API V%2, se esperaba V%3)</translation>
+    </message>
+    <message>
+        <location filename="../CAbout.cpp" line="42"/>
+        <source>%1 (API V%2)</source>
+        <translation>%1 (API V%2)</translation>
+    </message>
+    <message>
+        <location filename="../CAbout.cpp" line="49"/>
+        <source>(no DBUS: device detection and handling disabled)</source>
+        <translation>(no DBUS: detección y manipulación de dispositivos desactivados)</translation>
+    </message>
+</context>
+<context>
+    <name>CActivityTrk</name>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="51"/>
+        <source>Foot</source>
+        <translation>A pié</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="59"/>
+        <source>Bicycle</source>
+        <translation>Bicicleta</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="67"/>
+        <source>Motor Bike</source>
+        <translation>Moto</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="75"/>
+        <source>Car</source>
+        <translation>Coche</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="83"/>
+        <source>Cable Car</source>
+        <translation>Teleférico</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="91"/>
+        <source>Swim</source>
+        <translation>Natación</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="99"/>
+        <source>Ship</source>
+        <translation>Barco</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="115"/>
+        <source>Ski/Winter</source>
+        <translation>Esquí</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
+        <source>No Activity</source>
+        <translation>Sin Actividad</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
+        <source>Total</source>
+        <translation>Total</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
+        <source>Ascent:</source>
+        <translation>Ascenso:</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="372"/>
+        <source>Descent:</source>
+        <translation>Descenso:</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="107"/>
+        <source>Aeronautics</source>
+        <translation>Aeronáutica</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+        <source>Public Transport</source>
+        <translation>Transporte Público</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
+        <source>Distance:</source>
+        <translation>Distancia:</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="396"/>
+        <source>Speed Moving:</source>
+        <translation>Velocidad en movimiento:</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="420"/>
+        <source>Speed Total:</source>
+        <translation>Velocidad Total:</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="444"/>
+        <source>Time Moving:</source>
+        <translation>Tiempo en movimiento:</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="468"/>
+        <source>Time Total:</source>
+        <translation>Tiempo Total:</translation>
+    </message>
+</context>
+<context>
+    <name>CCanvas</name>
+    <message>
+        <location filename="../canvas/CCanvas.cpp" line="63"/>
+        <source>View %1</source>
+        <translation>Vista %1</translation>
+    </message>
+    <message>
+        <location filename="../canvas/CCanvas.cpp" line="766"/>
+        <source>Setup Map Background</source>
+        <translation>Configuracion del Fondo del Mapa</translation>
+    </message>
+</context>
+<context>
+    <name>CColorChooser</name>
+    <message>
+        <location filename="../widgets/CColorChooser.cpp" line="51"/>
+        <source>Esc.</source>
+        <translation>Esc.</translation>
+    </message>
+</context>
+<context>
+    <name>CCommandProcessor</name>
+    <message>
+        <location filename="../setup/CCommandProcessor.cpp" line="31"/>
+        <source>Print debug output to console.</source>
+        <translation>Imprimir salida de depuración en la consola.</translation>
+    </message>
+    <message>
+        <location filename="../setup/CCommandProcessor.cpp" line="34"/>
+        <source>Print debug output to logfile (temp. path).</source>
+        <translation>Imprimir salida de depuración en archivo (carpeta temporal).</translation>
+    </message>
+    <message>
+        <location filename="../setup/CCommandProcessor.cpp" line="37"/>
+        <source>Do not show splash screen.</source>
+        <translation>No mostrar pantalla de bienvenida</translation>
+    </message>
+    <message>
+        <location filename="../setup/CCommandProcessor.cpp" line="40"/>
+        <source>File with QMapShack configuration.</source>
+        <translation>Archivo con la configuración de QMapShack</translation>
+    </message>
+    <message>
+        <location filename="../setup/CCommandProcessor.cpp" line="40"/>
+        <source>file</source>
+        <translation>Archivo</translation>
+    </message>
+    <message>
+        <location filename="../setup/CCommandProcessor.cpp" line="43"/>
+        <source>Files for future use.</source>
+        <translation>Archivos para uso futuro</translation>
+    </message>
+</context>
+<context>
+    <name>CCreateRouteFromWpt</name>
+    <message>
+        <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="68"/>
+        <source>route</source>
+        <translation>Ruta</translation>
+    </message>
+</context>
+<context>
+    <name>CDBFolderLostFound</name>
+    <message>
+        <location filename="../gis/db/CDBFolderLostFound.cpp" line="30"/>
+        <source>All your data grouped by folders.</source>
+        <translation>Todos tus datos agrupados en carpetas.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBFolderLostFound.cpp" line="59"/>
+        <source>Lost & Found (%1)</source>
+        <translation>Objetos Perdidos (%1)</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBFolderLostFound.cpp" line="64"/>
+        <source>Lost & Found</source>
+        <translation>Objetos Perdidos</translation>
+    </message>
+</context>
+<context>
+    <name>CDBFolderMysql</name>
+    <message>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="33"/>
+        <source>All your data grouped by folders.</source>
+        <translation>Todos tus datos agrupados en carpetas.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="53"/>
+        <source>MySQL Database</source>
+        <translation>Mi base de datos SQL</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="60"/>
+        <source>Server: </source>
+        <translation>Servidor:</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="65"/>
+        <source> (No PW)</source>
+        <translation>(Sin PW)</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="73"/>
+        <source>Error: </source>
+        <translation>Error: </translation>
+    </message>
+</context>
+<context>
+    <name>CDBFolderSqlite</name>
+    <message>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="30"/>
+        <source>All your data grouped by folders.</source>
+        <translation>Todos tus datos agrupados en carpetas.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="52"/>
+        <source>SQLite Database</source>
+        <translation>Base de Datos SQLite</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="62"/>
+        <source>File: </source>
+        <translation>Archivo:</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="66"/>
+        <source>Error: </source>
+        <translation>Error: </translation>
+    </message>
+</context>
+<context>
+    <name>CDBItem</name>
+    <message>
+        <location filename="../gis/db/CDBItem.cpp" line="91"/>
+        <source>%1 min.</source>
+        <translation>%1 min.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBItem.cpp" line="95"/>
+        <source>%1 h</source>
+        <translation>%1 h</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBItem.cpp" line="99"/>
+        <source>%1 days</source>
+        <translation>%1 dias</translation>
+    </message>
+</context>
+<context>
+    <name>CDBProject</name>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="114"/>
+        <source>Failed to load...</source>
+        <translation>Falló al cargar...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="115"/>
+        <source>Can't load file "%1" . It will be skipped.</source>
+        <translation>No se puede cargar el archivo "%1" . Se omitirá.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="128"/>
+        <source>Project already in database...</source>
+        <translation>Proyecto ya en base de datos ...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="129"/>
+        <source>The project "%1" has already been imported into the database. It will be skipped.</source>
+        <translation>El proyecto "%1" Ya se ha importado a la base de datos. Se omitirá.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="280"/>
+        <source>The item %1 has been changed by %2 (%3). 
+
+To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
+        <translation>El elemento %1 se ha cambiado por %2 (%3). 
+
+Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar tu versión y tomar la de la base de datos</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="286"/>
+        <source>Conflict with database...</source>
+        <translation>Conflicto con la base de datos...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="287"/>
+        <source>Clone && Save</source>
+        <translation>Duplicar y Guardar</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="288"/>
+        <source>Force Save</source>
+        <translation>Forzar guardado</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="289"/>
+        <source>Take remote</source>
+        <translation>Toma remota</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="573"/>
+        <source>Missing folder...</source>
+        <translation>Falta la carpeta</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="574"/>
+        <source>Failed to save project. The folder has been deleted in the database.</source>
+        <translation>Error al guardar el proyecto. La carpeta se ha eliminado de la base de datos.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="581"/>
+        <source>Save ...</source>
+        <translation>Guardar...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
+        <source>There was an unexpected database error:
+
+%1</source>
+        <translation>Se produjo un error inesperado en la base de datos :
+
+%1</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="761"/>
+        <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
+        <translation>El proyecto '%1' Está a punto de actualizarse desde la base de datos. Sin embargo, hay cambios no guardados.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CDBProject.cpp" line="762"/>
+        <source>Save changes?</source>
+        <translation>¿Guardar cambios?</translation>
+    </message>
+</context>
+<context>
+    <name>CDemList</name>
+    <message>
+        <location filename="../dem/CDemList.cpp" line="195"/>
+        <source>Deactivate</source>
+        <translation>Desactivar</translation>
+    </message>
+    <message>
+        <location filename="../dem/CDemList.cpp" line="195"/>
+        <source>Activate</source>
+        <translation>Activar</translation>
+    </message>
+</context>
+<context>
+    <name>CDemPathSetup</name>
+    <message>
+        <location filename="../dem/CDemPathSetup.cpp" line="41"/>
+        <source>Add or remove paths containing DEM data. There can be multiple files in a path but no sub-path is parsed. Supported formats are: %1</source>
+        <translation>Añadir o quitar rutas que contienen datos DEM. Puede haber múltiples archivos en una ruta, pero no se buscará en los subdirectorios. Los formatos soportados son: %1</translation>
+    </message>
+    <message>
+        <location filename="../dem/CDemPathSetup.cpp" line="56"/>
+        <source>Select DEM file path...</source>
+        <translation>Seleccione la ruta al archivo DEM...</translation>
+    </message>
+</context>
+<context>
+    <name>CDemVRT</name>
+    <message>
+        <location filename="../dem/CDemVRT.cpp" line="44"/>
+        <location filename="../dem/CDemVRT.cpp" line="52"/>
+        <location filename="../dem/CDemVRT.cpp" line="61"/>
+        <location filename="../dem/CDemVRT.cpp" line="90"/>
+        <source>Error...</source>
+        <translation>Error...</translation>
+    </message>
+    <message>
+        <location filename="../dem/CDemVRT.cpp" line="44"/>
+        <source>Failed to load file: %1</source>
+        <translation>Fallo al cargar el archivo: %1</translation>
+    </message>
+    <message>
+        <location filename="../dem/CDemVRT.cpp" line="52"/>
+        <location filename="../dem/CDemVRT.cpp" line="61"/>
+        <source>DEM must have one band with 16bit or 32bit data.</source>
+        <translation>El DEM debe tener una sola banda con datos de 16 o 32 bits.</translation>
+    </message>
+    <message>
+        <location filename="../dem/CDemVRT.cpp" line="90"/>
+        <source>No georeference information found.</source>
+        <translation>No se encontró información de georreferenciación.</translation>
+    </message>
+</context>
+<context>
+    <name>CDetailsGeoCache</name>
+    <message>
+        <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="61"/>
+        <source>none</source>
+        <translation>ninguno</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="61"/>
+        <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="131"/>
+        <source>???</source>
+        <translation>???</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="158"/>
+        <source>Searching for images...</source>
+        <translation>Buscando imagenes...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="264"/>
+        <source>No images found</source>
+        <translation>No se encontraron imagenes</translation>
+    </message>
+</context>
+<context>
+    <name>CDetailsPrj</name>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="267"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
+        <source>none</source>
+        <translation>ninguna</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="340"/>
+        <source>Build diary...</source>
+        <translation>Creando diario...</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="419"/>
+        <source><h2>Waypoints</h2></source>
+        <translation>Waypoints</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="426"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="452"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="573"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="691"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="721"/>
+        <source>Info</source>
+        <translation>Información</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="427"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="574"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="692"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="722"/>
+        <source>Comment</source>
+        <translation>Comentario</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
+        <source><h2>Tracks</h2></source>
+        <translation>Tracks</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
+        <source>From Start</source>
+        <translation>Desde el inicio</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
+        <source>To Next</source>
+        <translation>Al siguiente</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
+        <source>To End</source>
+        <translation>Al Final</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
+        <source>Ascent: </source>
+        <translation>Ascenso: </translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
+        <source>Descent: </source>
+        <translation>Descenso: </translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
+        <source><h2>Areas</h2></source>
+        <translation>Áreas</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
+        <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
+        <translation>Desea ordenar waypoints a lo largo de un track, pero ha desactivado la correlación de track y waypoint. ¿Desea volver a encenderlo?</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
+        <source>Correlation...</source>
+        <translation>Correlación..</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="395"/>
+        <source><b>Summary over all tracks in project</b><br/></source>
+        <translation><b>Resumen de todos los tracks del proyecto</b><br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
+        <source>Distance: </source>
+        <translation>Distancia: </translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
+        <source><h2>Routes</h2></source>
+        <translation><h2>Rutas</h2></translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+        <source>Edit name...</source>
+        <translation>Editar nombre...</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+        <source>Enter new project name.</source>
+        <translation>Introducir nuevo nombre de proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+        <source>Edit keywords...</source>
+        <translation>Editar etiquetas...</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
+        <source>Enter keywords.</source>
+        <translation>Introducir etiquetas.</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="897"/>
+        <source>Print Diary</source>
+        <translation>Imprimir Diario</translation>
+    </message>
+</context>
+<context>
+    <name>CDetailsTrk</name>
+    <message>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
+        <source>Reduce visible track points</source>
+        <translation>Reducir puntos visibles del track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
+        <source>Change elevation of track points</source>
+        <translation>Cambiar altitud de puntos del track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
+        <source>Change timestamp of track points</source>
+        <translation>Cambiar fecha/hora de puntos del track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
+        <source>Miscellaneous</source>
+        <translation>Diversos</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
+        <source>Color</source>
+        <translation>Color</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+        <source>Activity</source>
+        <translation>Actividad</translation>
+    </message>
+</context>
+<context>
+    <name>CDetailsWpt</name>
+    <message>
+        <location filename="../gis/wpt/CDetailsWpt.cpp" line="166"/>
+        <source>Enter new proximity range.</source>
+        <translation>Introduzca el nuevo valor de proximidad.</translation>
+    </message>
+</context>
+<context>
+    <name>CDeviceGarmin</name>
+    <message>
+        <location filename="../device/CDeviceGarmin.cpp" line="272"/>
+        <source>Picture%1</source>
+        <translation>foto%1</translation>
+    </message>
+    <message>
+        <location filename="../gis/gpx/serialization.cpp" line="1068"/>
+        <source>Unknown</source>
+        <translation>Desconocido</translation>
+    </message>
+</context>
+<context>
+    <name>CDeviceGarminArchive</name>
+    <message>
+        <location filename="../device/CDeviceGarminArchive.cpp" line="30"/>
+        <source>Archive - expand to load</source>
+        <translation>Archivo: expanda para cargar</translation>
+    </message>
+    <message>
+        <location filename="../device/CDeviceGarminArchive.cpp" line="43"/>
+        <source>Archive - loaded</source>
+        <translation>Archivo - cargado</translation>
+    </message>
+</context>
+<context>
+    <name>CElevationDialog</name>
+    <message>
+        <location filename="../helpers/CElevationDialog.cpp" line="92"/>
+        <source>No DEM data found for that point.</source>
+        <translation>No se encontraron datos DEM para ese punto.</translation>
+    </message>
+</context>
+<context>
+    <name>CExportDatabase</name>
+    <message>
+        <location filename="../gis/db/CExportDatabase.cpp" line="90"/>
+        <source>Select export path...</source>
+        <translation>Seleccionar ruta de exportación ...</translation>
+    </message>
+</context>
+<context>
+    <name>CExportDatabaseThread</name>
+    <message>
+        <location filename="../gis/db/CExportDatabaseThread.cpp" line="79"/>
+        <location filename="../gis/db/CExportDatabaseThread.cpp" line="123"/>
+        <source>Create %1</source>
+        <translation>Crear %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CExportDatabaseThread.cpp" line="82"/>
+        <location filename="../gis/db/CExportDatabaseThread.cpp" line="126"/>
+        <source>Failed to create %1</source>
+        <translation>Fallo al crear %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CExportDatabaseThread.cpp" line="88"/>
+        <source>Done!</source>
+        <translation>¡Hecho!</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CExportDatabaseThread.cpp" line="100"/>
+        <source>Abort by user!</source>
+        <translation>¡Cancelado por el usuario!</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CExportDatabaseThread.cpp" line="108"/>
+        <location filename="../gis/db/CExportDatabaseThread.cpp" line="140"/>
+        <location filename="../gis/db/CExportDatabaseThread.cpp" line="165"/>
+        <source>Database Error: %1</source>
+        <translation>Error de base de datos: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CExportDatabaseThread.cpp" line="153"/>
+        <source>Save project as %1</source>
+        <translation>Guardar proyecto como %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CExportDatabaseThread.cpp" line="157"/>
+        <source>Failed!</source>
+        <translation>¡Falló!</translation>
+    </message>
+</context>
+<context>
+    <name>CFilterDeleteExtension</name>
+    <message>
+        <location filename="../gis/trk/filter/CFilterDeleteExtension.cpp" line="57"/>
+        <source>No extension available</source>
+        <translation>Extensión no disponible</translation>
+    </message>
+</context>
+<context>
+    <name>CFilterInterpolateElevation</name>
+    <message>
+        <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="30"/>
+        <source>coarse</source>
+        <translation>grueso</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="31"/>
+        <source>medium</source>
+        <translation>medio</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="32"/>
+        <source>fine</source>
+        <translation>fino</translation>
+    </message>
+</context>
+<context>
+    <name>CFitCrcState</name>
+    <message>
+        <location filename="../gis/fit/decoder/CFitCrcState.cpp" line="32"/>
+        <source>FIT decoding error : invalid CRC.</source>
+        <translation>Error decodificando FIT : CRC inválido.</translation>
+    </message>
+</context>
+<context>
+    <name>CFitDecoder</name>
+    <message>
+        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="132"/>
+        <source>FIT decoding error: unexpected end of file %1.</source>
+        <translation>FIT error de descodificación: final inesperado del archivo %1.</translation>
+    </message>
+</context>
+<context>
+    <name>CFitFieldBuilder</name>
+    <message>
+        <location filename="../gis/fit/decoder/CFitFieldBuilder.cpp" line="77"/>
+        <source>FIT decoding error: unknown base type %1.</source>
+        <translation>Error de descodificación FIT: tipo de base desconocido %1.</translation>
+    </message>
+</context>
+<context>
+    <name>CFitFieldDataState</name>
+    <message>
+        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
+        <source>Missing field definition for development field.</source>
+        <translation>Falta la definición de campo para el campo de desarrollo.</translation>
+    </message>
+    <message>
+        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="226"/>
+        <source>FIT decoding error: invalid field def nr %1 while creating dev field profile.</source>
+        <translation>Error de decodificación FIT: campo no válido def nr %1 al crear el perfil de campo dev</translation>
+    </message>
+</context>
+<context>
+    <name>CFitHeaderState</name>
+    <message>
+        <location filename="../gis/fit/decoder/CFitHeaderState.cpp" line="69"/>
+        <source>FIT decoding error: protocol %1 version not supported.</source>
+        <translation>Error de descodificación FIT: la versión del protocolo %1 no es compatible.</translation>
+    </message>
+    <message>
+        <location filename="../gis/fit/decoder/CFitHeaderState.cpp" line="120"/>
+        <source>FIT decoding error: file header signature mismatch. File is not FIT.</source>
+        <translation>Error de descodificación de FIT: falta de coincidencia de firma de encabezado de archivo. El archivo no es FIT.</translation>
+    </message>
+</context>
+<context>
+    <name>CFitProject</name>
+    <message>
+        <location filename="../gis/fit/CFitProject.cpp" line="61"/>
+        <source>Failed to load file %1...</source>
+        <translation>Falló al cargar archivo %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/fit/CFitProject.cpp" line="93"/>
+        <source>Failed to open FIT file %1.</source>
+        <translation>Falló al cargar archivo FIT %1.</translation>
+    </message>
+</context>
+<context>
+    <name>CFitRecordContentState</name>
+    <message>
+        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="70"/>
+        <source>FIT decoding error: architecture %1 not supported.</source>
+        <translation>Error decodificacion FIT: Arquitectura %1 no soportada</translation>
+    </message>
+    <message>
+        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="110"/>
+        <source>FIT decoding error: invalid offset %1 for state 'record content'</source>
+        <translation>FIT error de decodificación: desplazamiento no válido %1 para el contenido de registro de estado</translation>
+    </message>
+</context>
+<context>
+    <name>CGarminTyp</name>
+    <message>
+        <location filename="../map/garmin/CGarminTyp.cpp" line="457"/>
+        <location filename="../map/garmin/CGarminTyp.cpp" line="838"/>
+        <source>Warning...</source>
+        <translation>Aviso...</translation>
+    </message>
+    <message>
+        <location filename="../map/garmin/CGarminTyp.cpp" line="457"/>
+        <source>This is a typ file with unknown polygon encoding. Please report!</source>
+        <translation>Este es un fichero TYP con una codificación de polígonos desconocida. ¡Por favor repórtelo!</translation>
+    </message>
+    <message>
+        <location filename="../map/garmin/CGarminTyp.cpp" line="838"/>
+        <source>This is a typ file with unknown polyline encoding. Please report!</source>
+        <translation>Este es un fichero TYP con una codificación de polilíneas desconocida. ¡Por favor repórtelo!</translation>
+    </message>
+</context>
+<context>
+    <name>CGisItemOvlArea</name>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="36"/>
+        <source>thin</source>
+        <translation>fino</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="37"/>
+        <source>normal</source>
+        <translation>normal</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="38"/>
+        <source>wide</source>
+        <translation>ancho</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="39"/>
+        <source>strong</source>
+        <translation>intenso</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="78"/>
+        <source>_Clone</source>
+        <translation>Duplicar</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
+        <source>Area: %1%2</source>
+        <translation>Área: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
+        <source>Changed area shape.</source>
+        <translation>Se cambió la forma del área.</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="459"/>
+        <source>Changed name.</source>
+        <translation>Se cambió el nombre.</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="465"/>
+        <source>Changed border width.</source>
+        <translation>Se cambió la anchura del borde.</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="471"/>
+        <source>Changed fill pattern.</source>
+        <translation>Se cambió el patró de relleno.</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="477"/>
+        <source>Changed opacity.</source>
+        <translation>Se cambió la opacidad.</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="483"/>
+        <source>Changed comment.</source>
+        <translation>Se cambió el comentario.</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="489"/>
+        <source>Changed description.</source>
+        <translation>Se cambió la descripción.</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="495"/>
+        <source>Changed links</source>
+        <translation>Se cambió el enlace</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="506"/>
+        <source>Changed color</source>
+        <translation>Se cambió el color</translation>
+    </message>
+</context>
+<context>
+    <name>CGisItemRte</name>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="66"/>
+        <source>_Clone</source>
+        <translation>_Duplicar</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+        <source>track</source>
+        <translation>track</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
+        <source>Changed name.</source>
+        <translation>Se cambió el nombre.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
+        <source>Changed comment</source>
+        <translation>Se cambió el comentario</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
+        <source>Changed description</source>
+        <translation>Se cambió la descripción</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
+        <source>Changed links</source>
+        <translation>Se cambió el enlace</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
+        <source>Length: %1%2</source>
+        <translation>Longitud: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
+        <source>Time: %1%2</source>
+        <translation>Tiempo: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
+        <source>Distance: %1%2</source>
+        <translation>Distancia: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
+        <source>Length: -</source>
+        <translation>Longitud: -</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
+        <source>Time: -</source>
+        <translation>Tiempo: -</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+        <source>%1%2 %3, %4%5 %6</source>
+        <translation>%1%2 %3, %4%5 %6</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
+        <source>Last time routed:<br/>%1</source>
+        <translation>Última vez enrutado:<br/>%1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
+        <source>with %1</source>
+        <translation>con %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
+        <source>Changed route points.</source>
+        <translation>Puntos de ruta modificados.</translation>
+    </message>
+</context>
+<context>
+    <name>CGisItemTrk</name>
+    <message>
+        <location filename="../gis/fit/serialization.cpp" line="285"/>
+        <source>FIT file %1 contains no GPS data.</source>
+        <translation>Archivo FIT %1 no contiene datos GPS.</translation>
+    </message>
+    <message>
+        <location filename="../gis/tnv/serialization.cpp" line="211"/>
+        <location filename="../gis/tnv/serialization.cpp" line="347"/>
+        <location filename="../gis/tnv/serialization.cpp" line="376"/>
+        <location filename="../gis/tnv/serialization.cpp" line="387"/>
+        <location filename="../gis/tnv/serialization.cpp" line="420"/>
+        <source>Error...</source>
+        <translation>Error...</translation>
+    </message>
+    <message>
+        <location filename="../gis/tnv/serialization.cpp" line="211"/>
+        <location filename="../gis/tnv/serialization.cpp" line="347"/>
+        <source>Failed to open %1.</source>
+        <translation>Fallo al abrir %1.</translation>
+    </message>
+    <message>
+        <location filename="../gis/tnv/serialization.cpp" line="376"/>
+        <location filename="../gis/tnv/serialization.cpp" line="387"/>
+        <source>Only support lon/lat WGS 84 format.</source>
+        <translation>Solamente soporta formato lon/lat WGS84.</translation>
+    </message>
+    <message>
+        <location filename="../gis/tnv/serialization.cpp" line="420"/>
+        <source>Failed to read data.</source>
+        <translation>Fallo al leer los datos.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="78"/>
+        <source>_Clone</source>
+        <translation>_Duplicar</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="261"/>
+        <source>Changed trackpoints, sacrificed all previous data.</source>
+        <translation>Se cambiaron los puntos del track, y descartados todos los datos previos.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="396"/>
+        <source>Time: %1%2, Speed: %3%4</source>
+        <translation>Tiempo: %1%2, Velocidad: %3%4</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+        <source>Moving: %1%2, Speed: %3%4</source>
+        <translation>Tiempo en movimiento: %1%2, Velocidad: %3%4</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="421"/>
+        <source>Start: %1</source>
+        <translation>Inicio: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
+        <source>Start: -</source>
+        <translation>Inicio: -</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
+        <source>End: %1</source>
+        <translation>Final: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+        <source>End: -</source>
+        <translation>Final: -</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+        <source>Points: %1 (%2)</source>
+        <translation>Puntos: %1 (%2)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="443"/>
+        <source>Invalid elevations!</source>
+        <translation>¡Datos de altitud invalidos!</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
+        <source>Invalid timestamps!</source>
+        <translation>¡Marcas de tiempo no válidas!</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
+        <source>Invalid positions!</source>
+        <translation>¡Posiciones inválidas!</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+        <source>Activities: %1</source>
+        <translation>Actividades: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
+        <source>Index: %1</source>
+        <translation>Indice: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
+        <source>Index: visible %1, total %2</source>
+        <translation>Indice: visible %1. total %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+        <source>, Slope: %1%2</source>
+        <translation>, Pendiente: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+        <source>... and %1 tags not displayed</source>
+        <translation>Y %1 etiquetas no mostradas</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
+        <source>Distance: - (-)</source>
+        <translation>Distancia: - (-)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
+        <source>Moving: - (-)</source>
+        <translation>En movimiento: - (-)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1318"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1331"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1387"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1570"/>
+        <source>track</source>
+        <translation>track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1522"/>
+        <source>Hide point %1.</source>
+        <translation>Ocultar punto %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1526"/>
+        <source>Hide points %1..%2.</source>
+        <translation>Ocultar puntos %1..%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="701"/>
+        <source>, %1%2</source>
+        <translation>, %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="124"/>
+        <source>Invalid points....</source>
+        <translation>Puntos inválidos...</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="125"/>
+        <source>The track '%1' has %2 invalid points out of %3 visible points. Do you want to hide invalid points now?</source>
+        <translation>El track '%1' tiene %2 puntos inválidos de  %3 visibles. ¿Quiere ocultar los puntos inválidos?</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>min.</source>
+        <translation type="unfinished">min.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>max.</source>
+        <translation type="unfinished">max.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="377"/>
+        <source>Length: %1%2</source>
+        <translation>Longitud: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <source>, %1%2%3, %4%5%6</source>
+        <translation>, %1%2%3, %4%5%6</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <source>, %1-, %2-</source>
+        <translation>, %1-, %2-</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
+        <source>Time: -, Speed: -</source>
+        <translation>Tiempo: -, Velocidad: -</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
+        <source>Moving: -, Speed: -</source>
+        <translation>En movimiento: -, Velocidad: -</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="589"/>
+        <source>Ele.: %1%2</source>
+        <translation>Altitud: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <source>, Speed: %1%2</source>
+        <translation>, Velocidad: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="636"/>
+        <source>Ascent: - (-)</source>
+        <translation>Ascenso: - (-)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
+        <source>Descent: - (-)</source>
+        <translation>Descenso: - (-)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="644"/>
+        <source>Ascent: %1%2 (%3%)</source>
+        <translation>Ascenso: %1%2 (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
+        <source>, Descent: %1%2 (%3%)</source>
+        <translation>, Descenso: %1%2 (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
+        <source>Distance: %1%2 (%3%)</source>
+        <translation>Distancia: %1%2 (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <source>, Moving: %1%2 (%3%)</source>
+        <translation>, En Movimiento: %1%2 (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
+        <source>Ascent: -</source>
+        <translation>Ascenso: -</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
+        <source>Descent: -</source>
+        <translation>Descenso: -</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
+        <source>Ascent: %1%2</source>
+        <translation>Ascenso: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="696"/>
+        <source>, Descent: %1%2</source>
+        <translation>, Descenso: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="706"/>
+        <source>Distance: %1%2</source>
+        <translation>Distancia: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="711"/>
+        <source>, Time: %1%2</source>
+        <translation>, Tiempo: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1377"/>
+        <source>Permanently removed points %1..%2</source>
+        <translation>Puntos eliminados definitivamente %1..%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1555"/>
+        <source>Show points.</source>
+        <translation>Mostrar puntos.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2194"/>
+        <source>Changed name</source>
+        <translation>Se cambió el nombre</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2200"/>
+        <source>Changed comment</source>
+        <translation>Se cambió el comentario</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2206"/>
+        <source>Changed description</source>
+        <translation>Se cambió la descripción</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
+        <source>Changed links</source>
+        <translation>Se cambió el enlace</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2223"/>
+        <source>Changed elevation of point %1 to %2 %3</source>
+        <translation>Se cambió altitud de los puntos %1 a %2 %3</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2247"/>
+        <source>Changed activity to '%1' for complete track.</source>
+        <translation>Actividad cambiada a '%1' para todo el track.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2286"/>
+        <source>Changed activity to '%1' for range(%2..%3).</source>
+        <translation>Actividad cambiada a '%1' para el rango (%2..%3).</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="96"/>
+        <source>Hide points by Douglas Peuker algorithm (%1%2)</source>
+        <translation>Ocultar puntos con algoritmo Douglas Peuker (%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="122"/>
+        <source>Hide points with invalid data.</source>
+        <translation>Ocultar puntos con datos inválidos</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="132"/>
+        <source>Reset all hidden track points to visible</source>
+        <translation>Restaurados todos los puntos a visible</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="162"/>
+        <source>Permanently removed all hidden track points</source>
+        <translation>Elminados definitivamente todos los puntos ocultos del track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="199"/>
+        <source>Smoothed profile with a Median filter of size %1</source>
+        <translation>Pefil suavizado con Mediana de %1 puntos</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="221"/>
+        <source>Added terrain slope from DEM file.</source>
+        <translation>Añadida pendiente del terreno desde archivo DEM</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="243"/>
+        <source>Replaced elevation data with data from DEM files.</source>
+        <translation>Datos de altitud sustituidos por valores de fichero DEM.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="261"/>
+        <source>Replaced elevation data with interpolated values. (M=%1, RMSErr=%2)</source>
+        <translation>Reemplazados datos de altitud con valores interpolados. (M=%1, RMSErr=%2)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="277"/>
+        <source>Offset elevation data by %1%2.</source>
+        <translation>altitud desplazada %1%2.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="290"/>
+        <source>Changed start of track to %1.</source>
+        <translation>Cambiado el inicio de track a %1.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="303"/>
+        <source>Remove timestamps.</source>
+        <translation>Eliminadas las marcas de tiempo.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="320"/>
+        <source>Set artificial timestamps with delta of %1 sec.</source>
+        <translation>Marcas de tiempo ficticias con incremento de %1 sec.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="346"/>
+        <source>Changed speed to %1%2.</source>
+        <translation>Velocidad modificada a %1%2.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="365"/>
+        <source>%1 (Segment %2)</source>
+        <translation>%1 (Segmento %2)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="383"/>
+        <source>Removed extension %1 from all Track Points</source>
+        <translation>Eliminada extensión %1 a todos los puntos del track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="394"/>
+        <source>Converted subpoints from routing to track points</source>
+        <translation>Convertidos puntos secundarios del ruteo a puntos de track</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/converter.cpp" line="196"/>
+        <source>Copy flag information from QLandkarte GT track</source>
+        <translation>Copiar información del encabezado del track de QLandkarte GT</translation>
+    </message>
+</context>
+<context>
+    <name>CGisItemWpt</name>
+    <message>
+        <location filename="../gis/gpx/serialization.cpp" line="609"/>
+        <source>Archived</source>
+        <translation>Archivado</translation>
+    </message>
+    <message>
+        <location filename="../gis/gpx/serialization.cpp" line="613"/>
+        <source>Available</source>
+        <translation>Disponible</translation>
+    </message>
+    <message>
+        <location filename="../gis/gpx/serialization.cpp" line="617"/>
+        <source>Not Available</source>
+        <translation>No Disponible</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="104"/>
+        <source>_Clone</source>
+        <translation>Duplicar</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="277"/>
+        <source>Elevation: %1%2</source>
+        <translation>Altitud: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="288"/>
+        <source>Proximity: %1%2</source>
+        <translation>Proximidad: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
+        <source>Changed name</source>
+        <translation>Se cambió el nombre</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <source>Changed position</source>
+        <translation>Se cambió la posición</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <source>Changed elevation</source>
+        <translation>Se cambió la altitud</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="413"/>
+        <source>Removed proximity</source>
+        <translation type="unfinished">Eliminada proximidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="417"/>
+        <source>Changed proximity</source>
+        <translation>Se cambió la proximidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="432"/>
+        <source>Changed icon</source>
+        <translation>Se cambió el icono</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="438"/>
+        <source>Changed comment</source>
+        <translation>Se cambió el comentario</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="444"/>
+        <source>Changed description</source>
+        <translation>Se cambió la descripción</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="450"/>
+        <source>Changed links</source>
+        <translation>Se cambió el enlace</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="456"/>
+        <source>Changed images</source>
+        <translation>Se cambió la imagen</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="462"/>
+        <source>Add image</source>
+        <translation>Añadir Imagen</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="877"/>
+        <source>Changed to proximity-radius</source>
+        <translation type="unfinished">Cambiado a radio de proximidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="882"/>
+        <source>Changed to nogo-area</source>
+        <translation type="unfinished">Cambiado a área prohibida</translation>
+    </message>
+</context>
+<context>
+    <name>CGisListDB</name>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="84"/>
+        <source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
+        <translation>Debido a cambios en el sistema de base de datos QMapShack olvidó el nombre de archivo de su base de datos  '%1'. Debe seleccionarlo de nuevo en el siguiente paso.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="85"/>
+        <source>Select database file.</source>
+        <translation>Seleccionar archivo de base de datos.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="118"/>
+        <source>Add Database</source>
+        <translation>Añadir Base de Datos</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="121"/>
+        <source>Add Folder</source>
+        <translation>Añadir carpeta</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="122"/>
+        <source>Rename Folder</source>
+        <translation>Renombrar carpeta</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="123"/>
+        <source>Copy Folder</source>
+        <translation>Copiar carpeta</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="124"/>
+        <source>Move Folder</source>
+        <translation>Mover carpeta</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="125"/>
+        <source>Delete Folder</source>
+        <translation>Eliminar Carpeta</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <source>Import from Files...</source>
+        <translation>Importar desde archivos..</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="128"/>
+        <source>Export to GPX...</source>
+        <translation>Exportar a GPX...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="131"/>
+        <location filename="../gis/CGisListDB.cpp" line="147"/>
+        <source>Delete Item</source>
+        <translation>Eliminar Elemento</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="135"/>
+        <source>Search Database</source>
+        <translation>Buscar base de datos</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="136"/>
+        <source>Sync. with Database</source>
+        <translation>Sincronizar con base de datos</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="137"/>
+        <source>Remove Database</source>
+        <translation>Quitar Base de Datos</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="144"/>
+        <source>Empty</source>
+        <translation>Vacío</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="444"/>
+        <source>Remove database...</source>
+        <translation>Quitar Base de Datos...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="444"/>
+        <source>Do you really want to remove '%1' from the list?</source>
+        <translation>¿Seguro que quiere eliminar '%1' de la lista?</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="508"/>
+        <source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
+        <translation>¿Está seguro que quiere borrar las carpetas seleccionadas y sus subcarpetas de la base de datos?</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="676"/>
+        <source>Bad operation....</source>
+        <translation>Mala operación...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="676"/>
+        <source>The target folder is a subfolder of the one to move. This will not work.</source>
+        <translation>La carpeta de destino es una subcarpeta de la que se va a mover. Esto no funcionará.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="735"/>
+        <source>Folder name...</source>
+        <translation>Nombre de carpeta...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="735"/>
+        <source>Rename folder:</source>
+        <translation>Renombrar carpeta:</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="864"/>
+        <source>Are you sure you want to delete '%1' from folder '%2'?</source>
+        <translation>¿Desea realmente eliminar '%1' de la carpeta '%2'?</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="865"/>
+        <source>Delete...</source>
+        <translation>Borrar...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="1055"/>
+        <source>Import GIS Data...</source>
+        <translation>Importar datos GIS...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="508"/>
+        <source>Delete database folder...</source>
+        <translation>Eliminar Carpeta de la Base de Datos...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="756"/>
+        <location filename="../gis/CGisListDB.cpp" line="777"/>
+        <source>Remove items...</source>
+        <translation>Eliminar elementos...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="756"/>
+        <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
+        <translation>¿Desea realmente eliminar todos los elementos de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="777"/>
+        <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
+        <translation>¿Desea realmente eliminar todos los elementos.seleccionados de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
+    </message>
+</context>
+<context>
+    <name>CGisListWks</name>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="122"/>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="106"/>
+        <source>Edit..</source>
+        <translation>Editar..</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="131"/>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="140"/>
+        <source>Update Project on Device</source>
+        <translation>Actualizar Proyecto en Dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="154"/>
+        <source>Edit...</source>
+        <translation>Editar...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="155"/>
+        <source>Copy to...</source>
+        <translation>Copiar a...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="118"/>
+        <source>Autom. Save</source>
+        <translation>Guardado Automático</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="123"/>
+        <source>Save as...</source>
+        <translation>Guardar como...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="164"/>
+        <source>Copy Track with Waypoints</source>
+        <translation>Copiar tracks y waypoints</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
+        <source>Show Bubble</source>
+        <translation>Mostrar burbuja de texto</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="175"/>
+        <source>Move Waypoint</source>
+        <translation>Mover Waypoint</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="176"/>
+        <source>Proj. Waypoint...</source>
+        <translation>Proyectar Waypoint...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="177"/>
+        <source>Change Radius</source>
+        <translation>Cambiar radio</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="178"/>
+        <source>Toggle Nogo-Area</source>
+        <translation>Herramienta área prohibida</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <source>Delete Radius</source>
+        <translation type="unfinished">Borrar Radio</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
+        <source>Route Instructions</source>
+        <translation>Instrucciones de ruta</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="191"/>
+        <source>Calculate Route</source>
+        <translation>Calcular ruta</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="192"/>
+        <source>Reset Route</source>
+        <translation>Recalcular ruta</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="193"/>
+        <source>Edit Route</source>
+        <translation>Editar ruta</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="194"/>
+        <source>Convert to Track</source>
+        <translation>Convertir en track</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="212"/>
+        <source>Create Route</source>
+        <translation>Crear ruta</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="213"/>
+        <source>Change Icon (sel. waypt. only)</source>
+        <translation>Cambiar icono</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="163"/>
+        <source>Set Track Activity</source>
+        <translation>Establecer actividad del track</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="646"/>
+        <source>Drop items...</source>
+        <translation>Descartar elementos</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="671"/>
+        <location filename="../gis/CGisListWks.cpp" line="1771"/>
+        <location filename="../gis/CGisListWks.cpp" line="1809"/>
+        <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
+        <translation><b>Actualizar dispositivos</b><p>Actualizar %1<br/>Por favor espere...</p></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
+        <source>Delete project...</source>
+        <translation>Eliminar Proyecto...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
+        <source>Do you really want to delete %1?</source>
+        <translation>¿Desea realmente eliminar %1?</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
+        <source>Track Profile</source>
+        <translation>Perfil del Track</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <source>Show on Map</source>
+        <translation>Mostrar en el mapa</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="109"/>
+        <source>Hide from Map</source>
+        <translation>Ocultar en el mapa</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="114"/>
+        <source>Sort by Time</source>
+        <translation>Ordenar por fecha</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
+        <source>Sort by Name</source>
+        <translation>Ordenar por nombre</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="124"/>
+        <source>Save as GPX 1.1 w/o ext...</source>
+        <translation>Guardar como GPX 1.1 w/o ext...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="127"/>
+        <source>Send to Devices</source>
+        <translation>Enviar a dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
+        <source>Sync. with Database</source>
+        <translation>Sincronizar con base de datos</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
+        <source>Select Range</source>
+        <translation>Seleccionar Rango</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
+        <source>Edit Track Points</source>
+        <translation>Editar Puntos del Track</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <source>Reverse Track</source>
+        <translation>Invertir Track</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="162"/>
+        <source>Combine Tracks</source>
+        <translation>Combinar Tracks</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="204"/>
+        <source>Edit Area Points</source>
+        <translation>Editar Puntos del Área</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="166"/>
+        <source>Delete</source>
+        <translation>Borrar</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="797"/>
+        <source>Saving workspace. Please wait.</source>
+        <translation>Guardando espacio de trabajo. Por favor espere.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="843"/>
+        <source>Loading workspace. Please wait.</source>
+        <translation>Cargando espacio de trabajo. Por favor espere.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
+        <source>Close all projects...</source>
+        <translation>Cerrar todos los proyectos...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
+        <source>This will remove all projects from the workspace.</source>
+        <translation>Esto eliminará todos los proyectos del espacio de trabajo.</translation>
+    </message>
+</context>
+<context>
+    <name>CGisWorkspace</name>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
+        <source>Load project...</source>
+        <translation type="unfinished">Cargar proyecto</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
+        <source>The project "%1" is already in the workspace.</source>
+        <translation type="unfinished">El proyecto "%1" ya está en el area de trabajo.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="213"/>
+        <source><b>Item Selection: </b>Item selected from workspace list. Click on the map to switch back to normal mouse selection behavior.</source>
+        <translation type="unfinished"><b>Selección de elementos: </b>Elemento seleccionado de la lista del espacio de trabajo. Haga clic en el mapa para volver al comportamiento normal de selección del mouse.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="626"/>
+        <source>Copy items...</source>
+        <translation type="unfinished">Copia elementos....</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="645"/>
+        <source>Change waypoint symbols.</source>
+        <translation type="unfinished">Cambiar símbolos de waypoint</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
+        <source>Cut Track...</source>
+        <translation type="unfinished">Dividir Track...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
+        <source>Do you want to delete the original track?</source>
+        <translation type="unfinished">¿Desea borrar el track original?</translation>
+    </message>
+</context>
+<context>
+    <name>CGpxProject</name>
+    <message>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
+        <source>Failed to load file %1...</source>
+        <translation>Fallo al cargar archivo %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
+        <source>Failed to open %1</source>
+        <translation>Fallo al abrir %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="125"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Fallo al leer: %1
+línea %2, columna %3.
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="133"/>
+        <source>Not a GPX file: %1</source>
+        <translation>No es un archivo GPX: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="268"/>
+        <source>File exists ...</source>
+        <translation>El archivo ya existe ...</translation>
+    </message>
+    <message>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="269"/>
+        <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
+        <translation>El archivo ya existe y no lo ha creado QMapShack. Si pulsa 'sí' todos los datos de este archivo se perderán. Incluso si el archivo contiene datos GPX y QMapShack lo ha leído, QMapShack podría no ser capaz de leer y almacenar todos los elementos en el archivo, y aquellos que no haya leído se perderán. Se le recomienda usar otro archivo distinto. <b>¿Quiere realmente sobrescribir el archivo</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="386"/>
+        <source>Failed to create file '%1'</source>
+        <translation>Fallo al crear el archivo '%1'</translation>
+    </message>
+    <message>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="396"/>
+        <source>Failed to write file '%1'</source>
+        <translation>Fallo al escribir en el archivo '%1'</translation>
+    </message>
+    <message>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="408"/>
+        <source>Saving GIS data failed...</source>
+        <translation>Fallo guardando datos GIS...</translation>
+    </message>
+</context>
+<context>
+    <name>CGrid</name>
+    <message>
+        <location filename="../grid/CGrid.cpp" line="61"/>
+        <source>%1 %2 </source>
+        <translation>%1 %2 </translation>
+    </message>
+    <message>
+        <location filename="../grid/CGrid.cpp" line="65"/>
+        <source>%1%2%5 %3%4%5 </source>
+        <translation>%1%2%5 %3%4%5 </translation>
+    </message>
+    <message>
+        <location filename="../grid/CGrid.cpp" line="72"/>
+        <source>%1m, %2m </source>
+        <translation>%1m, %2m </translation>
+    </message>
+    <message>
+        <location filename="../grid/CGrid.cpp" line="76"/>
+        <source>N %1m, E %2m </source>
+        <translation>N %1m, E %2m </translation>
+    </message>
+</context>
+<context>
+    <name>CHistoryListWidget</name>
+    <message>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="65"/>
+        <source> by %1</source>
+        <translation>de %1</translation>
+    </message>
+    <message>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
+        <source>Cut history before</source>
+        <translation>Cortar historial antes</translation>
+    </message>
+    <message>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="38"/>
+        <source>Cut history after</source>
+        <translation>Cortar historial despues</translation>
+    </message>
+    <message>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="155"/>
+        <source>History removal</source>
+        <translation>Borrar historial</translation>
+    </message>
+    <message>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
+        <source>The removal is permanent and cannot be undone. <b>Do you really want to delete history before this step?</b></source>
+        <translation>El borrado es permanente y no se puede deshacer. <b>¿Esta seguro de querer borrar el historial anterior a este paso?</b></translation>
+    </message>
+</context>
+<context>
+    <name>CImportDatabase</name>
+    <message>
+        <location filename="../tool/CImportDatabase.cpp" line="29"/>
+        <source>Import QLandkarte Database</source>
+        <translation>Importar Base de Datos de QLandKarteGT</translation>
+    </message>
+    <message>
+        <location filename="../tool/CImportDatabase.cpp" line="75"/>
+        <source>Select source database...</source>
+        <translation>Seleccionar origen de base de datos...</translation>
+    </message>
+    <message>
+        <location filename="../tool/CImportDatabase.cpp" line="97"/>
+        <source>Select target database...</source>
+        <translation>Seleecionar destino de base de datos...</translation>
+    </message>
+</context>
+<context>
+    <name>CKnownExtension</name>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <source>Speed</source>
+        <comment>extLongName</comment>
+        <translation>Velocidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
+        <source>Cadence</source>
+        <comment>extShortName</comment>
+        <translation>Cadencia</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
+        <source>Air Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp. Aire</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
+        <source>Air Temperature</source>
+        <comment>extLongName</comment>
+        <translation>Temperatura del Aire</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
+        <source>Water Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp. Agua</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
+        <source>Water Temperature</source>
+        <comment>extLongName</comment>
+        <translation>Temperatura del Agua</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
+        <source>Depth</source>
+        <comment>extShortName</comment>
+        <translation>Profundidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
+        <source>Depth</source>
+        <comment>extLongName</comment>
+        <translation>Profundidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
+        <source>Heart R.</source>
+        <comment>extShortName</comment>
+        <translation>R. Cardiaco</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
+        <source>Heart Rate</source>
+        <comment>extLongName</comment>
+        <translation>Ritmo Cardiaco</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
+        <source>Cadence</source>
+        <comment>extLongName</comment>
+        <translation>Cadencia</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
+        <source>Speed</source>
+        <comment>extShortName</comment>
+        <translation>Velocidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+        <source>Accel.</source>
+        <comment>extShortName</comment>
+        <translation>Acl.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+        <source>Acceleration</source>
+        <comment>extLongName</comment>
+        <translation>Aceleración</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
+        <source>Course</source>
+        <comment>extShortName</comment>
+        <translation>Carrera</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
+        <source>Course</source>
+        <comment>extLongName</comment>
+        <translation>Carrera</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
+        <source>Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
+        <source>Temperature</source>
+        <comment>extLongName</comment>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
+        <source>Dist.</source>
+        <comment>extShortName</comment>
+        <translation>Dist.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
+        <source>Distance</source>
+        <comment>extLongName</comment>
+        <translation>Distancia</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Ele.</source>
+        <comment>extShortName</comment>
+        <translation>Alt.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <source>Elevation</source>
+        <comment>extLongName</comment>
+        <translation>Altitud</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
+        <source>Energy</source>
+        <comment>extShortName</comment>
+        <translation>Energía</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
+        <source>Energy</source>
+        <comment>extLongName</comment>
+        <translation>Energía</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Sea Lev. Pres.</source>
+        <comment>extShortName</comment>
+        <translation>Pres. N. Mar</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Sea Level Pressure</source>
+        <comment>extLongName</comment>
+        <translation>Presión a Nivel del Mar</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>v. Speed</source>
+        <comment>extShortName</comment>
+        <translation>Vel. Vcal.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>Vertical Speed</source>
+        <comment>extLongName</comment>
+        <translation>Velocidad Vertical</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope</source>
+        <comment>extShortName</comment>
+        <translation>Pendiente</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <source>Speed over Distance*</source>
+        <comment>extLongName</comment>
+        <translation>Velocidad sobre la distancia *</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
+        <source>Speed over Time*</source>
+        <comment>extLongName</comment>
+        <translation>Velocidad sobre el Tiempo*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Elevation*</source>
+        <comment>extLongName</comment>
+        <translation>Altitud*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
+        <source>Progress</source>
+        <comment>extShortName</comment>
+        <translation>Progreso</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
+        <source>Progress*</source>
+        <comment>extLongName</comment>
+        <translation>Progreso*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terr. Slope</source>
+        <comment>extShortName</comment>
+        <translation>Pendiente Terr</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terrain Slope*</source>
+        <comment>extLongName</comment>
+        <translation>Pendiente del Terreno*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope*</source>
+        <translation>Pendiente*</translation>
+    </message>
+</context>
+<context>
+    <name>CLogProject</name>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="62"/>
+        <source>Failed to load file %1...</source>
+        <translation>Fallo al cargar archivo %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="84"/>
+        <source>Failed to open %1</source>
+        <translation>Fallo al abrir %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="95"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Fallo al leer: %1
+línea %2, columna %3.
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="102"/>
+        <source>Not an Openambit log file: %1</source>
+        <translation>%1 no es un archivo log de Openambit</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="113"/>
+        <source>Device: %1<br/></source>
+        <translation>Dispositivo: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="140"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation>Tiempo de recuperación: %1 h<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="145"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation>Efecto Pico de Entrenamiento: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="150"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation>Energía: %1 kCal<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="182"/>
+        <source>Use of local time...</source>
+        <translation>Uso de la hora local ...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="183"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation>No se ha encontrado hora UTC en el archivo %1. Se usará la hora local del ordenador. Puede ajustar la hora usando un filtro de tiempo si es necesario.</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="245"/>
+        <source>This LOG file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation>Este archivo LOG no contiene datos de posición que puedan ser mostrados por QMapShack: %1</translation>
+    </message>
+</context>
+<context>
+    <name>CLostFoundProject</name>
+    <message>
+        <location filename="../gis/db/CLostFoundProject.cpp" line="39"/>
+        <source>Lost & Found</source>
+        <translation>Objetos Perdidos</translation>
+    </message>
+</context>
+<context>
+    <name>CMainWindow</name>
+    <message>
+        <location filename="../CMainWindow.cpp" line="859"/>
+        <source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
+        <translation>Usar <b>Menu->ver->Añadir vista de mapa</b> para abrir nueva vista, o <b>Menu->archivo->cargar vista de mapa</b> para restaurar una vista guardada. O click <a href='nueva vista'>aquí</a>.</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="987"/>
+        <source>Ele.: %1%2</source>
+        <translation>Altitud: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="999"/>
+        <source>Slope: %1%2</source>
+        <comment>terrain</comment>
+        <translation>Pendiente: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1015"/>
+        <source>[Grid: %1]</source>
+        <translation>[Malla: %1]</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1156"/>
+        <source>Load GIS Data...</source>
+        <translation>Cargar Datos GIS...</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1190"/>
+        <source>Select output file</source>
+        <translation>Seleccionar archivo de salida</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1190"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
+        <source>QMapShack View (*.view)</source>
+        <translation>Vista de QMapShack (*.view)</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1216"/>
+        <source>Select file to load</source>
+        <translation>Seleccionar archivo a cargar</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1532"/>
+        <source>Fatal...</source>
+        <translation>Fatal...</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1533"/>
+        <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
+        <translation>QMapShack detectó una biblioteca Proj4 mal instalada. Las tablas de traducción para las proyecciones EPSG usualmente almacenadas en /usr/share/proj faltan. Póngase en contacto con el responsable del paquete de su distribución para solucionarlo.</translation>
+    </message>
+</context>
+<context>
+    <name>CMapDraw</name>
+    <message>
+        <location filename="../map/CMapDraw.cpp" line="457"/>
+        <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
+
+If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
+        <translation>No hay mapas en este momento. QMapShack no es divertido sin mapas. Puede instalar mapas al presionar la tecla Ayuda! ¡Quiero mapas! En el botón ' mapas ',o puede presionar la tecla F1 para abrir la documentación en línea que le indica cómo usar QMapShack.
+
+Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas listos para descargar e instalar requiere un buen servidor. Y esto no es un servicio gratuito. El proyecto carece de dinero. Además, los datos de mapa y DEM tienen un copyright. Por lo tanto, el titular de los derechos de autor tiene que ser preguntado antes de empaquetar los datos. Esto no es tan fácil como podría sonar y para algunos datos que tiene que pagar royalties. El proyecto simplemente carece de recursos [...]
+    </message>
+</context>
+<context>
+    <name>CMapIMG</name>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="146"/>
+        <source>Failed ...</source>
+        <translation>Falló ...</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="175"/>
+        <source>Unspecified</source>
+        <translation>No especificado</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="176"/>
+        <source>French</source>
+        <translation>Francés</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="177"/>
+        <source>German</source>
+        <translation>Alemán</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="178"/>
+        <source>Dutch</source>
+        <translation>Holandés</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="179"/>
+        <source>English</source>
+        <translation>Inglés</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="180"/>
+        <source>Italian</source>
+        <translation>Italiano</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="181"/>
+        <source>Finnish</source>
+        <translation>Finés</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="182"/>
+        <source>Swedish</source>
+        <translation>Sueco</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="183"/>
+        <source>Spanish</source>
+        <translation>Español</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="184"/>
+        <source>Basque</source>
+        <translation>Euskera</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="185"/>
+        <source>Catalan</source>
+        <translation>Catalán</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="186"/>
+        <source>Galician</source>
+        <translation>Gallego</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="187"/>
+        <source>Welsh</source>
+        <translation>Galés</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="188"/>
+        <source>Gaelic</source>
+        <translation>Gaélico</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="189"/>
+        <source>Danish</source>
+        <translation>Danés</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="190"/>
+        <source>Norwegian</source>
+        <translation>Noruego</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="191"/>
+        <source>Portuguese</source>
+        <translation>Portugués</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="192"/>
+        <source>Slovak</source>
+        <translation>Eslovaco</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="193"/>
+        <source>Czech</source>
+        <translation>Checo</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="194"/>
+        <source>Croatian</source>
+        <translation>Croata</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="195"/>
+        <source>Hungarian</source>
+        <translation>Húngaro</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="196"/>
+        <source>Polish</source>
+        <translation>Polaco</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="197"/>
+        <source>Turkish</source>
+        <translation>Turco</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="198"/>
+        <source>Greek</source>
+        <translation>Griego</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="199"/>
+        <source>Slovenian</source>
+        <translation>Esloveno</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="200"/>
+        <source>Russian</source>
+        <translation>Ruso</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="201"/>
+        <source>Estonian</source>
+        <translation>Estonio</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="202"/>
+        <source>Latvian</source>
+        <translation>Letón</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="203"/>
+        <source>Romanian</source>
+        <translation>Rumano</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="204"/>
+        <source>Albanian</source>
+        <translation>Albanés</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="205"/>
+        <source>Bosnian</source>
+        <translation>Bosnio</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="206"/>
+        <source>Lithuanian</source>
+        <translation>Lituano</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="207"/>
+        <source>Serbian</source>
+        <translation>Serbio</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="208"/>
+        <source>Macedonian</source>
+        <translation>Macedonio</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="209"/>
+        <source>Bulgarian</source>
+        <translation>Búlgaro</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="266"/>
+        <source>Major highway</source>
+        <translation>Autovía Primaria</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="267"/>
+        <source>Principal highway</source>
+        <translation>Autovía secundaria</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="268"/>
+        <source>Other highway</source>
+        <translation>Otras autovías</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="269"/>
+        <source>Arterial road</source>
+        <translation>Carretera principal</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="270"/>
+        <source>Collector road</source>
+        <translation>Carretera secundaria</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="271"/>
+        <source>Residential street</source>
+        <translation>Calle residencial</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="272"/>
+        <source>Alley/Private road</source>
+        <translation>Callejón/Carretera privada</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="273"/>
+        <source>Highway ramp, low speed</source>
+        <translation>Acceso a autopista, baja velocidad</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="274"/>
+        <source>Highway ramp, high speed</source>
+        <translation>Acceso a autopista, alta velocidad</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="275"/>
+        <source>Unpaved road</source>
+        <translation>Carretera sin asfaltar</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="276"/>
+        <source>Major highway connector</source>
+        <translation>Conexión con autovía principal</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="277"/>
+        <source>Roundabout</source>
+        <translation>Rotonda</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="278"/>
+        <source>Railroad</source>
+        <translation>Ferrocarril</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="279"/>
+        <source>Shoreline</source>
+        <translation>Línea de costa</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="280"/>
+        <source>Trail</source>
+        <translation>Sendero</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="281"/>
+        <source>Stream</source>
+        <translation>Arroyo</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="282"/>
+        <source>Time zone</source>
+        <translation>Zona horaria</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="283"/>
+        <location filename="../map/CMapIMG.cpp" line="284"/>
+        <source>Ferry</source>
+        <translation>Ferry</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="285"/>
+        <source>State/province border</source>
+        <translation>Frontera de estado/provincia</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="286"/>
+        <source>County/parish border</source>
+        <translation>Frontera de condado/término municipal</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="287"/>
+        <source>International border</source>
+        <translation>Frontera internacional</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="288"/>
+        <source>River</source>
+        <translation>Río</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="289"/>
+        <source>Minor land contour</source>
+        <translation>Curva de nivel menor</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="290"/>
+        <source>Intermediate land contour</source>
+        <translation>Curva de nivel intermedia</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="291"/>
+        <source>Major land contour</source>
+        <translation>Curva de nivel principal</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="292"/>
+        <source>Minor depth contour</source>
+        <translation>Curva batimétrica menor</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="293"/>
+        <source>Intermediate depth contour</source>
+        <translation>Curva batimétrica intermedia</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="294"/>
+        <source>Major depth contour</source>
+        <translation>Curva batimétrica principal</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="295"/>
+        <source>Intermittent stream</source>
+        <translation>Curso intermitente</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="296"/>
+        <location filename="../map/CMapIMG.cpp" line="378"/>
+        <source>Airport runway</source>
+        <translation>Pista de aterrizaje</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="297"/>
+        <source>Pipeline</source>
+        <translation>Tubería</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="298"/>
+        <source>Powerline</source>
+        <translation>Línea eléctrica</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="299"/>
+        <source>Marine boundary</source>
+        <translation>Límite marítimo</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="300"/>
+        <source>Hazard boundary</source>
+        <translation>Límite de peligro</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="365"/>
+        <source>Large urban area (&gt;200K)</source>
+        <translation>Área urbana grande (&gt;200K)</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="366"/>
+        <source>Small urban area (&lt;200K)</source>
+        <translation>Área urbana pequeña (&lt;200K)</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="367"/>
+        <source>Rural housing area</source>
+        <translation>Área de alojamienos rurales</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="368"/>
+        <source>Military base</source>
+        <translation>Base militar</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="369"/>
+        <source>Parking lot</source>
+        <translation>Aparcamiento</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="370"/>
+        <source>Parking garage</source>
+        <translation>Garaje</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="371"/>
+        <source>Airport</source>
+        <translation>Aeropuerto</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="372"/>
+        <source>Shopping center</source>
+        <translation>Centro comercial</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="373"/>
+        <source>Marina</source>
+        <translation>Puerto deportivo</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="374"/>
+        <source>University/College</source>
+        <translation>Universidad/Facultad</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="375"/>
+        <source>Hospital</source>
+        <translation>Hospital</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="376"/>
+        <source>Industrial complex</source>
+        <translation>Complejo industrial</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="377"/>
+        <source>Reservation</source>
+        <translation>Reserva natural</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="379"/>
+        <source>Man-made area</source>
+        <translation>Área creada por el hombre</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="380"/>
+        <source>Sports complex</source>
+        <translation>Complejo deportivo</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="381"/>
+        <source>Golf course</source>
+        <translation>Campo de golf</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="382"/>
+        <source>Cemetery</source>
+        <translation>Cementerio</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="383"/>
+        <location filename="../map/CMapIMG.cpp" line="384"/>
+        <location filename="../map/CMapIMG.cpp" line="385"/>
+        <source>National park</source>
+        <translation>Parque nacional</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="386"/>
+        <source>City park</source>
+        <translation>Parque urbano</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="387"/>
+        <location filename="../map/CMapIMG.cpp" line="388"/>
+        <location filename="../map/CMapIMG.cpp" line="389"/>
+        <source>State park</source>
+        <translation>Parque regional</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="390"/>
+        <source>Forest</source>
+        <translation>Bosque</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="391"/>
+        <source>Ocean</source>
+        <translation>Océano</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="392"/>
+        <location filename="../map/CMapIMG.cpp" line="394"/>
+        <location filename="../map/CMapIMG.cpp" line="404"/>
+        <source>Blue (unknown)</source>
+        <translation>Azul (desconocido)</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="393"/>
+        <source>Sea</source>
+        <translation>Mar</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="395"/>
+        <location filename="../map/CMapIMG.cpp" line="396"/>
+        <location filename="../map/CMapIMG.cpp" line="403"/>
+        <source>Large lake</source>
+        <translation>Lago grande</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="398"/>
+        <source>Medium lake</source>
+        <translation>Lago mediano</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="400"/>
+        <source>Small lake</source>
+        <translation>Lago pequeño</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="401"/>
+        <location filename="../map/CMapIMG.cpp" line="402"/>
+        <source>Major lake</source>
+        <translation>Lago principal</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="405"/>
+        <source>Major River</source>
+        <translation>Río Principal</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="406"/>
+        <source>Large River</source>
+        <translation>Río Grande</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="407"/>
+        <source>Medium River</source>
+        <translation>Río Mediano</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="408"/>
+        <source>Small River</source>
+        <translation>Río Pequeño</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="411"/>
+        <source>Intermittent water</source>
+        <translation>Agua intermitente</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="412"/>
+        <source>Wetland/Swamp</source>
+        <translation>Marisma/Ciénaga</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="413"/>
+        <source>Glacier</source>
+        <translation>Glaciar</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="414"/>
+        <source>Orchard/Plantation</source>
+        <translation>Invernadero/Plantación</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="415"/>
+        <source>Scrub</source>
+        <translation>Monte bajo</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="416"/>
+        <source>Tundra</source>
+        <translation>Tundra</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="417"/>
+        <source>Flat</source>
+        <translation>Llanura</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="418"/>
+        <source>???</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="432"/>
+        <source>Read external type file...</source>
+        <translation>Cargar archivo TYP externo...</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="432"/>
+        <source>Failed to read type file: %1
+Fall back to internal types.</source>
+        <translation>Fallo al cargar archivo TYP: %1
+Se vuelve al TYP interno.</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="474"/>
+        <source>Failed to read: </source>
+        <translation>Fallo al leer: </translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="517"/>
+        <source>Failed to open: </source>
+        <translation>Fallo al abrir: </translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="541"/>
+        <location filename="../map/CMapIMG.cpp" line="545"/>
+        <source>Bad file format: </source>
+        <translation>Formato de archivo incorrecto: </translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="634"/>
+        <source>Failed to read file structure: </source>
+        <translation>Fallo al leer la estructura del archivo: </translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="669"/>
+        <source>Loading %1</source>
+        <translation>Cargando %1</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="675"/>
+        <source>User abort: </source>
+        <translation>Cancelado por el usuario: </translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="678"/>
+        <source>File is NT format. QMapShack is unable to read map files with NT format: </source>
+        <translation>El archivo está en formato NT. QMapShack no puede leer archivos en formato NT: </translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="769"/>
+        <source>File contains locked / encrypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
+        <translation>El archivo contiene datos bloqueados y/o encriptados. Garmin no desea que utilice este archivo con ningún otro software que el suministrado por ellos.</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="2388"/>
+        <location filename="../map/CMapIMG.cpp" line="2394"/>
+        <location filename="../map/CMapIMG.cpp" line="2398"/>
+        <source>Point of Interest</source>
+        <translation>Punto de Interés</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="2484"/>
+        <source>Unknown</source>
+        <translation>Desconocido</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="2526"/>
+        <location filename="../map/CMapIMG.cpp" line="2534"/>
+        <location filename="../map/CMapIMG.cpp" line="2541"/>
+        <source>Area</source>
+        <translation>Área</translation>
+    </message>
+</context>
+<context>
+    <name>CMapList</name>
+    <message>
+        <location filename="../map/CMapList.cpp" line="202"/>
+        <source>Deactivate</source>
+        <translation>Desactivar</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapList.cpp" line="202"/>
+        <source>Activate</source>
+        <translation>Activar</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapList.cpp" line="227"/>
+        <source>Where do you want to store maps?</source>
+        <translation>¿Dónde desea almacenar mapas?</translation>
+    </message>
+</context>
+<context>
+    <name>CMapMAP</name>
+    <message>
+        <location filename="../map/CMapMAP.cpp" line="46"/>
+        <source>Failed ...</source>
+        <translation>Falló...</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapMAP.cpp" line="63"/>
+        <source>Failed to open: </source>
+        <translation>Fallo al abrir: </translation>
+    </message>
+    <message>
+        <location filename="../map/CMapMAP.cpp" line="73"/>
+        <source>Bad file format: </source>
+        <translation>Formato de archivo incorrecto: </translation>
+    </message>
+</context>
+<context>
+    <name>CMapPathSetup</name>
+    <message>
+        <location filename="../map/CMapPathSetup.cpp" line="47"/>
+        <source>Add or remove paths containing maps. There can be multiple maps in a path but no sub-path is parsed. Supported formats are: %1</source>
+        <translation>Añada o elimine rutas que contengan mapas. Puede haber múltiples mapas en una ruta, pero no se buscará en subdirectorios. Los formatos soportados son: %1</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapPathSetup.cpp" line="62"/>
+        <source>Select map path...</source>
+        <translation>Selecciona la ruta del mapa...</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapPathSetup.cpp" line="81"/>
+        <source>Select root path...</source>
+        <translation>Seleccionar carpeta raiz...</translation>
+    </message>
+</context>
+<context>
+    <name>CMapPropSetup</name>
+    <message>
+        <location filename="../map/CMapPropSetup.cpp" line="196"/>
+        <source>Select type file...</source>
+        <translation>Seleccionar archivo TYP...</translation>
+    </message>
+</context>
+<context>
+    <name>CMapRMAP</name>
+    <message>
+        <location filename="../map/CMapRMAP.cpp" line="48"/>
+        <location filename="../map/CMapRMAP.cpp" line="57"/>
+        <location filename="../map/CMapRMAP.cpp" line="127"/>
+        <location filename="../map/CMapRMAP.cpp" line="144"/>
+        <location filename="../map/CMapRMAP.cpp" line="165"/>
+        <location filename="../map/CMapRMAP.cpp" line="187"/>
+        <location filename="../map/CMapRMAP.cpp" line="209"/>
+        <location filename="../map/CMapRMAP.cpp" line="237"/>
+        <source>Error...</source>
+        <translation>Error...</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapRMAP.cpp" line="48"/>
+        <source>This is not a TwoNav RMAP file.</source>
+        <translation>Éste no es un archivo en formato RMAP de TwoNav.</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapRMAP.cpp" line="57"/>
+        <source>Unknown sub-format.</source>
+        <translation>Sub-formato desconocido.</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapRMAP.cpp" line="127"/>
+        <source>Unknown version.</source>
+        <translation>Versión desconocida.</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapRMAP.cpp" line="144"/>
+        <location filename="../map/CMapRMAP.cpp" line="165"/>
+        <location filename="../map/CMapRMAP.cpp" line="187"/>
+        <location filename="../map/CMapRMAP.cpp" line="209"/>
+        <source>Failed to read reference point.</source>
+        <translation>Fallo al leer el punto de referencia.</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapRMAP.cpp" line="237"/>
+        <source>Unknown projection and datum (%1%2).</source>
+        <translation>Proyección y datum desconocidos (%1%2).</translation>
+    </message>
+</context>
+<context>
+    <name>CMapTMS</name>
+    <message>
+        <location filename="../map/CMapTMS.cpp" line="68"/>
+        <location filename="../map/CMapTMS.cpp" line="78"/>
+        <source>Error...</source>
+        <translation>Error...</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapTMS.cpp" line="68"/>
+        <source>Failed to open %1</source>
+        <translation>Fallo al abrir %1</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapTMS.cpp" line="78"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Fallo al leer: %1
+línea %2, columna %3.
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapTMS.cpp" line="116"/>
+        <source>Layer %1</source>
+        <translation>Capa %1</translation>
+    </message>
+</context>
+<context>
+    <name>CMapVRT</name>
+    <message>
+        <location filename="../map/CMapVRT.cpp" line="45"/>
+        <location filename="../map/CMapVRT.cpp" line="59"/>
+        <location filename="../map/CMapVRT.cpp" line="83"/>
+        <location filename="../map/CMapVRT.cpp" line="133"/>
+        <source>Error...</source>
+        <translation>Error...</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapVRT.cpp" line="45"/>
+        <location filename="../map/CMapVRT.cpp" line="59"/>
+        <source>Failed to load file: %1</source>
+        <translation>Fallo al leer el archivo: %1</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapVRT.cpp" line="83"/>
+        <source>File must be 8 bit palette or gray indexed.</source>
+        <translation>El archivo debe ser con paleta de 8 bits o escala de grises indexada.</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapVRT.cpp" line="133"/>
+        <source>No georeference information found.</source>
+        <translation>No se encontró información de georreferenciación.</translation>
+    </message>
+</context>
+<context>
+    <name>CMapVrtBuilder</name>
+    <message>
+        <location filename="../tool/CMapVrtBuilder.cpp" line="29"/>
+        <source>Build GDAL VRT</source>
+        <translation>Crear GDAL VRT</translation>
+    </message>
+    <message>
+        <location filename="../tool/CMapVrtBuilder.cpp" line="63"/>
+        <source>Select files...</source>
+        <translation>Seleccionar ficheros de origen...</translation>
+    </message>
+    <message>
+        <location filename="../tool/CMapVrtBuilder.cpp" line="87"/>
+        <source>Select target file...</source>
+        <translation>Seleccionar fichero VRT de salida...</translation>
+    </message>
+    <message>
+        <location filename="../tool/CMapVrtBuilder.cpp" line="150"/>
+        <source>!!! done !!!
+</source>
+        <translation>¡¡¡ hecho !!!</translation>
+    </message>
+</context>
+<context>
+    <name>CMapWMTS</name>
+    <message>
+        <location filename="../map/CMapWMTS.cpp" line="43"/>
+        <location filename="../map/CMapWMTS.cpp" line="53"/>
+        <location filename="../map/CMapWMTS.cpp" line="63"/>
+        <location filename="../map/CMapWMTS.cpp" line="72"/>
+        <location filename="../map/CMapWMTS.cpp" line="209"/>
+        <source>Error...</source>
+        <translation>Error...</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapWMTS.cpp" line="43"/>
+        <source>Failed to open %1</source>
+        <translation>Fallo al abrir %1</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapWMTS.cpp" line="53"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Fallo al leer: %1
+línea %2, columna %3.
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapWMTS.cpp" line="63"/>
+        <source>Failed to read: %1
+Unknown structure.</source>
+        <translation>Fallo al leer: %1
+Estructura desconocida.</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapWMTS.cpp" line="72"/>
+        <source>Unexpected service. '* WMTS 1.0.0' is expected. '%1 %2' is read.</source>
+        <translation>Servicio inesperado. '* WMTS 1.0.0' es el esperado. pero se ha leido '%1 %2'.</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapWMTS.cpp" line="209"/>
+        <source>No georeference information found.</source>
+        <translation>No se encontró información de georreferenciación.</translation>
+    </message>
+</context>
+<context>
+    <name>CMouseEditArea</name>
+    <message>
+        <location filename="../mouse/CMouseEditArea.cpp" line="28"/>
+        <location filename="../mouse/CMouseEditArea.cpp" line="35"/>
+        <source>Area</source>
+        <translation>Área</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseEditArea.cpp" line="37"/>
+        <source><b>Edit Area</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
+        <translation><b>Editar área</b><br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseEditArea.cpp" line="94"/>
+        <source>area</source>
+        <translation>área</translation>
+    </message>
+</context>
+<context>
+    <name>CMouseEditRte</name>
+    <message>
+        <location filename="../mouse/CMouseEditRte.cpp" line="30"/>
+        <location filename="../mouse/CMouseEditRte.cpp" line="37"/>
+        <source>Route</source>
+        <translation>Ruta</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseEditRte.cpp" line="39"/>
+        <source><b>Edit Route Points</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
+        <translation></b>Editar puntos de ruta<br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseEditRte.cpp" line="105"/>
+        <source>route</source>
+        <translation>Ruta</translation>
+    </message>
+</context>
+<context>
+    <name>CMouseEditTrk</name>
+    <message>
+        <location filename="../mouse/CMouseEditTrk.cpp" line="28"/>
+        <location filename="../mouse/CMouseEditTrk.cpp" line="35"/>
+        <source>Track</source>
+        <translation>Track</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseEditTrk.cpp" line="38"/>
+        <source><b>Edit Track Points</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
+        <translation><b>Editar puntos del track</b><br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseEditTrk.cpp" line="80"/>
+        <source>Warning!</source>
+        <translation>¡Cuidado!</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseEditTrk.cpp" line="80"/>
+        <source>This will replace all data of the original by a simple line of coordinates. All other data will be lost permanently.</source>
+        <translation>Esto sustituirá todos los datos del original con una simple línea de coordenadas. Todos los demás datos se perderán definitivamente.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseEditTrk.cpp" line="110"/>
+        <source>track</source>
+        <translation>track</translation>
+    </message>
+</context>
+<context>
+    <name>CMouseNormal</name>
+    <message>
+        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+        <source>Add POI as Waypoint</source>
+        <translation>Añadir POI como Waypoint </translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+        <source>Add Waypoint</source>
+        <translation>Añadir Waypoint</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+        <source>Add Track</source>
+        <translation>Añadir Track</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+        <source>Add Route</source>
+        <translation>Añadir ruta</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+        <source>Add Area</source>
+        <translation>Añadir Área</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseNormal.cpp" line="46"/>
+        <source>Select Items On Map</source>
+        <translation>Seleccionar elementos del mapa</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
+        <source>Copy position</source>
+        <translation>Copiar posición</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseNormal.cpp" line="49"/>
+        <source>Copy position (Grid)</source>
+        <translation>Copiar posicion (malla)</translation>
+    </message>
+</context>
+<context>
+    <name>CMousePrint</name>
+    <message>
+        <location filename="../mouse/CMousePrint.cpp" line="31"/>
+        <source><b>Save(Print) Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
+        <translation><b>Guardar/imprimir mapa</b><br/>Seleccione un area rectangular en el mapa pulsando el boton izquierdo del ratón y moviendolo hacia la esquina opuesta. Cancele con el boton derecho. Ajuste la seleccion haciendo clic y moviendo las esquinas.</translation>
+    </message>
+</context>
+<context>
+    <name>CMouseRangeTrk</name>
+    <message>
+        <location filename="../mouse/CMouseRangeTrk.cpp" line="239"/>
+        <source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
+        <translation><b>Seleccionar rango</b><br/>Seleccione el punto inicial con el botón izquierdo del raton. Fije el punto final con una segunda pulsacion. El rango seleccionado se marca en verde. Un clic con el botón derecho del ratón abandona la selección del rango<br/></translation>
+    </message>
+</context>
+<context>
+    <name>CMouseSelect</name>
+    <message>
+        <location filename="../mouse/CMouseSelect.cpp" line="32"/>
+        <source><b>Select Items On Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
+        <translation><b>Seleccionar elementos en el mapa</b><br/>Seleccione un area rectangular con el boton izquierdo del ratón. Cancelar con clic derecho. Ajuste la seleccion haciendo clic y desplazando en las esquinas.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+        <source><b>Selected:</b><br/></source>
+        <translation><b>Seleccionado:</b><br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseSelect.cpp" line="107"/>
+        <source>%1 waypoints<br/></source>
+        <translation>%1 waypoints<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseSelect.cpp" line="102"/>
+        <source>%1 tracks<br/></source>
+        <translation>%1 tracks<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseSelect.cpp" line="112"/>
+        <source>%1 routes<br/></source>
+        <translation>%1 rutas<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CMouseSelect.cpp" line="117"/>
+        <source>%1 areas<br/></source>
+        <translation>%1 áreas<br/></translation>
+    </message>
+</context>
+<context>
+    <name>CPhotoAlbum</name>
+    <message>
+        <location filename="../widgets/CPhotoAlbum.cpp" line="73"/>
+        <source>Select images...</source>
+        <translation>Seleccionar imagenes...</translation>
+    </message>
+</context>
+<context>
+    <name>CPlot</name>
+    <message>
+        <location filename="../plot/CPlot.cpp" line="55"/>
+        <source>Distance [%1]</source>
+        <translation>Distancia [%1]</translation>
+    </message>
+    <message>
+        <location filename="../plot/CPlot.cpp" line="60"/>
+        <source>Time</source>
+        <translation>Tiempo</translation>
+    </message>
+</context>
+<context>
+    <name>CPlotProfile</name>
+    <message>
+        <location filename="../plot/CPlotProfile.cpp" line="79"/>
+        <source>Distance [%1]</source>
+        <translation>Distancia [%1]</translation>
+    </message>
+    <message>
+        <location filename="../plot/CPlotProfile.cpp" line="80"/>
+        <source>Ele. [%1]</source>
+        <translation>Alt. [%1]</translation>
+    </message>
+</context>
+<context>
+    <name>CPrintDialog</name>
+    <message>
+        <location filename="../print/CPrintDialog.cpp" line="67"/>
+        <source>Print Map...</source>
+        <translation>Imprimir mapa...</translation>
+    </message>
+    <message>
+        <location filename="../print/CPrintDialog.cpp" line="74"/>
+        <source>Save Map as Image...</source>
+        <translation>Guardar mapa como imagen...</translation>
+    </message>
+    <message>
+        <location filename="../print/CPrintDialog.cpp" line="94"/>
+        <source>Printer Properties...</source>
+        <translation>Imprimir propiedades...</translation>
+    </message>
+    <message>
+        <location filename="../print/CPrintDialog.cpp" line="169"/>
+        <source>Pages: %1 x %2</source>
+        <translation>Páginas: %1 x %2</translation>
+    </message>
+    <message>
+        <location filename="../print/CPrintDialog.cpp" line="170"/>
+        <source>Zoom with mouse wheel on map below to change resolution:
+
+%1x%2 pixel
+x: %3 m/px
+y: %4 m/px</source>
+        <translation>Zoom con la rueda del ratón en el mapa inferior para cambiar la resolución:
+
+%1x%2 pixel
+x: %3 m/px
+y: %4 m/px</translation>
+    </message>
+    <message>
+        <location filename="../print/CPrintDialog.cpp" line="216"/>
+        <source>Printing pages.</source>
+        <translation>Imprimir páginas.</translation>
+    </message>
+    <message>
+        <location filename="../print/CPrintDialog.cpp" line="260"/>
+        <source>Save map...</source>
+        <translation>Guardar mapa...</translation>
+    </message>
+</context>
+<context>
+    <name>CProgressDialog</name>
+    <message>
+        <location filename="../helpers/CProgressDialog.cpp" line="48"/>
+        <source>Elapsed time: %1</source>
+        <translation>Tiempo transcurrido: %1</translation>
+    </message>
+    <message>
+        <location filename="../helpers/CProgressDialog.cpp" line="134"/>
+        <source>Elapsed time: %1 seconds.</source>
+        <translation>Tiempo transcurrido: %1 segundos.</translation>
+    </message>
+</context>
+<context>
+    <name>CProjWizard</name>
+    <message>
+        <location filename="../grid/CProjWizard.cpp" line="62"/>
+        <source>north</source>
+        <translation>norte</translation>
+    </message>
+    <message>
+        <location filename="../grid/CProjWizard.cpp" line="63"/>
+        <source>south</source>
+        <translation>sur</translation>
+    </message>
+    <message>
+        <location filename="../grid/CProjWizard.cpp" line="222"/>
+        <source>Error...</source>
+        <translation>Error...</translation>
+    </message>
+    <message>
+        <location filename="../grid/CProjWizard.cpp" line="222"/>
+        <source>The value
+'%1'
+is not a valid coordinate system definition:
+%2</source>
+        <translation>El valor
+'%1'
+no es una definición de sistema de coordenadas válido:
+%2</translation>
+    </message>
+</context>
+<context>
+    <name>CProjWpt</name>
+    <message>
+        <location filename="../gis/wpt/CProjWpt.cpp" line="62"/>
+        <source>Edit name...</source>
+        <translation>Editar nombre...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CProjWpt.cpp" line="62"/>
+        <source>Enter new waypoint name.</source>
+        <translation>Introduzca el nuevo nombre del waypoint.</translation>
+    </message>
+</context>
+<context>
+    <name>CQlbProject</name>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open...</source>
+        <translation type="unfinished">Fallo al abrir...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished">Fallo al abrir %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="138"/>
+        <source>Could not convert...</source>
+        <translation type="unfinished">No se pudo convertir ...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="139"/>
+        <source>The file contains overlays that can not be converted. This is because QMapShack does not support all overlay types of QLandkarte.</source>
+        <translation>El archivo contiene superposiciones que no se pueden convertir. Esto se debe a que QMapShack no es compatible con todos los tipos de superposición de QLandkarte.</translation>
+    </message>
+</context>
+<context>
+    <name>CQlgtDb</name>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="308"/>
+        <source>Migrating database from version 4 to 5.</source>
+        <translation>Convirtiendo base de datos de version 4 a 5.</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="362"/>
+        <source>Migrating database from version 5 to 6.</source>
+        <translation>Convirtiendo base de datos de version 5 a 6.</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="420"/>
+        <source>Migrating database from version 6 to 7.</source>
+        <translation>Convirtiendo base de datos de version 6 a 7.</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="486"/>
+        <source>Migrating database from version 7 to 8.</source>
+        <translation>Convirtiendo base de datos de version 7 a 8.</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="515"/>
+        <source>Migrating database from version 8 to 9.</source>
+        <translation>Convirtiendo base de datos de version 8 a 9.</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="538"/>
+        <source>Open database: %1</source>
+        <translation>Abrir base de datos:%1</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="547"/>
+        <source>Folders:          %1</source>
+        <translation>Carpetas:          %1</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="556"/>
+        <source>Tracks:           %1</source>
+        <translation>Tracks:           %1</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="564"/>
+        <source>Routes:           %1 (Only the basic route will be copied)</source>
+        <translation>Rutas:           %1 (Sólo se copiará la ruta básica)</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="572"/>
+        <source>Waypoints:        %1</source>
+        <translation>Waypoints:        %1</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="580"/>
+        <source>Overlays:         %1 (areas will be converted as areas, distance lines will be converted to tracks, all other overlay items will be lost)</source>
+        <translation>Superposiciones:         %1 (las áreas se convertirán como áreas, las líneas de distancia se convertirán en tracks, todos los demás elementos de superposición se perderán</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="587"/>
+        <source>Diaries:          %1</source>
+        <translation>Diarios:          %1</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="594"/>
+        <source>Map selections:   %1 (can't be converted to QMapShack)</source>
+        <translation>Selecciones de mapa:   %1 (NO pueden convertirse a QMapShack)</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="600"/>
+        <source>------ Start to convert database to %1------</source>
+        <translation>------ Comenzar a convertir base de datos a %1------</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="604"/>
+        <source>Failed to create target database.</source>
+        <translation>Fallo al crear la base de datos de destino.</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="605"/>
+        <source>------ Abort ------</source>
+        <translation>------ Cancelar ------</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="633"/>
+        <source>------ Done ------</source>
+        <translation>------ Hecho ------</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="641"/>
+        <source>Restore folders...</source>
+        <translation>Restaurar carpetas...</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="661"/>
+        <source>Imported %1 folders and %2 diaries</source>
+        <translation>Importadas %1 carpetas y %2 diarios</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="667"/>
+        <source>Copy items...</source>
+        <translation>Copia elementos....</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="685"/>
+        <source>Imported %1 tracks, %2 waypoints, %3 routes, %4 areas</source>
+        <translation>Importado: %1 tracks, %2 waypoints, %3 routes, %4 areas</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="686"/>
+        <source>Import folders...</source>
+        <translation>Importar carpetas...</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtDb.cpp" line="751"/>
+        <source>Overlay of type '%1' cant be converted</source>
+        <translation>No puede convertirse superposición del tipo '%1' </translation>
+    </message>
+</context>
+<context>
+    <name>CQlgtTrack</name>
+    <message>
+        <location filename="../qlgt/CQlgtTrack.cpp" line="164"/>
+        <location filename="../qlgt/CQlgtTrack.cpp" line="218"/>
+        <location filename="../qlgt/CQlgtTrack.cpp" line="265"/>
+        <location filename="../qlgt/CQlgtTrack.cpp" line="291"/>
+        <source>Corrupt track ...</source>
+        <translation>Track corrupto...</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtTrack.cpp" line="164"/>
+        <source>Number of trackpoints is not equal the number of training data trackpoints.</source>
+        <translation>El número de puntos del track no es igual al número de puntos de datos de entrenamiento.</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtTrack.cpp" line="218"/>
+        <source>Number of trackpoints is not equal the number of extended data trackpoints.</source>
+        <translation>El número de puntos de track no es igual al número de datos extendidos</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQlgtTrack.cpp" line="265"/>
+        <location filename="../qlgt/CQlgtTrack.cpp" line="291"/>
+        <source>Number of trackpoints is not equal the number of shadow data trackpoints.</source>
+        <translation>El número de puntos del track no es igual al número de datos extendidos ocultos.</translation>
+    </message>
+</context>
+<context>
+    <name>CQmsDb</name>
+    <message>
+        <location filename="../qlgt/CQmsDb.cpp" line="47"/>
+        <source>Existing file...</source>
+        <translation>Archivo existente...</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQmsDb.cpp" line="47"/>
+        <source>Remove existing %1?</source>
+        <translation>¿Eliminar los %1?</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQmsDb.cpp" line="52"/>
+        <source>Remove existing file %1</source>
+        <translation>Eliminar el archivo %1</translation>
+    </message>
+    <message>
+        <location filename="../qlgt/CQmsDb.cpp" line="164"/>
+        <source>%1: drop item with QLGT DB ID %2</source>
+        <translation>Descartar elemento %2 de la base de datos de QLandKarteGT</translation>
+    </message>
+</context>
+<context>
+    <name>CQmsProject</name>
+    <message>
+        <location filename="../gis/qms/CQmsProject.cpp" line="48"/>
+        <location filename="../gis/qms/CQmsProject.cpp" line="80"/>
+        <source>Failed to open...</source>
+        <translation>Fallo al abrir...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qms/CQmsProject.cpp" line="48"/>
+        <location filename="../gis/qms/CQmsProject.cpp" line="80"/>
+        <source>Failed to open %1</source>
+        <translation>Fallo al abrir %1</translation>
+    </message>
+</context>
+<context>
+    <name>CRouterBRouter</name>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+        <source>original</source>
+        <translation>original</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+        <source>first alternative</source>
+        <translation>Primera alternativa</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+        <source>second alternative</source>
+        <translation>Segunda alternativa</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="53"/>
+        <source>third alternative</source>
+        <translation>Tercera alternativa</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="148"/>
+        <source>BRouter (offline)</source>
+        <translation>BRouter (offline)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="155"/>
+        <source>BRouter (online)</source>
+        <translation>BRouter (online)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="185"/>
+        <source>profile: %1, alternative: %2</source>
+        <translation>perfil: %1, alternativa: %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="283"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="408"/>
+        <source>BRouter does not support more then 1 nogo-area in this version, consider to upgrade</source>
+        <translation>BRouter no admite más de un área prohibida en esta versión, considere actualizar</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="297"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="420"/>
+        <source>response is empty</source>
+        <translation>La respuesta está vacía</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="334"/>
+        <source>Bad response from server: %1</source>
+        <translation>Mala respuesta del servidor: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="386"/>
+        <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
+        <translation><b>BRouter</b><br/>Solicitud de enrutamiento enviada al servidor. por favor espere...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="270"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="389"/>
+        <source>Calculate route with %1</source>
+        <translation>Calcular ruta con %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="454"/>
+        <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
+        <translation><b>BRouter</b><br/>Mala respuesta del servidor:<br/>%1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="444"/>
+        <source><br/>Calculation time: %1s</source>
+        <translation>Tiempo empleado en el cálculo: %1s</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="548"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="600"/>
+        <source>running</source>
+        <translation>En marcha</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="592"/>
+        <source>starting</source>
+        <translation>comenzando</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="554"/>
+        <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local  [...]
+        <translation>QMapShack se comunica con BRouter a través de una conexión de red. Por lo general, esto se hace en una dirección especial que no se puede alcanzar desde fuera de su dispositivo. Sin embargo BRouter escucha las conexiones en todas las interfaces disponibles. Si usted está en su propia red privada con un cortafuegos activo, esto no es un gran problema. Si usted está en una red pública cada puerto abierto es un riesgo, ya que puede ser utilizado por otra persona para co [...]
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="581"/>
+        <source>Warning...</source>
+        <translation>Aviso...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="586"/>
+        <source>I understand the risk. Don't tell me again.</source>
+        <translation>Comprendo el riesgo. No avisar de nuevo</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="607"/>
+        <source>stopped</source>
+        <translation>Parado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="618"/>
+        <source>not installed</source>
+        <translation>No instalado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="629"/>
+        <source>online</source>
+        <translation>online</translation>
+    </message>
+</context>
+<context>
+    <name>CRouterBRouterSetup</name>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
+        <source>%1 not accessible</source>
+        <translation>%1 no accessible</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
+        <source>%1 invalid result</source>
+        <translation>%1 resultado inválido</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
+        <source>Error parsing online-config:</source>
+        <translation>Error al analizar configuración online:</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="538"/>
+        <source>Network error:</source>
+        <translation>Error de red</translation>
+    </message>
+</context>
+<context>
+    <name>CRouterBRouterSetupWizard</name>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
+        <source>Restore Default Values</source>
+        <translation>Restablecer valores por defecto</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
+        <source>Open Directory</source>
+        <translation>Abrir carpeta</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
+        <source>select Java Executable</source>
+        <translation>Seleccionar ejecutable Java</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="414"/>
+        <source>please select BRouter installation directory</source>
+        <translation>Seleccione carpeta de instalacion de BRouter</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="419"/>
+        <source>selected directory does not exist</source>
+        <translation>La carpeta seleccionada no existe</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="420"/>
+        <source>create directory and install BRouter there</source>
+        <translation>Cree una carpeta e instale BRouter allí</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="427"/>
+        <source>existing BRouter installation</source>
+        <translation>Instalacion de BRouter exixtente</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="428"/>
+        <source>update existing BRouter installation</source>
+        <translation>Actualizar instalación de BRouter</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="433"/>
+        <source>empty directory, create new BRouter installation here</source>
+        <translation>Carpeta vacia, instale BRouter aquí</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
+        <source>create new BRouter installation</source>
+        <translation>Crear nueva instalacion de BRouter</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
+        <source>seems to be a valid Java-executable</source>
+        <translation>Parece ser un ejecutable Java válido</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
+        <source>doesn't seem to be a valid Java-executable</source>
+        <translation>no parece un ejecutable Java válido</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
+        <source>Java Executable not found</source>
+        <translation>Ejecutable Java no encontrado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="496"/>
+        <source>Error loading installation-page at %1</source>
+        <translation>Error al cargar la página de instalación en %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="505"/>
+        <source>no brouter-version to install selected</source>
+        <translation>Ninguna versión de BRouter para instalar seleccionada</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="513"/>
+        <source>selected %1 for download and installation</source>
+        <translation>Seleccione %1 para descargar e instalar</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
+        <source>Warning...</source>
+        <translation>Aviso...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
+        <source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
+        <translation>Descarga:%1<br/><br/> Esto descargará e instalará un archivo zip desde una ubicación de descarga que no está protegida por ningún estándar, usando HTTP normal. Normalmente esto debe ser HTTPS. El riesgo es que alguien redireccione la solicitud y le envíe un código postal de reemplazo con malware. No es posible que QMapShack lo detecte. <br/> Si no entiende esto o si tiene alguna duda, no proceda y cancele. Utilice la versión web de BRouter en su lug [...]
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
+        <source>I understand the risk and wish to proceed.</source>
+        <translation>Entiendo el riesgo, continuar.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
+        <source>download %1 started</source>
+        <translation>Iniciada descarga %1 </translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
+        <source>Network Error: %1</source>
+        <translation>Error de red: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
+        <source>download %1 finished</source>
+        <translation>Finalizada descarga %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
+        <source>unzipping:</source>
+        <translation>Descomprimiendo:</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
+        <source>ready.</source>
+        <translation>Preparado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="613"/>
+        <source>download of brouter failed: %1</source>
+        <translation>Descarga de BRouter fallida: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="623"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="630"/>
+        <source>retrieving available profiles from %1</source>
+        <translation>Recuperar los perfiles disponibles de %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="654"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="736"/>
+        <source>content of profile</source>
+        <translation>Contenido del perfil</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
+        <source>Error:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
+        <source>Error creating directory %1</source>
+        <translation>Error creando la carpeta %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="571"/>
+        <source>Error directory %1 does not exist</source>
+        <translation>Error: La carpeta %1 no existe</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="578"/>
+        <source>Error creating file %1</source>
+        <translation>Error creando archivo %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="582"/>
+        <source>Error writing to file %1</source>
+        <translation>Error escribiendo el archivo %1</translation>
+    </message>
+</context>
+<context>
+    <name>CRouterBRouterTilesPage</name>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
+        <source>Continue with Setup</source>
+        <translation>Continuar con la configuración</translation>
+    </message>
+</context>
+<context>
+    <name>CRouterBRouterTilesSelect</name>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
+        <source>available routing-data is being determined.</source>
+        <translation>Se están determinando los datos de enrutamiento disponibles.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="108"/>
+        <source>Select outdated</source>
+        <translation>Selección caducada</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
+        <source>Clear Selection</source>
+        <translation>Borrar selección</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
+        <source>Delete selection</source>
+        <translation>Borrar Selección</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
+        <source>Download</source>
+        <translation>Descargar</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="281"/>
+        <source>Error creating segments directory %1</source>
+        <translation>Error al crear la carpeta de segmentos</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="365"/>
+        <source>cannot parse: %1 is not a date</source>
+        <translation>No se puede analizar: %1 no es una fecha</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="390"/>
+        <source>cannot parse: %1 is not a valid size</source>
+        <translation>No se puede analizar: %1 No es un tamaño válido</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="409"/>
+        <source>Error retrieving available routing data from %1: %2</source>
+        <translation>Error al recuperar los datos de enrutamiento disponibles de %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="490"/>
+        <source>segments directory does not exist: </source>
+        <translation>Carpeta de segmentos no existe:</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="504"/>
+        <source>error creating file %1: %2</source>
+        <translation>Error creando archivo %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="536"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="576"/>
+        <source>no valid request for filename %1</source>
+        <translation>%1 : Solicitud no válida de nombre de archivo</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="541"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="584"/>
+        <source>no open file assigned to request for %1</source>
+        <translation>Ningún archivo abierto asignado a la solicitud de %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="551"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="594"/>
+        <source>error writing to file %1: %2</source>
+        <translation>Error al escribir el archivo %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="620"/>
+        <source>error renaming file %1 to %2: %3</source>
+        <translation>Error renombrando archivo %1 a %2: %3</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="694"/>
+        <source>up-to-date: %1 (%2), outdated: %3 (%4), to be downloaded: %5 (%6)</source>
+        <translation>actualizado: %1 (%2), obsoleto: %3 (%4), Para descargar: %5 (%6)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
+        <source>being downloaded: %1 of %2</source>
+        <translation>Descargando: %1 of %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
+        <source>no local data, online available: %1 (%2)</source>
+        <translation>Sin datos locales, disponible online: %1 (%2)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="798"/>
+        <source>local data outdated (%1, %2 - remote %3, %4)</source>
+        <translation>Datos locales obsoletos (%1, %2 - remoto%3, %4)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
+        <source>Error removing %1: %2</source>
+        <translation>Error eliminando %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
+        <source>Network Error</source>
+        <translation>Error de red</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="330"/>
+        <source>invalid result, no files found</source>
+        <translation>Resultado no válido, no se encuentran archivos</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="806"/>
+        <source>local data up to date (%1, %2)</source>
+        <translation>Datos locales actualizados (%1, %2)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="818"/>
+        <source>no routing-data available</source>
+        <translation>Datos de ruteo no disponibles</translation>
+    </message>
+</context>
+<context>
+    <name>CRouterBRouterToolShell</name>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
+        <source>!!! done !!!
+</source>
+        <translation>¡¡¡Hecho!!!</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
+        <source>!!! failed !!!
+</source>
+        <translation>!!! fallo !!!</translation>
+    </message>
+</context>
+<context>
+    <name>CRouterMapQuest</name>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
+        <source>Fastest</source>
+        <translation>Más rapido</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="38"/>
+        <source>Shortest</source>
+        <translation>Más corto</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="39"/>
+        <source>Bicycle</source>
+        <translation>Bicicleta</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="40"/>
+        <source>Pedestrian</source>
+        <translation>Peatón</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="42"/>
+        <source>US English</source>
+        <translation>Inglés USA</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="43"/>
+        <source>British English</source>
+        <translation>Inglés UK</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="44"/>
+        <source>Danish</source>
+        <translation>Danés</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="45"/>
+        <source>Dutch</source>
+        <translation>Holandés</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="46"/>
+        <source>French</source>
+        <translation>Francés</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="47"/>
+        <source>German</source>
+        <translation>Alemán</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="48"/>
+        <source>Italian</source>
+        <translation>Italiano</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="49"/>
+        <source>Norwegian</source>
+        <translation>Noruego</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="50"/>
+        <source>Spanish</source>
+        <translation>Español</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="51"/>
+        <source>Swedish</source>
+        <translation>Sueco</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="110"/>
+        <source>mode "%1"</source>
+        <translation>modo "%1"</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="114"/>
+        <source>no highways</source>
+        <translation>Evitar autopistas</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="125"/>
+        <source>no toll roads</source>
+        <translation>Evitar peajes</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="136"/>
+        <source>no seasonal</source>
+        <translation>Evitar estacionales</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="147"/>
+        <source>no unpaved</source>
+        <translation>Evitar no pavimentadas</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="158"/>
+        <source>no ferry</source>
+        <translation>Evitar Ferrys</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="169"/>
+        <source>no crossing of country borders</source>
+        <translation>No cruzar fronteras</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="301"/>
+        <source><b>MapQuest</b><br/>Routing request sent to server. Please wait...</source>
+        <translation><b>MapQuest</b><br/>Solicitud de ruta enviada al servidor. Por favor,espere...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="312"/>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="346"/>
+        <source><b>MapQuest</b><br/>Bad response from server:<br/>%1</source>
+        <translation><b>MapQuest</b><br/>Mala respuesta del servidor:<br/>%1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="363"/>
+        <source><br/>Calculation time: %1s</source>
+        <translation>Tiempo calculando: %1s</translation>
+    </message>
+</context>
+<context>
+    <name>CRouterRoutino</name>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="78"/>
+        <source>Foot</source>
+        <translation>A pie</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="79"/>
+        <source>Horse</source>
+        <translation>A caballo</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="80"/>
+        <source>Wheelchair</source>
+        <translation>Silla de ruedas</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="81"/>
+        <source>Bicycle</source>
+        <translation>Bicicleta</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="82"/>
+        <source>Moped</source>
+        <translation>Ciclomotor</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="83"/>
+        <source>Motorcycle</source>
+        <translation>Moto</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="84"/>
+        <source>Motorcar</source>
+        <translation>Automóvil</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="85"/>
+        <source>Goods</source>
+        <translation>Mercancias</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="59"/>
+        <source>Shortest</source>
+        <translation>El más corto</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
+        <source>Found Routino with a wrong version. Expected %1 found %2</source>
+        <translation>Routino se encuentra en una versión incorrecta. Esperado %1 encontrado %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="60"/>
+        <source>Quickest</source>
+        <translation>El más rápido</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="87"/>
+        <source>English</source>
+        <translation>Inglés</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="88"/>
+        <source>German</source>
+        <translation>Alemán</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="89"/>
+        <source>French</source>
+        <translation>Francés</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="90"/>
+        <source>Hungarian</source>
+        <translation>Húngaro</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="91"/>
+        <source>Dutch</source>
+        <translation>Holandés</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="92"/>
+        <source>Russian</source>
+        <translation>Ruso</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="93"/>
+        <source>Polish</source>
+        <translation>Polaco</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="128"/>
+        <source>A function was called without the database variable set.</source>
+        <translation>Se llamó una función sin la variable de base de datos establecida.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="131"/>
+        <source>A function was called without the profile variable set.</source>
+        <translation>Se llamó una función sin la variable de perfil establecida.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="134"/>
+        <source>A function was called without the translation variable set.</source>
+        <translation>Se llamó una función sin el conjunto de variables de traducción</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="137"/>
+        <source>The specified database to load did not exist.</source>
+        <translation>La base de datos especificada no existe</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="140"/>
+        <source>The specified database could not be loaded.</source>
+        <translation>No se pudo cargar la base de datos especificada</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="143"/>
+        <source>The specified profiles XML file did not exist.</source>
+        <translation>El archivo XML de perfiles no existe</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="146"/>
+        <source>The specified profiles XML file could not be loaded.</source>
+        <translation>El archivo XML de perfiles especificado no está cargado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="149"/>
+        <source>The specified translations XML file did not exist.</source>
+        <translation>El archivo XML de traducción especificado no existe</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="152"/>
+        <source>The specified translations XML file could not be loaded.</source>
+        <translation>El archivo XML de traducción especificado no está cargado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="155"/>
+        <source>The requested profile name does not exist in the loaded XML file.</source>
+        <translation>El nombre del perfil solicitado no existe en el archivo XML cargado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="158"/>
+        <source>The requested translation language does not exist in the loaded XML file.</source>
+        <translation>El idioma solicitado no existe en el archivo XML cargado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="164"/>
+        <source>The profile and database do not work together.</source>
+        <translation>El perfil y la base de datos no funcionan juntos</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="167"/>
+        <source>The profile being used has not been validated.</source>
+        <translation>El perfil que se utiliza no ha sido validado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="170"/>
+        <source>The user specified profile contained invalid data.</source>
+        <translation>El perfil especificado por el usuario contenía datos no válidos</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="173"/>
+        <source>The routing options specified are not consistent with each other.</source>
+        <translation>Las opciones de enrutamiento especificadas no son coherentes entre sí</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="176"/>
+        <source>There is a mismatch between the library and caller API version.</source>
+        <translation>Hay un desajuste entre la biblioteca y la versión de la API del llamante</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="179"/>
+        <source>Route calculation was aborted by user.</source>
+        <translation>El cálculo de la ruta ha sido cancelado por el usuario</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="185"/>
+        <source>A route could not be found to waypoint %1.</source>
+        <translation>No se pudo encontrar una ruta al waypoint %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="188"/>
+        <source>Unknown error: %1</source>
+        <translation>Error desconocido: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="200"/>
+        <source>profile "%1"</source>
+        <translation>perfil "%1"</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="201"/>
+        <source>, mode "%1"</source>
+        <translation>, modo "%1"</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
+        <source>Warning...</source>
+        <translation>Aviso...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="161"/>
+        <source>In the routing database there is no highway near the coordinates to place a waypoint.</source>
+        <translation>En la base de datos de enrutamiento no hay ninguna carretera cerca de las coordenadas para colocar un waypoint.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="415"/>
+        <source>Calculate route with %1</source>
+        <translation>Calcular ruta con %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="340"/>
+        <source><br/>Calculation time: %1s</source>
+        <translation><br/>Tiempo de cálculo: %1s</translation>
+    </message>
+</context>
+<context>
+    <name>CRouterRoutinoPathSetup</name>
+    <message>
+        <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="40"/>
+        <source>Add or remove paths containing Routino data. There can be multiple databases in a path but no sub-path is parsed.</source>
+        <translation>Agregar o quitar carpetas que contienen datos de Routino. Puede haber varias bases de datos en una carpeta, pero no se analiza ninguna subcarpeta.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="55"/>
+        <source>Select routing data file path...</source>
+        <translation>Seleccione la carpeta del archivo de datos de enrutamiento</translation>
+    </message>
+</context>
+<context>
+    <name>CRouterSetup</name>
+    <message>
+        <location filename="../gis/rte/router/CRouterSetup.cpp" line="38"/>
+        <source>Routino (offline)</source>
+        <translation>Routino (offline)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterSetup.cpp" line="39"/>
+        <source>MapQuest (online)</source>
+        <translation>MapQuest (online)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
+        <source>BRouter (online)</source>
+        <translation>BRouter (online)</translation>
+    </message>
+</context>
+<context>
+    <name>CRoutinoDatabaseBuilder</name>
+    <message>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="33"/>
+        <source>Create Routino Database</source>
+        <translation>Crear base de datos de Routino</translation>
+    </message>
+    <message>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="58"/>
+        <source>Select files...</source>
+        <translation>Seleccionar ficheros de origen...</translation>
+    </message>
+    <message>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="82"/>
+        <source>Select target path...</source>
+        <translation>Seleccionar carpeta de destino...</translation>
+    </message>
+    <message>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="143"/>
+        <source>!!! done !!!
+</source>
+        <translation>¡¡¡Hecho!!!</translation>
+    </message>
+</context>
+<context>
+    <name>CScrOptRangeTrk</name>
+    <message>
+        <location filename="../mouse/CScrOptRangeTrk.cpp" line="38"/>
+        <source>No range selected</source>
+        <translation>No hay rango seleccionado</translation>
+    </message>
+</context>
+<context>
+    <name>CScrOptSelect</name>
+    <message>
+        <location filename="../mouse/CScrOptSelect.cpp" line="93"/>
+        <source><b>Exact Mode</b><br/>All selected items have to be completely inside the selected area.<br/></source>
+        <translation><b>Modo exacto</b><br/>Todos los elementos seleccionados estan completamente dentro del área.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CScrOptSelect.cpp" line="97"/>
+        <source><b>Intersecting Mode</b><br/>All selected items have to be inside or at least intersect the selected area.<br/></source>
+        <translation>Modo de intersección</b><br/>Todos los elementos seleccionados deben estar dentro o al menos intersecar el área seleccionada.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CScrOptSelect.cpp" line="101"/>
+        <source><b>Add Tracks</b><br/>Add tracks to list of selected items<br/></source>
+        <translation><b>Agregar tracks</b><br/>Agregar tracks a la lista de elementos seleccionados<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CScrOptSelect.cpp" line="105"/>
+        <source><b>Add Waypoints</b><br/>Add waypoints to list of selected items<br/></source>
+        <translation><b>Agregar waypoints</b><br/>Agregar waypoints a la lista de elementos seleccionados<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CScrOptSelect.cpp" line="109"/>
+        <source><b>Add Routes</b><br/>Add routes to list of selected items<br/></source>
+        <translation><b>Agregar rutas</b><br/>Agregar rutas a la lista de elementos seleccionados <br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CScrOptSelect.cpp" line="113"/>
+        <source><b>Add Areas</b><br/>Add areas to list of selected items<br/></source>
+        <translation><b>Agregar áreas</b><br/>Agregar áreas a la lista de elementos seleccionados<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CScrOptSelect.cpp" line="124"/>
+        <source><b>Ignore Tracks</b><br/>Ignore tracks in list of selected items<br/></source>
+        <translation><b>Ignorar tracks</b><br/>Ignorar tracks de la lista de elementos seleccionados<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CScrOptSelect.cpp" line="128"/>
+        <source><b>Ignore Waypoints</b><br/>Ignore waypoints in list of selected items<br/></source>
+        <translation><b>Ignorar Waypoints</b><br/>Ignorar waypoints de la lista de elementos seleccionados<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CScrOptSelect.cpp" line="132"/>
+        <source><b>Ignore Routes</b><br/>Ignore routes in list of selected items<br/></source>
+        <translation><b>Ignorar rutas</b><br/>Ignorar rutas en la lista de elementos seleccionados<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/CScrOptSelect.cpp" line="136"/>
+        <source><b>Ignore Areas</b><br/>Ignore areas in list of selected items<br/></source>
+        <translation>Ignorar áreas</b><br/>Ignorar áreas de la lista de elementos seleccionados<br/></translation>
+    </message>
+</context>
+<context>
+    <name>CSearchDatabase</name>
+    <message>
+        <location filename="../gis/db/CSearchDatabase.cpp" line="38"/>
+        <source>Search database '%1':</source>
+        <translation>Buscar base de datos '%1':</translation>
+    </message>
+</context>
+<context>
+    <name>CSearchGoogle</name>
+    <message>
+        <location filename="../gis/search/CSearchGoogle.cpp" line="118"/>
+        <source>Unknown response</source>
+        <translation>Respuesta desconocida</translation>
+    </message>
+    <message>
+        <location filename="../gis/search/CSearchGoogle.cpp" line="128"/>
+        <source>Error: </source>
+        <translation>Error: </translation>
+    </message>
+</context>
+<context>
+    <name>CSetupDatabase</name>
+    <message>
+        <location filename="../gis/db/CSetupDatabase.cpp" line="47"/>
+        <source>Missing Requirement</source>
+        <translation>Falta un requisito</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CSetupDatabase.cpp" line="48"/>
+        <source>MySQL cannot be used at this point, because the corresponding driver (QMYSQL) is not available.<br />Please make sure you have installed the corresponding package.<br />If you don't know what to do now you should have <a href="%1">a look at the wiki</a>.</source>
+        <translation>SQL no se puede utilizar en este momento, ya que el controlador correspondiente (QMYSQL) no está disponible.<br />Asegúrese de haber instalado el paquete correspondiente.<br />Si usted no sabe qué hacer ahora debe <a href="%1">consultar la wiki</a>.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CSetupDatabase.cpp" line="102"/>
+        <source>Error...</source>
+        <translation>Error...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CSetupDatabase.cpp" line="102"/>
+        <source>There is already a database with name '%1'</source>
+        <translation>Ya existe una base de datos con el nombre '%1'</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CSetupDatabase.cpp" line="115"/>
+        <source>New database...</source>
+        <translation>Nueva base de datos...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CSetupDatabase.cpp" line="140"/>
+        <source>Open database...</source>
+        <translation>Abrir base de datos...</translation>
+    </message>
+</context>
+<context>
+    <name>CSetupWorkspace</name>
+    <message>
+        <location filename="../gis/db/CSetupWorkspace.cpp" line="55"/>
+        <source>Setup database...</source>
+        <translation>Configurar la base de datos...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/CSetupWorkspace.cpp" line="55"/>
+        <source>Changes will become active after an application's restart.</source>
+        <translation>Los cambios surtirán efecto tras reiniciar la aplicación.</translation>
+    </message>
+</context>
+<context>
+    <name>CSlfProject</name>
+    <message>
+        <location filename="../gis/slf/CSlfProject.cpp" line="42"/>
+        <source>Failed to load file %1...</source>
+        <translation>Fallo al cargar el archivo %1...</translation>
+    </message>
+</context>
+<context>
+    <name>CSlfReader</name>
+    <message>
+        <location filename="../gis/slf/CSlfReader.cpp" line="63"/>
+        <source>Failed to parse timestamp `%1`</source>
+        <translation>Error al analizar la marca de tiempo %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/slf/CSlfReader.cpp" line="76"/>
+        <source>%1 does not exist</source>
+        <translation>%1 no existe</translation>
+    </message>
+    <message>
+        <location filename="../gis/slf/CSlfReader.cpp" line="81"/>
+        <source>Failed to open %1</source>
+        <translation>Fallo al abrir %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/slf/CSlfReader.cpp" line="92"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Fallo al leer: %1
+línea %2, columna %3.
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../gis/slf/CSlfReader.cpp" line="99"/>
+        <source>Not a SLF file: %1</source>
+        <translation>%1 no es un archivo SLF</translation>
+    </message>
+    <message>
+        <location filename="../gis/slf/CSlfReader.cpp" line="106"/>
+        <source>Unsupported revision %1: %2</source>
+        <translation>Revisión no admitida %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/slf/CSlfReader.cpp" line="181"/>
+        <source>Break %1</source>
+        <translation>Pausa %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
+        <source>Lap %1</source>
+        <translation>Vuelta %1</translation>
+    </message>
+</context>
+<context>
+    <name>CSmlProject</name>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="63"/>
+        <source>Failed to load file %1...</source>
+        <translation>Fallo al cargar archivo %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="85"/>
+        <source>Failed to open %1</source>
+        <translation>Fallo al abrir %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="96"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Fallo al leer: %1
+línea %2, columna %3.
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="103"/>
+        <source>Not an sml file: %1</source>
+        <translation>No es un archivo sml: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="129"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation>Tiempo de recuperación: %1 h<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="134"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation>Efecto Pico de Entrenamiento: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="139"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation>Energy: %1 kCal<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="160"/>
+        <source>Device: %1<br/></source>
+        <translation>Device: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="148"/>
+        <source>Battery usage: %1 %/hour</source>
+        <translation>Uso de la Batería: %1 %/hour</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="195"/>
+        <source>Use of local time...</source>
+        <translation>Uso de hora loccal</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="196"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation>No se ha encontrado hora UTC en el archivo %1. Se usará la hora local del ordenador. Puede ajustar hora usando un filtro de tiempo si es necesario.</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="245"/>
+        <source>This SML file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation>Este archivo SML no contiene ningún dato de posición y QMapShack no puede mostrarlo: %1</translation>
+    </message>
+</context>
+<context>
+    <name>CTableTrk</name>
+    <message>
+        <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
+        <source>Double click to edit elevation value</source>
+        <translation>Doble clic para editar datos de altitud</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
+        <location filename="../gis/trk/CTableTrk.cpp" line="133"/>
+        <location filename="../gis/trk/CTableTrk.cpp" line="136"/>
+        <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
+        <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
+        <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
+        <source>%1%2</source>
+        <translation>%1%2</translation>
+    </message>
+</context>
+<context>
+    <name>CTcxProject</name>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
+        <source>Failed to load file %1...</source>
+        <translation>Fallo al cargar el archivo %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="73"/>
+        <source>Failed to open %1</source>
+        <translation>Fallo al abrir %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="84"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Fallo al leer: %1
+línea %2, columna %3.
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="91"/>
+        <source>Not a TCX file: %1</source>
+        <translation>%1 no es un archivo TCX</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="101"/>
+        <source>This TCX file contains at least 1 workout, but neither an activity nor a course. As workouts do not contain position data, they can not be imported to QMapShack.</source>
+        <translation>Este archivo TCX contiene al menos un entrenamiento, pero ninguna actividad ni carrera. Como los entrenamientos no contienen datos de posición, no se pueden importar a QMapShack</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="106"/>
+        <source>This TCX file does not contain any activity or course: %1</source>
+        <translation>El archivo TCX %1 no contiene ninguna actividad ni carrera</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="275"/>
+        <source>File exists ...</source>
+        <translation>El archivo ya existe ...</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="276"/>
+        <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
+        <translation>El archivo existe y no ha sido creado por QMapShack. Si pulsa 'yes' Se perderán todos los datos de este archivo. Incluso si este archivo contiene datos y ha sido cargado por QMapShack, QMapShack puede no ser capaz de cargar y almacenar todos los elementos de este archivo. Estos elementos se perderán. Se recomienda usar otro archivo. <b>¿Realmente desea sobrescribir el archivo?</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="315"/>
+        <source>The track <b>%1</b> you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. <b>Do you want to apply a filter with constant speed (10 m/s) and continue?</b></source>
+        <translation>El track <b>%1</b> Que ha seleccionado contiene puntos y marcas de tiempo no válidas. Es posible que el dispositivo no acepte el archivo de curso TCX generado si se deja como está <b>¿Desea aplicar un filtro con velocidad constante (10 m / s) y continuar?</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
+        <source>Course</source>
+        <translation>Carrera</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
+        <source>Activity</source>
+        <translation>Actividad</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
+        <source>Track with invalid timestamps...</source>
+        <translation>Track con marcas de tiempo inválidas.</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="334"/>
+        <source>Activity or course?</source>
+        <translation>¿Actividad o carrera?</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
+        <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
+        <translation>QMapShack no sabe cómo <b>%1</b> Debe ser guardado. <b>¿Desea guardarlo como carrera o como actividad? </b>Recuerde que sólo se guardarán waypoints lo suficientemente cerca del track al guardar como carrera. Los waypoints no se guardarán al guardar como actividad.</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
+        <source>Failed to create file '%1'</source>
+        <translation>Fallo al crear el archivo '%1'</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
+        <source>Failed to write file '%1'</source>
+        <translation>Fallo al escribir en el archivo '%1'</translation>
+    </message>
+    <message>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="435"/>
+        <location filename="../gis/tcx/CTcxProject.cpp" line="454"/>
+        <source>Saving GIS data failed...</source>
+        <translation>Error al guardar datos GIS</translation>
+    </message>
+</context>
+<context>
+    <name>CTemplateWidget</name>
+    <message>
+        <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
+        <source>choose one...</source>
+        <translation>elige una...</translation>
+    </message>
+    <message>
+        <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
+        <source>Hiking Tour Summary (built-in)</source>
+        <translation>Datos de la actividad (genérico)</translation>
+    </message>
+    <message>
+        <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
+        <source>Template path...</source>
+        <translation>Ruta de las Plantillas...</translation>
+    </message>
+    <message>
+        <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
+        <source>Failed to read template file %1.</source>
+        <translation>Fallo al leer la plantilla %1.</translation>
+    </message>
+    <message>
+        <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
+        <source>Preview...</source>
+        <translation>Previsualizar...</translation>
+    </message>
+</context>
+<context>
+    <name>CTextEditWidget</name>
+    <message>
+        <location filename="../widgets/CTextEditWidget.cpp" line="71"/>
+        <source>&Color...</source>
+        <translation>&Color...</translation>
+    </message>
+    <message>
+        <location filename="../widgets/CTextEditWidget.cpp" line="117"/>
+        <source>Reset format</source>
+        <translation>Restablecer formato</translation>
+    </message>
+</context>
+<context>
+    <name>CToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="43"/>
+        <source>Available Actions</source>
+        <translation>Acciones disponibles</translation>
+    </message>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="44"/>
+        <source>Selected Actions</source>
+        <translation>Acciones seleccionadas</translation>
+    </message>
+</context>
+<context>
+    <name>CTwoNavProject</name>
+    <message>
+        <location filename="../gis/tnv/serialization.cpp" line="560"/>
+        <location filename="../gis/tnv/serialization.cpp" line="588"/>
+        <location filename="../gis/tnv/serialization.cpp" line="599"/>
+        <location filename="../gis/tnv/serialization.cpp" line="617"/>
+        <location filename="../gis/tnv/serialization.cpp" line="645"/>
+        <location filename="../gis/tnv/serialization.cpp" line="719"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
+        <source>Error...</source>
+        <translation>Error...</translation>
+    </message>
+    <message>
+        <location filename="../gis/tnv/serialization.cpp" line="560"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
+        <source>Failed to open %1.</source>
+        <translation>Fallo al abrir %1.</translation>
+    </message>
+    <message>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="160"/>
+        <source>Save GIS data to...</source>
+        <translation>Guardar los datos GIS en...</translation>
+    </message>
+    <message>
+        <location filename="../gis/tnv/serialization.cpp" line="588"/>
+        <location filename="../gis/tnv/serialization.cpp" line="599"/>
+        <source>Only support lon/lat WGS 84 format.</source>
+        <translation>Solamente soporta formato lon/lat WGS84.</translation>
+    </message>
+    <message>
+        <location filename="../gis/tnv/serialization.cpp" line="617"/>
+        <location filename="../gis/tnv/serialization.cpp" line="645"/>
+        <location filename="../gis/tnv/serialization.cpp" line="719"/>
+        <source>Failed to read data.</source>
+        <translation>Fallo al leer los datos.</translation>
+    </message>
+</context>
+<context>
+    <name>CWptIconDialog</name>
+    <message>
+        <location filename="../helpers/CWptIconDialog.cpp" line="161"/>
+        <source>Path to user icons...</source>
+        <translation>Carpeta de iconos de usuario...</translation>
+    </message>
+</context>
+<context>
+    <name>Form</name>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
+        <source>Form</source>
+        <translation>Ficha</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
+        <source>Participants</source>
+        <translation>Participantes</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
+        <source>Weather</source>
+        <translation>Meteo</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
+        <source>rain</source>
+        <translation>lluvia</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
+        <source>sunny</source>
+        <translation>sol</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
+        <source>snow</source>
+        <translation>nieve</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
+        <source>clouds</source>
+        <translation>nubes</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
+        <source>windy</source>
+        <translation>viento</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
+        <source>hot</source>
+        <translation>caluroso</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
+        <source>warm</source>
+        <translation>templado</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
+        <source>cold</source>
+        <translation>frío</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
+        <source>freezing</source>
+        <translation>bajo cero</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
+        <source>foggy</source>
+        <translation>niebla</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
+        <source>humid</source>
+        <translation>humedad</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
+        <source>Character</source>
+        <translation>Carácter</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
+        <source>easy hiking</source>
+        <translation>Excursión fácil</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
+        <source>climbing</source>
+        <translation>escalada</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
+        <source>alpine</source>
+        <translation>Actividad alpina</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
+        <source>large ascend</source>
+        <translation>gran desnivel</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
+        <source>long distance</source>
+        <translation>larga distancia</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
+        <source>via ferrata</source>
+        <translation>ferrata</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
+        <source>hail/soft hail</source>
+        <translation>granizo</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
+        <source>Rating</source>
+        <translation>Calificación</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
+        <source>Rating 5 stars</source>
+        <translation>***** Excepcional</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
+        <source>Rating 4 stars</source>
+        <translation>**** Muy buena</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
+        <source>Rating 3 stars</source>
+        <translation>*** Buena</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
+        <source>Rating 2 stars</source>
+        <translation>** Regular</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
+        <source>Rating 1 star</source>
+        <translation>* Mala</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
+        <source>aborted</source>
+        <translation>Intento frustrado</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
+        <source>Equipment</source>
+        <translation>Material</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
+        <source>ferrata gear</source>
+        <translation>ferrata</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
+        <source>night gear</source>
+        <translation>iluminación</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
+        <source>snow shoes</source>
+        <translation>raquetas</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
+        <source>climbing gear</source>
+        <translation>escalada</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
+        <source>ski</source>
+        <translation>ski</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
+        <source>camping gear</source>
+        <translation>acampada / vivac</translation>
+    </message>
+    <message>
+        <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
+        <source>Details</source>
+        <translation>Detalles</translation>
+    </message>
+</context>
+<context>
+    <name>IAbout</name>
+    <message>
+        <location filename="../IAbout.ui" line="14"/>
+        <source>About....</source>
+        <translation>Acerca de...</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="55"/>
+        <source><b>QMapShack</b>, Version</source>
+        <translation><b>QMapShack</b>, Versión</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="62"/>
+        <location filename="../IAbout.ui" line="113"/>
+        <location filename="../IAbout.ui" line="127"/>
+        <location filename="../IAbout.ui" line="141"/>
+        <location filename="../IAbout.ui" line="155"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="106"/>
+        <source>Qt</source>
+        <translation>Qt</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="120"/>
+        <source>GDAL</source>
+        <translation>GDAL</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="134"/>
+        <source>Proj4</source>
+        <translation>Proj4</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="148"/>
+        <source>Routino</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="179"/>
+        <source>Czech:</source>
+        <translation>checo:</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="202"/>
+        <source>German:</source>
+        <translation>Alemán:</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="212"/>
+        <source>Oliver Eichler</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="225"/>
+        <source>Dutch:</source>
+        <translation>holandés:</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="248"/>
+        <source>French:</source>
+        <translation>Francés:</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="258"/>
+        <source>Rainer Unseld </source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="295"/>
+        <source>Russian:</source>
+        <translation>Ruso:</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="302"/>
+        <source>Wolfgang Thämelt</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="428"/>
+        <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="189"/>
+        <source>Pavel Fric</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="288"/>
+        <source><b>Translation:</b></source>
+        <translation><b>Traducción:</b></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="235"/>
+        <source>Harrie Klomp</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="278"/>
+        <source>Spanish:</source>
+        <translation>Español:</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="326"/>
+        <source>Win64:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="342"/>
+        <source>OS X:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="366"/>
+        <source><b>Binaries:</b></source>
+        <translation><b>Binarios:</b></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="395"/>
+        <source><b>Contributors:</b></source>
+        <translation><b>Colaboradores:</b></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="265"/>
+        <source>Jose Luis Domingo Lopez</source>
+        <translation>Jose Luis Domingo, Javi Segovia</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="359"/>
+        <source>Ivo Kronenberg</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="352"/>
+        <source>Helmut Schmidt</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="375"/>
+        <source>...and thanks to all Linux binary maintainers for doing a great job. Special thanks to Dan Horák and Bas Couwenberg for showing presence on the mailing list to discuss distribution related topics.</source>
+        <translation>... y gracias a todos los mantenedores  de Linux por hacer un gran trabajo. Agradecimientos especiales a Dan Horák y Bas Couwenberg por estar presentes en la lista de correo para discutir temas relacionados con la distribución</translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="402"/>
+        <source>Christian Eichler (qms at christian-eichler.de)
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IAbout.ui" line="421"/>
+        <source>This software is licensed under GPL3 or any later version</source>
+        <translation>Este software esta bajo licencia GPL3 o posterior</translation>
+    </message>
+</context>
+<context>
+    <name>ICanvasSetup</name>
+    <message>
+        <location filename="../canvas/ICanvasSetup.ui" line="14"/>
+        <source>Setup Map View...</source>
+        <translation>Configurar Vista de Mapa...</translation>
+    </message>
+    <message>
+        <location filename="../canvas/ICanvasSetup.ui" line="22"/>
+        <source>Projection & Datum</source>
+        <translation>Proyección y Datum</translation>
+    </message>
+    <message>
+        <location filename="../canvas/ICanvasSetup.ui" line="32"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../canvas/ICanvasSetup.ui" line="53"/>
+        <source>Scales</source>
+        <translation>Escalas</translation>
+    </message>
+    <message>
+        <location filename="../canvas/ICanvasSetup.ui" line="59"/>
+        <source>Logarithmic</source>
+        <translation>Logarítmica</translation>
+    </message>
+    <message>
+        <location filename="../canvas/ICanvasSetup.ui" line="66"/>
+        <source>Square (optimized for TMS and WMTS tiles)</source>
+        <translation>Cuadrada (optimizada para teselas TMS y WMTS)</translation>
+    </message>
+</context>
+<context>
+    <name>IColorChooser</name>
+    <message>
+        <location filename="../widgets/IColorChooser.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
+    </message>
+</context>
+<context>
+    <name>ICombineTrk</name>
+    <message>
+        <location filename="../gis/trk/ICombineTrk.ui" line="14"/>
+        <source>Combine Tracks...</source>
+        <translation>Combinar Tracks...</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
+        <source>Available Tracks</source>
+        <translation>Tracks disponibles</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
+        <location filename="../gis/trk/ICombineTrk.ui" line="81"/>
+        <location filename="../gis/trk/ICombineTrk.ui" line="139"/>
+        <location filename="../gis/trk/ICombineTrk.ui" line="166"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
+        <source>Combined Tracks</source>
+        <translation>Tracks combinados</translation>
+    </message>
+</context>
+<context>
+    <name>ICoordFormatSetup</name>
+    <message>
+        <location filename="../units/ICoordFormatSetup.ui" line="14"/>
+        <source>Coordinate Format...</source>
+        <translation>Formato de coordenadas...</translation>
+    </message>
+    <message>
+        <location filename="../units/ICoordFormatSetup.ui" line="36"/>
+        <source>N48° 53.660 E013° 31.113</source>
+        <translation>N48° 53.660 E013° 31.113</translation>
+    </message>
+    <message>
+        <location filename="../units/ICoordFormatSetup.ui" line="29"/>
+        <source>N48.8943° E013.51855°</source>
+        <translation>N48.8943° E013.51855°</translation>
+    </message>
+    <message>
+        <location filename="../units/ICoordFormatSetup.ui" line="22"/>
+        <source>N48° 53' 39.6" E13° 31' 6.78"</source>
+        <translation>N48° 53' 39.6" E13° 31' 6.78"</translation>
+    </message>
+</context>
+<context>
+    <name>ICreateRouteFromWpt</name>
+    <message>
+        <location filename="../gis/rte/ICreateRouteFromWpt.ui" line="14"/>
+        <source>Create Route from Waypoints</source>
+        <translation>Crear una ruta con los waypoints</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/ICreateRouteFromWpt.ui" line="30"/>
+        <location filename="../gis/rte/ICreateRouteFromWpt.ui" line="50"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>ICutTrk</name>
+    <message>
+        <location filename="../gis/trk/ICutTrk.ui" line="14"/>
+        <source>Cut Track</source>
+        <translation>Dividir track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/ICutTrk.ui" line="20"/>
+        <source>Delete first part of the track and keep second one</source>
+        <translation>Borrar primera parte del track y conservar la segunda</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/ICutTrk.ui" line="30"/>
+        <source>Keep both parts of the track</source>
+        <translation>Mantener ambas partes del track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/ICutTrk.ui" line="43"/>
+        <source>Keep first part of the track and delete second one</source>
+        <translation>Conservar primera parte del track y borrar la segunda</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/ICutTrk.ui" line="55"/>
+        <source>Cut Mode:</source>
+        <translation>Modo de división</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/ICutTrk.ui" line="136"/>
+        <source>Check this to store the result into a new track. 
+
+If you keep both parts of the track you have to create new ones. 
+
+If you want to keep just one half you can simply remove the points, or check this to create a new track.</source>
+        <translation>Compruebe esto para almacenar el resultado en un nuevo track.
+
+Si mantiene ambas partes del track, tiene que crear otros nuevos.
+
+Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marcar esto para crear un nuevo track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/ICutTrk.ui" line="143"/>
+        <source>Create a new track</source>
+        <translation>Crear nuevo track</translation>
+    </message>
+</context>
+<context>
+    <name>IDB</name>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="60"/>
+        <source>The internal database format of '%1' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
+        <translation>El formato interno de base de datos de  '%1' ha cambiado. QMapShack hará la conversión de tu base de datos ahora.Después de esta conversión la nueva base de datos no puede utilizarse en versiones más antiguas de QMapShack. Se recomienda hacer una copia de seguridad antes de comenzar.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="64"/>
+        <source>Migrate database...</source>
+        <translation>Migrar base de datos.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="69"/>
+        <source>Migration aborted by user</source>
+        <translation>Migracion cancelada por el usuario</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="75"/>
+        <source>Failed to migrate '%1'.</source>
+        <translation>Fallo al migrar '%1'.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="77"/>
+        <location filename="../gis/db/IDB.cpp" line="106"/>
+        <source>Error...</source>
+        <translation>Error...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="81"/>
+        <source>Migration failed</source>
+        <translation>La migración falló</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="88"/>
+        <source>The database version of '%1' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
+        <translation>La versión de base de datos '%1' Está más avanzado que el entendido por su instalación de QMapShack. Esto no funcionará.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="110"/>
+        <source>Initialization failed</source>
+        <translation>Inicializacion fallida</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="91"/>
+        <source>Wrong database version...</source>
+        <translation>Versión errónea de la base de datos</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="95"/>
+        <source>Database created by newer version of QMapShack</source>
+        <translation>Base de datos creada por la nueva versión de QMapShack</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="104"/>
+        <source>Failed to initialize '%1'.</source>
+        <translation>Fallo al iniciar '%1'.</translation>
+    </message>
+</context>
+<context>
+    <name>IDBMysql</name>
+    <message>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
+        <source>Password...</source>
+        <translation>Contraseña...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
+        <source>Password for database '%1':</source>
+        <translation>Contraseña de la base de datos '%1':</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBMysql.cpp" line="222"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation>Actualizar a versión 5 de base de datos. Migrar todos los elementos GIS.</translation>
+    </message>
+</context>
+<context>
+    <name>IDBSqlite</name>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="306"/>
+        <source>Update to database version 3. Migrate all GIS items.</source>
+        <translation>Actualizar base de datos a versión 3. Migrar todos los elementos GIS</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="375"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation>Actualizar base de datos a versión 5. Migrar todos los elementos GIS</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="449"/>
+        <source>Update to database version 6. Migrate all GIS items.</source>
+        <translation>Actualizar base de datos a versión 6. Migrar todos los elementos GIS</translation>
+    </message>
+</context>
+<context>
+    <name>IDemPathSetup</name>
+    <message>
+        <location filename="../dem/IDemPathSetup.ui" line="14"/>
+        <source>Setup DEM file paths</source>
+        <translation>Configurar carpeta de archivos DEM</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPathSetup.ui" line="31"/>
+        <location filename="../dem/IDemPathSetup.ui" line="51"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPathSetup.ui" line="112"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+</context>
+<context>
+    <name>IDemPropSetup</name>
+    <message>
+        <location filename="../dem/IDemPropSetup.ui" line="14"/>
+        <source>Form</source>
+        <translation>ficha</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPropSetup.ui" line="35"/>
+        <source><html><head/><body><p>Change opacity of map</p></body></html></source>
+        <translation><html><head/><body><p>Cambiar la opacidad del mapa</p></body></html></translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPropSetup.ui" line="50"/>
+        <source><html><head/><body><p>Click to use current scale as minimum scale to display the map.</p></body></html></source>
+        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala mínima a la que mostrar el mapa.</p></body></html></translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPropSetup.ui" line="53"/>
+        <location filename="../dem/IDemPropSetup.ui" line="90"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPropSetup.ui" line="74"/>
+        <source><html><head/><body><p>Control the range of scale the map is displayed. Use the two buttons left and right to define the actual scale as either minimum or maximum scale.</p></body></html></source>
+        <translation><html><head/><body><p>Controle el rango de escalas para las cuales desea que se muestre el mapa. Use los dos botones a izquierda y derecha para definir la escala actual como  la escala mínima o máxima para el mapa.</p></body></html></translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPropSetup.ui" line="87"/>
+        <source><html><head/><body><p>Click to use current scale as maximum scale to display the map.</p></body></html></source>
+        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala máxima a la que mostrar el mapa</p></body></html></translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPropSetup.ui" line="118"/>
+        <source>Hillshading</source>
+        <translation>Sombreado</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPropSetup.ui" line="144"/>
+        <source>Slope </source>
+        <translation>Pendiente</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPropSetup.ui" line="226"/>
+        <location filename="../dem/IDemPropSetup.ui" line="326"/>
+        <location filename="../dem/IDemPropSetup.ui" line="410"/>
+        <location filename="../dem/IDemPropSetup.ui" line="494"/>
+        <location filename="../dem/IDemPropSetup.ui" line="578"/>
+        <source>°</source>
+        <translation>º</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPropSetup.ui" line="229"/>
+        <location filename="../dem/IDemPropSetup.ui" line="329"/>
+        <location filename="../dem/IDemPropSetup.ui" line="413"/>
+        <location filename="../dem/IDemPropSetup.ui" line="497"/>
+        <location filename="../dem/IDemPropSetup.ui" line="581"/>
+        <source>> </source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemPropSetup.ui" line="251"/>
+        <location filename="../dem/IDemPropSetup.ui" line="270"/>
+        <location filename="../dem/IDemPropSetup.ui" line="354"/>
+        <location filename="../dem/IDemPropSetup.ui" line="438"/>
+        <location filename="../dem/IDemPropSetup.ui" line="522"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+</context>
+<context>
+    <name>IDemsList</name>
+    <message>
+        <location filename="../dem/IDemList.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemList.ui" line="112"/>
+        <source>To add files with elevation data use <b>File->Setup DEM Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
+        <translation>Para añadir archivos con datos de altitud <b>File->configure rutas de DEM</b>.  O clic <a href='setup'><b>aqui</b></a></translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemList.ui" line="125"/>
+        <source>Use the context menu (right mouse button click on entry) to activate a file. Use drag-n-drop to move the activated file in the process order. </source>
+        <translation>Use el menú contextual (botón derecho del ratón y seleccione) para activar un archivo. Use arrastrar y soltar para mover el archivo activado en el orden de procesamiento.</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemList.ui" line="150"/>
+        <source>Activate</source>
+        <translation>Activar</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemList.ui" line="159"/>
+        <source>Move Up</source>
+        <translation>Subir</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemList.ui" line="162"/>
+        <source>Hide DEM behind previous one</source>
+        <translation>Ocultar DEM detrás del anterior</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemList.ui" line="171"/>
+        <source>Move down</source>
+        <translation>Bajar</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemList.ui" line="174"/>
+        <source>Show DEM on top of next one</source>
+        <translation>Mostrar DEM encima del siguiente</translation>
+    </message>
+    <message>
+        <location filename="../dem/IDemList.ui" line="183"/>
+        <source>Reload DEM</source>
+        <translation>Recargar DEM's</translation>
+    </message>
+</context>
+<context>
+    <name>IDetailsGeoCache</name>
+    <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="20"/>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="47"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="73"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="86"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="99"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="112"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="125"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="151"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="164"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="177"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="190"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="203"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="252"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="267"/>
+        <source>about:blank</source>
+        <translation>about:blank</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="40"/>
+        <source>Position:</source>
+        <translation>Posición:</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="60"/>
+        <source>Difficulty</source>
+        <translation>Dificultad</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="138"/>
+        <source>Terrain</source>
+        <translation>Terreno</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="214"/>
+        <source>Update spoilers</source>
+        <translation>Actualizar spoilers</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="217"/>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="275"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="293"/>
+        <source>Hint:</source>
+        <translation>Consejo:</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsGeoCache.ui" line="324"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+</context>
+<context>
+    <name>IDetailsOvlArea</name>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
+        <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+        <translation>El área se importó a QMapShack y se cambió. Ya no muestra los datos originales. Consulte el historial de cambios</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="148"/>
+        <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="151"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="181"/>
+        <source>Color</source>
+        <translation>Color</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="202"/>
+        <source>Border width</source>
+        <translation>Ancho del borde</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="216"/>
+        <source>Style</source>
+        <translation>Estilo</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="235"/>
+        <source>Opacity</source>
+        <translation>Opacidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="248"/>
+        <source>Info</source>
+        <translation>Información</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="277"/>
+        <source>Points</source>
+        <translation>Puntos</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="304"/>
+        <source>Position</source>
+        <translation>Posición</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IDetailsOvlArea.ui" line="313"/>
+        <source>Hist.</source>
+        <translation>Historial</translation>
+    </message>
+</context>
+<context>
+    <name>IDetailsPrj</name>
+    <message>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="50"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="57"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
+        <source>Print diary</source>
+        <translation>Imprimir diario</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="71"/>
+        <source>Keep order of project</source>
+        <translation>Mantenga el orden del proyecto</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
+        <source>Sort along track (multiple)</source>
+        <translation>Ordenar a lo largo del track (múltiples)</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
+        <source>Sort along track (single)</source>
+        <translation>Ordenar a lo largo del track (único)</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
+        <source>Rebuild diary.</source>
+        <translation>Recargar diario.</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="43"/>
+        <source>Keywords:</source>
+        <translation>Etiquetas:</translation>
+    </message>
+</context>
+<context>
+    <name>IDetailsRte</name>
+    <message>
+        <location filename="../gis/rte/IDetailsRte.ui" line="36"/>
+        <source>Info</source>
+        <translation>Información</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
+        <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+        <translation>La ruta se importó a QMapShack y se cambió. Ya no muestra los datos originales. Consulte el historial de cambios.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IDetailsRte.ui" line="205"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IDetailsRte.ui" line="170"/>
+        <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IDetailsRte.ui" line="173"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IDetailsRte.ui" line="229"/>
+        <source>Hist.</source>
+        <translation>Historial</translation>
+    </message>
+</context>
+<context>
+    <name>IDetailsTrk</name>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="81"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="105"/>
+        <source>-
+-</source>
+        <translation>-
+-</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
+        <source>Use/edit user defined visibility of arrows for this track</source>
+        <translation>Utilizar / editar la visibilidad definida por el usuario de las flechas de este track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="480"/>
+        <source>Use/edit system's visibility of arrows for all tracks</source>
+        <translation>Utilizar / editar la visibilidad definida por el usuario de las flechas de todos los track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="689"/>
+        <source>Use/edit user defined scale factor for this track</source>
+        <translation>Utilizar / editar el factor de escala de este track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="718"/>
+        <source>Use/edit system's default factor for all tracks</source>
+        <translation>Utilice / edite el factor predeterminado del sistema para todas los tracks</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
+        <source>max.</source>
+        <translation>max.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="994"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1001"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1015"/>
+        <source>min.</source>
+        <translation>min.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
+        <source>Profile</source>
+        <translation>Perfil</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="545"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1047"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1144"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1241"/>
+        <source>User defined limits for this track</source>
+        <translation>Límites definidos por el usuario para este track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1076"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1173"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1270"/>
+        <source>Automatic limits</source>
+        <translation>Límites automáticos</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1108"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1205"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1302"/>
+        <source>User defined limits for all tracks</source>
+        <translation>Límites definidos por el usuario para todos los track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1495"/>
+        <source>Speed</source>
+        <translation>Velocidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="287"/>
+        <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="290"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="454"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="548"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="574"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="603"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="692"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="721"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1050"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1079"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1111"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1147"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1176"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1208"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1244"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1273"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1305"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="387"/>
+        <source>Style</source>
+        <translation>Estilo</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="429"/>
+        <source>Source</source>
+        <translation>Atributo</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="634"/>
+        <source>Maximum</source>
+        <translation>Máximo</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="774"/>
+        <source>Minimum</source>
+        <translation>Mínimo</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
+        <source>x </source>
+        <translation>x </translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
+        <source>-
+-
+-</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
+        <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+        <translation>El track se ha importado a QMapShack y se ha editado. No muestra los datos originales. Consulte el historial de cambios.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
+        <source>Width</source>
+        <translation>Anchura</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
+        <source>with arrows</source>
+        <translation>Con flechas</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
+        <source>Color</source>
+        <translation>Color</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
+        <source>Graphs</source>
+        <translation>Gráficos</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
+        <source>Activity</source>
+        <translation>Actividad</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
+        <source>Set Track Activity</source>
+        <translation>Establecer actividad del track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1400"/>
+        <source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
+        <translation>Para diferenciar las estadísticas seleccione una actividad de la lista para todo el track,o bien, seleccione una parte para asignar una actividad.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1427"/>
+        <source>Points</source>
+        <translation>Puntos</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+        <source>Time</source>
+        <translation>Hora</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+        <source>Ele.</source>
+        <translation>Altitud.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
+        <source>Delta</source>
+        <translation>Delta</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
+        <source>Dist.</source>
+        <translation>Distancia</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1500"/>
+        <source>Slope</source>
+        <translation>Pendiente</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1515"/>
+        <source>Position</source>
+        <translation>Posición</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="355"/>
+        <source>Info</source>
+        <translation>Información</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="316"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1505"/>
+        <source>Ascent</source>
+        <translation>Ascenso</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1510"/>
+        <source>Descent</source>
+        <translation>Descenso</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1524"/>
+        <source>Filter</source>
+        <translation>Filtro</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1561"/>
+        <source>Hist.</source>
+        <translation>Historial</translation>
+    </message>
+</context>
+<context>
+    <name>IDetailsWpt</name>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
+        <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
+        <translation>El waypoint se importó a QMapShack y se cambió. Ya no muestra los datos originales. Consulte el historial de cambios.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="284"/>
+        <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+        <translation>Cambia el modo de sólo lectura. Debe abrir el bloqueo para editar el elemento.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="287"/>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="342"/>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="362"/>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="394"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="77"/>
+        <source>Position:</source>
+        <translation>Posición:</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="43"/>
+        <source>Info</source>
+        <translation>Información</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="84"/>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="110"/>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="136"/>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="328"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="97"/>
+        <source>Ele.</source>
+        <translation>Altitud.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="123"/>
+        <source>Proximity:</source>
+        <translation>Proximidad:</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="413"/>
+        <source>Hist.</source>
+        <translation>Historial</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="339"/>
+        <source>Add images.</source>
+        <translation>Añadir imagenes.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="359"/>
+        <source>Delete selected image.</source>
+        <translation>Eliminar imagen seleccionada.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IDetailsWpt.ui" line="321"/>
+        <source>Date/Time:</source>
+        <translation>Fecha/Hora:</translation>
+    </message>
+</context>
+<context>
+    <name>IDevice</name>
+    <message>
+        <location filename="../device/IDevice.cpp" line="314"/>
+        <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
+        <translation>Hay otro proyecto con el mismo nombre. Si pulsa 'ok'será eliminado y reemplazado.</translation>
+    </message>
+</context>
+<context>
+    <name>IElevationDialog</name>
+    <message>
+        <location filename="../helpers/IElevationDialog.ui" line="14"/>
+        <source>Edit elevation...</source>
+        <translation>Editar altitud...</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IElevationDialog.ui" line="22"/>
+        <source>Elevation</source>
+        <translation>Altitud</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IElevationDialog.ui" line="32"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IElevationDialog.ui" line="39"/>
+        <source>Get elevation from active digital elevation model.</source>
+        <translation>Obtener la altitud desde el DEM activo.</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IElevationDialog.ui" line="42"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IExportDatabase</name>
+    <message>
+        <location filename="../gis/db/IExportDatabase.ui" line="14"/>
+        <source>Export database to GPX...</source>
+        <translation>Exportar base de datos a GPX</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IExportDatabase.ui" line="22"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IExportDatabase.ui" line="33"/>
+        <source>Export Path:</source>
+        <translation>Carpeta de exportación</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IExportDatabase.ui" line="46"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IExportDatabase.ui" line="55"/>
+        <source>GPX 1.1 without extensions</source>
+        <translation>GPX 1.1 sin extensiones</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IExportDatabase.ui" line="83"/>
+        <source>Start</source>
+        <translation>Comenzar</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IExportDatabase.ui" line="93"/>
+        <source>Abort</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IExportDatabase.ui" line="100"/>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterDelete</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDelete.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDelete.ui" line="51"/>
+        <source><b>Remove Track Points</b></source>
+        <translation><b>Eliminar puntos del Track</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDelete.ui" line="63"/>
+        <source>Remove all hidden track points permanently.</source>
+        <translation>Eliminar todos los puntos ocultos del track definitivamente.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDelete.ui" line="70"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterDeleteExtension</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="51"/>
+        <source><b>Remove Extension from all Track Points</b></source>
+        <translation><b>Eliminar extensión para todos los puntos del track</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="63"/>
+        <source>Remove </source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="83"/>
+        <source>from all Track Points</source>
+        <translation>de todos los puntos del track</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="103"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterDouglasPeuker</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="45"/>
+        <source><b>Hide Points (Douglas Peuker)</b></source>
+        <translation><b>Ocultar Puntos (Douglas Peuker)</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="57"/>
+        <source>Hide track points if the distance to a line between neighboring points is less than</source>
+        <translation>Ocultar puntos del track si la distancia entre puntos vecinos en linea recta es menor que</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="70"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="93"/>
+        <source>Apply filter now.</source>
+        <translation>Aplicar filtro ahora.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterDouglasPeuker.ui" line="96"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterInterpolateElevation</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="51"/>
+        <source><b>Interpolate Elevation Data</b></source>
+        <translation><b>Interpolar datos de altitud</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="69"/>
+        <source>Replace elevation of track points with interpolated data.</source>
+        <translation>Sustituir la altitud de los puntos del track con datos interpolados.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="76"/>
+        <source>Quality</source>
+        <translation>Calidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="105"/>
+        <source>Preview</source>
+        <translation>Vista previa</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="112"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterInvalid</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterInvalid.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterInvalid.ui" line="41"/>
+        <source>Hide Invalid Points</source>
+        <translation>Ocultar puntos inválidos</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterInvalid.ui" line="56"/>
+        <source>Hide points with invalid data.</source>
+        <translation>Ocultar puntos con datos no válidos.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterInvalid.ui" line="63"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterMedian</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterMedian.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterMedian.ui" line="51"/>
+        <source><b>Smooth Profile (Median Method)</b></source>
+        <translation><b>Suavizar Perfil (Mediana)</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterMedian.ui" line="63"/>
+        <source>Smooth deviation of the track points elevation with a Median filter of size </source>
+        <translation>Suavizar el desvio de la altitud de los puntos del track con la Mediana de</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterMedian.ui" line="76"/>
+        <source>points</source>
+        <translation>puntos</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterMedian.ui" line="105"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterNewDate</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="35"/>
+        <source><b>Change Time</b></source>
+        <translation><b>Cambiar Fecha/hora</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="44"/>
+        <source>Change start of track to </source>
+        <translation>Modificar el inicio del track a </translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="51"/>
+        <source>dd.MM.yy HH:mm:ss</source>
+        <translation>dd.MM.yy HH:mm:ss</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="61"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterNewDate.ui" line="81"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterObscureDate</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="45"/>
+        <source><b>Obscure Timestamps</b></source>
+        <translation><b>Ocultar Marcas de tiempo</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="54"/>
+        <source>Increase timestamp by</source>
+        <translation>Incrementar marcas de tiempo en</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="61"/>
+        <source> sec.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="68"/>
+        <source>with each track point. 0 sec. will remove timestamps.</source>
+        <translation>con cada punto del track. ( 0 sec. eliminará las marcas de tiempo).</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterObscureDate.ui" line="88"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterOffsetElevation</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="51"/>
+        <source><b>Offset Elevation</b></source>
+        <translation><b>Desplazar altitud</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="69"/>
+        <source>Add offset of</source>
+        <translation>Añadir corrección de </translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="95"/>
+        <source>to track points elevation.</source>
+        <translation>a la altitud de los puntos del track.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="115"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterReplaceElevation</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="51"/>
+        <source><b>Replace Elevation Data</b></source>
+        <translation><b>Reemplazar Datos de altitud</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="63"/>
+        <source>Replace elevation of track points with the values from loaded DEM files.</source>
+        <translation>Reemplazar altitud de los puntos del track utilizando los valores del fichero DEM cargado.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="70"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterReset</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterReset.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterReset.ui" line="35"/>
+        <source><b>Reset Hidden Track Points</b></source>
+        <translation><b>Restaurar Puntos Ocultos del Track</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterReset.ui" line="47"/>
+        <source>Make all trackpoints visible again.</source>
+        <translation>Hacer visibles de nuevo todos los puntos del track.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterReset.ui" line="54"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterSpeed</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSpeed.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSpeed.ui" line="35"/>
+        <source><b>Change Speed</b></source>
+        <translation><b>Modificar Velocidad</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSpeed.ui" line="44"/>
+        <source>Set speed to </source>
+        <translation>Ajustar velocidad a </translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSpeed.ui" line="51"/>
+        <source> km/h</source>
+        <translation> km/h</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSpeed.ui" line="102"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterSplitSegment</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="51"/>
+        <source><html><head/><body><p><span style=" font-weight:600;">Split Segments into Tracks</span></p></body></html></source>
+        <translation><html><head/><body><p><span style=" font-weight:600;">Dividir el track en segmentos</span></p></body></html></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="63"/>
+        <source>Creates a new track for every segment within this track.</source>
+        <translation>Crear un nuevo track por cada segmento de este track.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="70"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterSubPt2Pt</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="35"/>
+        <source><b>Convert track subpoints to points</b></source>
+        <translation><b>Convertir subpuntos de track en puntos</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="47"/>
+        <source>Convert subpoints obtained from routing to ordinary track points </source>
+        <translation>Conviertir subpuntos obtenidos por el enrutamiento a puntos de track ordinarios</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="54"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFilterTerrainSlope</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="51"/>
+        <source><b>Calculate Terrain Slope</b></source>
+        <translation><b>Calcular pendiente del terreno</b></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="63"/>
+        <source>Calculate slope of the terrain based on loaded DEM files.</source>
+        <translation>Calcular pendiente del terreno en base a los DEM cargados.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="70"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IFitDecoderState</name>
+    <message>
+        <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="31"/>
+        <source>FIT decoding error: Decoder not in correct state %1 after last data byte in file.</source>
+        <translation>Error decodificando FIT: El decodificador no está en el estado correcto %1 después del último byte de datos en el archivo.</translation>
+    </message>
+    <message>
+        <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="124"/>
+        <source>FIT decoding error: a development field with the field_definition_number %1 already exists.</source>
+        <translation>Error decodificando FIT: Ya existe un campo con el número de definición %1.</translation>
+    </message>
+</context>
+<context>
+    <name>IGisDatabase</name>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="59"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="64"/>
+        <source>Age</source>
+        <translation type="unfinished">Edad</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="97"/>
+        <source>To add a database do a right click on the database list above.</source>
+        <translation type="unfinished">Para añadir una base de datos haga click-derecho en el espacio superior.  </translation>
+    </message>
+</context>
+<context>
+    <name>IGisItem</name>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="45"/>
+        <source>[no name]</source>
+        <translation>[sin nombre]</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
+        <source>The item is not part of the project in the database.</source>
+        <translation>El elemento no forma parte del proyecto en la base de datos.</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="318"/>
+        <source>
+It is either a new item or it has been deleted in the database by someone else.</source>
+        <translation>
+Es un elemento nuevo o ha sido eliminado en la base de datos por otra persona</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="324"/>
+        <source>The item is not in the database.</source>
+        <translation>El elemento no está en la base de datos</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="330"/>
+        <source>The item might need to be saved</source>
+        <translation>Es posible que deba guardar el elemento</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="414"/>
+        <source>Initial version.</source>
+        <translation>Versión inicial</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="534"/>
+        <source>Never ask again.</source>
+        <translation>No volver a preguntar</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="535"/>
+        <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
+        <translation><h3>%1</h3> Posiblemente este elemento es de sólo lectura porque no lo creó QMapShack. Por lo general no es conveniente cambiar los datos importados, pero si piensa que esta bien, presione 'Ok'.</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="536"/>
+        <source>Read Only Mode...</source>
+        <translation>Modo Sólo Lectura...</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="713"/>
+        <location filename="../gis/IGisItem.cpp" line="766"/>
+        <source><h4>Description:</h4></source>
+        <translation><h4>Descripción:</h4></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="716"/>
+        <location filename="../gis/IGisItem.cpp" line="769"/>
+        <source><p>--- no description ---</p></source>
+        <translation><p>---sin descripción---</p></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="727"/>
+        <source><h4>Comment:</h4></source>
+        <translation><h4>Comentario:</h4></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="730"/>
+        <source><p>--- no comment ---</p></source>
+        <translation><p>--- Sin comentario ---</p></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="741"/>
+        <location filename="../gis/IGisItem.cpp" line="780"/>
+        <source><h4>Links:</h4></source>
+        <translation><h4>Enlaces:</h4></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="783"/>
+        <source><p>--- no links ---</p></source>
+        <translation><p>--- sin enlaces ---</p></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
+        <source>Edit name...</source>
+        <translation>Editar nombre...</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
+        <source>Enter new %1 name.</source>
+        <translation>Introducir nuevo nombre de %1</translation>
+    </message>
+</context>
+<context>
+    <name>IGisProject</name>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
+        <source>Save project?</source>
+        <translation>¿Guardar proyecto?</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
+        <source><h3>%1</h3>The project was changed. Save before closing it?</source>
+        <translation><h3>%1</h3>Ha habido cambios en el proyecto. ¿Guardar antes de cerrar?</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="375"/>
+        <source>%1: Correlate tracks and waypoints.</source>
+        <translation>%1: Correlacionar tracks y waypoints</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="385"/>
+        <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
+        <translation><h3>%1</h3>¿Desea omitir la correlación de pistas y waypoints para este proyecto en el futuro?</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="386"/>
+        <source>Canceled correlation...</source>
+        <translation>Correlación cancelada</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="431"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="488"/>
+        <source>Save "%1" to...</source>
+        <translation>Guardar "%1" como...</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="573"/>
+        <source><br/>
+Filename: %1</source>
+        <translation><br/>
+Nombre de archivo %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="578"/>
+        <source>Waypoints: %1</source>
+        <translation>Waypoints: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="582"/>
+        <source>Tracks: %1</source>
+        <translation>Tracks: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="586"/>
+        <source>Routes: %1</source>
+        <translation>Rutas: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="590"/>
+        <source>Areas: %1</source>
+        <translation>Áreas: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="733"/>
+        <source>Are you sure you want to delete '%1' from project '%2'?</source>
+        <translation>¿Desea realmente eliminar '%1' del proyecto '%2'?</translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/IGisProject.cpp" line="734"/>
+        <source>Delete...</source>
+        <translation>Borrar...</translation>
+    </message>
+</context>
+<context>
+    <name>IGisWorkspace</name>
+    <message>
+        <location filename="../gis/IGisWorkspace.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWorkspace.ui" line="43"/>
+        <source>Opacity</source>
+        <translation type="unfinished">Opacidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWorkspace.ui" line="50"/>
+        <source>Change the opacity of all GIS Items on the map.</source>
+        <translation type="unfinished">Cambiar opacidad para todos los elementos GIS del mapa</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWorkspace.ui" line="66"/>
+        <source>Filter</source>
+        <translation type="unfinished">Filtro</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWorkspace.ui" line="116"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWorkspace.ui" line="129"/>
+        <source>Clear Filter</source>
+        <translation type="unfinished">Borrar filtro</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWorkspace.ui" line="138"/>
+        <source>Setup Filter</source>
+        <translation type="unfinished">Configurar filtro</translation>
+    </message>
+</context>
+<context>
+    <name>IGridSetup</name>
+    <message>
+        <location filename="../grid/IGridSetup.ui" line="14"/>
+        <source>Setup Grid...</source>
+        <translation>Configurar Malla...</translation>
+    </message>
+    <message>
+        <location filename="../grid/IGridSetup.ui" line="22"/>
+        <source>Projection</source>
+        <translation>Proyección</translation>
+    </message>
+    <message>
+        <location filename="../grid/IGridSetup.ui" line="37"/>
+        <source>restore default</source>
+        <translation>restaurar valores predeterminados</translation>
+    </message>
+    <message>
+        <location filename="../grid/IGridSetup.ui" line="40"/>
+        <location filename="../grid/IGridSetup.ui" line="66"/>
+        <location filename="../grid/IGridSetup.ui" line="92"/>
+        <location filename="../grid/IGridSetup.ui" line="146"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../grid/IGridSetup.ui" line="63"/>
+        <source>Get projection from current map.</source>
+        <translation>Obtener la proyección desde el mapa actual.</translation>
+    </message>
+    <message>
+        <location filename="../grid/IGridSetup.ui" line="89"/>
+        <source>projection wizzard</source>
+        <translation>asistente de proyección</translation>
+    </message>
+    <message>
+        <location filename="../grid/IGridSetup.ui" line="130"/>
+        <source>Grid color</source>
+        <translation>Color de la malla</translation>
+    </message>
+    <message>
+        <location filename="../grid/IGridSetup.ui" line="143"/>
+        <source>setup grid color</source>
+        <translation>Configurar el color de la malla</translation>
+    </message>
+</context>
+<context>
+    <name>IImportDatabase</name>
+    <message>
+        <location filename="../tool/IImportDatabase.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../tool/IImportDatabase.ui" line="45"/>
+        <source>Source Database:</source>
+        <translation>Origen de Base de datos:</translation>
+    </message>
+    <message>
+        <location filename="../tool/IImportDatabase.ui" line="52"/>
+        <location filename="../tool/IImportDatabase.ui" line="93"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../tool/IImportDatabase.ui" line="22"/>
+        <location filename="../tool/IImportDatabase.ui" line="63"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../tool/IImportDatabase.ui" line="86"/>
+        <source>Target Database:</source>
+        <translation>Destino de Base de Datos:</translation>
+    </message>
+    <message>
+        <location filename="../tool/IImportDatabase.ui" line="102"/>
+        <source>Start</source>
+        <translation>Comenzar</translation>
+    </message>
+</context>
+<context>
+    <name>IInputDialog</name>
+    <message>
+        <location filename="../helpers/IInputDialog.ui" line="14"/>
+        <source>Edit...</source>
+        <translation>Editar...</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IInputDialog.ui" line="20"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+</context>
+<context>
+    <name>ILineOp</name>
+    <message>
+        <location filename="../mouse/line/ILineOp.cpp" line="279"/>
+        <source>Routing</source>
+        <translation>Enrutamiento</translation>
+    </message>
+</context>
+<context>
+    <name>ILinksDialog</name>
+    <message>
+        <location filename="../helpers/ILinksDialog.ui" line="14"/>
+        <source>Links...</source>
+        <translation>Enlaces...</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ILinksDialog.ui" line="23"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ILinksDialog.ui" line="28"/>
+        <source>Text</source>
+        <translation>Texto</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ILinksDialog.ui" line="33"/>
+        <source>Uri</source>
+        <translation>Uri</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ILinksDialog.ui" line="43"/>
+        <location filename="../helpers/ILinksDialog.ui" line="63"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IMainWindow</name>
+    <message>
+        <location filename="../IMainWindow.ui" line="17"/>
+        <source>QMapShack</source>
+        <translation>QMapShack</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="63"/>
+        <source>File</source>
+        <translation>Archivo</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="80"/>
+        <source>View</source>
+        <translation>Ver</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="104"/>
+        <source>Window</source>
+        <translation>Ventana</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="114"/>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="133"/>
+        <source>Tool</source>
+        <translation>Herramientas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="152"/>
+        <source>Maps</source>
+        <translation>Mapas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="189"/>
+        <source>Dig. Elev. Model (DEM)</source>
+        <translatorcomment>la traducción literal "Modelo Digital del Terreno " es demasiado larga para el titulo de las pestaña, y hace que se oculten otras pestañas. Por ello  se ha sustituido por su abreviatura "MDT" de uso frecuente, y también empleada por el IGN</translatorcomment>
+        <translation>MDT (DEM)</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="231"/>
+        <source>Toolbar</source>
+        <translation>Barra de herramientas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="257"/>
+        <source>Routing</source>
+        <translation type="unfinished">Enrutamiento</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="276"/>
+        <location filename="../IMainWindow.ui" line="279"/>
+        <source>Add Map View</source>
+        <translation>Añadir Vista de Mapa</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="282"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="297"/>
+        <source>Show Scale</source>
+        <translation>Mostrar Escala</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="309"/>
+        <source>Setup Map Font</source>
+        <translation>Configurar Fuente del Mapa</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="324"/>
+        <source>Show Grid</source>
+        <translation>Mostrar Malla</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="327"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="339"/>
+        <source>Setup Grid</source>
+        <translation>Configurar Malla</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="342"/>
+        <source>Ctrl+Alt+G</source>
+        <translation>Ctrl+Alt+G</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="357"/>
+        <source>Flip Mouse Wheel</source>
+        <translation>Invertir la Rueda del Ratón</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="372"/>
+        <source>Setup Map Paths</source>
+        <translation>Configurar Rutas de Mapas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="387"/>
+        <source>POI Text</source>
+        <translation>Texto del POI</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="402"/>
+        <source>Night / Day</source>
+        <translation>Noche / Día</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="417"/>
+        <source>Map Tool Tip</source>
+        <translation>Mostrar descripción emergente en los Mapas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="420"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="432"/>
+        <source>Setup DEM Paths</source>
+        <translation>Configurar Rutas a los DEM</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="444"/>
+        <source>About</source>
+        <translation>Acerca de</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="456"/>
+        <source>Help</source>
+        <translation>Ayuda</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="459"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="474"/>
+        <source>Setup Map View</source>
+        <translation>Configurar Vista de Mapa</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="618"/>
+        <source>VRT Builder</source>
+        <translation>Asistente VRT</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="621"/>
+        <source>GUI front end to gdalbuildvrt</source>
+        <translation>GUI front end para gdalbuildvrt</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="633"/>
+        <source>Store Map View</source>
+        <translation>Guardar vista de mapa</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="636"/>
+        <source>Write current active map and DEM list including the properties to a file</source>
+        <translation>Guardar en un archivo el mapa activo actual y la lista de DEM's incluyendo sus propiedades</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="648"/>
+        <source>Load Map View</source>
+        <translation>Cargar vista de mapa</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="651"/>
+        <source>Restore view with active map and DEM list including the properties from a file</source>
+        <translation>Restaurar vista de mapa activo y lista de DEM's incluyendo sus propiedades desde un archivo</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="666"/>
+        <source>Ext. Profile</source>
+        <translation>Perfil en ventana externa</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="669"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="681"/>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="684"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="696"/>
+        <source>Clone Map View</source>
+        <translation>Duplicar vista de mapa</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="699"/>
+        <source>Ctrl+Shift+T</source>
+        <translation>Ctrl+Shift+T</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="711"/>
+        <source>Create Routino Database</source>
+        <translation>Crear base de datos de Routino</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="723"/>
+        <source>Save(Print) Map Screenshot</source>
+        <translation>Guardar/Imprimir captura de pantalla de mapa</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="726"/>
+        <source>Print a selected area of the map</source>
+        <translation>Imprimir area seleccionada del mapa</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="729"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="741"/>
+        <source>Setup Coord. Format</source>
+        <translation>Configurar formato de coordenadas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="744"/>
+        <source>Change the format coordinates are displayed</source>
+        <translation>Cambiar el formato de coordenadas que se muestran</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="756"/>
+        <source>Setup Map Background</source>
+        <translation>Configuración del Mapa de Fondo</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="768"/>
+        <source>Setup Waypoint Icons</source>
+        <translation>Configurar Iconos de Waypoint</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="771"/>
+        <source>Setup path to custom icons</source>
+        <translation>Configurar ruta de iconos personalizados</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="780"/>
+        <source>Close Tab</source>
+        <translation>Cerrar pestaña</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="783"/>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="792"/>
+        <source>Quickstart Help</source>
+        <translation>Guia de inicio rápido</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="801"/>
+        <source>Setup Toolbar</source>
+        <translation>Configurar barra de herramientas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="813"/>
+        <source>Toggle Docks</source>
+        <translation>Panel de herramientas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="816"/>
+        <source>Toggle visibility of dockable windows</source>
+        <translation>Ver panel de herramientas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="819"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="828"/>
+        <source>Full Screen</source>
+        <translation>Pantalla Completa</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="831"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="843"/>
+        <source>Min./Max. Track Values</source>
+        <translation>Valores Máx/min del track</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="846"/>
+        <source>Show the minimum and maximum values of the track properties along the track in the map view.</source>
+        <translation>En la vista del mapa mostrar superpuestos los valores máximo y mínimo de los datos del track</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="849"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="245"/>
+        <source>Database</source>
+        <translation type="unfinished">Base de datos</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="122"/>
+        <location filename="../IMainWindow.ui" line="222"/>
+        <source>Workspace</source>
+        <translation>Espacio de trabajo</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="486"/>
+        <source>Load GIS Data</source>
+        <translation>Cargar Datos GIS</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="489"/>
+        <source>Load projects from file</source>
+        <translation>Cargar proyectos desde archivo</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="492"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="504"/>
+        <source>Save All GIS Data</source>
+        <translation>Guardar todos los Datos GIS</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="507"/>
+        <source>Save all projects in the workspace</source>
+        <translation>Guardar todos los proyectos del espacio de trabajo</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="510"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="522"/>
+        <source>Setup Time Zone</source>
+        <translation>Configurar Zona Horaria</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="534"/>
+        <source>Add empty project</source>
+        <translation>Añadir proyecto vacío</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="549"/>
+        <source>Search Google</source>
+        <translation>Buscar en Google</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="561"/>
+        <source>Close all projects</source>
+        <translation>Cerrar todos los proyectos</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="564"/>
+        <source>F8</source>
+        <translation>F8</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="576"/>
+        <source>Setup Units</source>
+        <translation>Configurar Unidades</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="588"/>
+        <source>Setup Workspace</source>
+        <translation>Configurar Espacio de trabajo</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="591"/>
+        <source>Setup save on exit.</source>
+        <translation>Guardar configuración al salir.</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="603"/>
+        <source>Import Database from QLandkarte</source>
+        <translation>Importar base de datos de Qlandkarte</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="606"/>
+        <source>Import QLandkarte GT database</source>
+        <translation>Importar base de datos de QLandKarteGT</translation>
+    </message>
+</context>
+<context>
+    <name>IMapList</name>
+    <message>
+        <location filename="../map/IMapList.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapList.ui" line="103"/>
+        <source>To add maps use <b>File->Setup Map Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
+        <translation>Para añadir mapas haga<b>Archivo->Configurar rutas de mapas</b>.  O haga clic <a href='setup'><b>aqui</b></a></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapList.ui" line="116"/>
+        <source>Use the context menu (right mouse button click on entry) to activate a map. Use drag-n-drop to move the activated map in the draw order. </source>
+        <translation>Use el menú contextual (botón derecho del ratón, y seleccione) para activar un mapa. Use arrastrar y soltar para mover el mapa activado en el orden de dibujado. </translation>
+    </message>
+    <message>
+        <location filename="../map/IMapList.ui" line="129"/>
+        <source>Help! I want maps!
+I don't want to read the documentation!</source>
+        <translation>Quiero mapas
+No quiero leer la documentación!</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapList.ui" line="149"/>
+        <source>Activate</source>
+        <translation>Activar</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapList.ui" line="158"/>
+        <source>Move Up</source>
+        <translation>Subir</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapList.ui" line="161"/>
+        <source>Hide map behind previous map</source>
+        <translation>Ocultar mapa detrás del anterior</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapList.ui" line="170"/>
+        <source>Move down</source>
+        <translation>Bajar</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapList.ui" line="173"/>
+        <source>Show map on top of next map</source>
+        <translation>Mostrar mapa encima del siguiente</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapList.ui" line="182"/>
+        <source>Reload Maps</source>
+        <translation>Recargar mapas</translation>
+    </message>
+</context>
+<context>
+    <name>IMapOnline</name>
+    <message>
+        <location filename="../map/IMapOnline.cpp" line="41"/>
+        <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
+        <translation>Este mapa requiere soporte de OpenSSL. Sin embargo, debido a restricciones legales en algunos países, OpenSSL no se incluye con QMapShack. Puede consultar la página < a href = < https: //www.openssl.org/community/binaries.html '> OpenSSL Homepage</a> Para binarios. Tienes que copiar libeay32.dll y ssleay32.dll en el directorio del programa QMapShack.</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapOnline.cpp" line="47"/>
+        <source>Error...</source>
+        <translation>Error...</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapOnline.cpp" line="98"/>
+        <source><b>%1</b>: %2 tiles pending<br/></source>
+        <translation><b>%1</b>: %2 teselas pendientes<br/></translation>
+    </message>
+</context>
+<context>
+    <name>IMapPathSetup</name>
+    <message>
+        <location filename="../map/IMapPathSetup.ui" line="14"/>
+        <source>Setup map paths</source>
+        <translation>Configurar rutas de mapas</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPathSetup.ui" line="20"/>
+        <source>Root path of tile cache for online maps:</source>
+        <translation>Carpeta para la caché de mapas online</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPathSetup.ui" line="36"/>
+        <location filename="../map/IMapPathSetup.ui" line="73"/>
+        <location filename="../map/IMapPathSetup.ui" line="93"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPathSetup.ui" line="185"/>
+        <source>Help! I want maps!
+I don't want to read the documentation!</source>
+        <translation>¡Quiero mapas!
+¡No quiero ver la documentación!</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPathSetup.ui" line="29"/>
+        <location filename="../map/IMapPathSetup.ui" line="154"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+</context>
+<context>
+    <name>IMapPropSetup</name>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="35"/>
+        <source><html><head/><body><p>Change opacity of map</p></body></html></source>
+        <translation><html><head/><body><p>Cambiar la opacidad del mapa</p></body></html></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="50"/>
+        <source><html><head/><body><p>Click to use current scale as minimum scale to display the map.</p></body></html></source>
+        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala mínima a la que mostrar el mapa.</p></body></html></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="53"/>
+        <location filename="../map/IMapPropSetup.ui" line="90"/>
+        <location filename="../map/IMapPropSetup.ui" line="370"/>
+        <location filename="../map/IMapPropSetup.ui" line="384"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="74"/>
+        <source><html><head/><body><p>Control the range of scale the map is displayed. Use the two buttons left and right to define the actual scale as either minimum or maximum scale.</p></body></html></source>
+        <translation><html><head/><body><p>Controle el rango de escalas para las cuales desea que se muestre el mapa. Use los dos botones a izquierda y derecha para definir la escala actual como bien la escala mínima o máxima para el mapa.</p></body></html></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="87"/>
+        <source><html><head/><body><p>Click to use current scale as maximum scale to display the map.</p></body></html></source>
+        <translation><html><head/><body><p>Pulse para usar la escala actual como la escala máxima a la que mostrar el mapa.</p></body></html></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="139"/>
+        <source>Areas</source>
+        <translation>Áreas</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="146"/>
+        <source>Lines</source>
+        <translation>Líneas</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="153"/>
+        <source>Points</source>
+        <translation>Puntos</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="170"/>
+        <source>Details</source>
+        <translation>Detalle</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="264"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="271"/>
+        <source>Cache Path</source>
+        <translation>Carpeta Caché</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="353"/>
+        <source>Type File:</source>
+        <translation>Archivo TYP:</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="367"/>
+        <source>Forget external type file and use internal types.</source>
+        <translation>Olvidar TYP externo y utilizar el interno.</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="381"/>
+        <source>Load an external type file.</source>
+        <translation>Cargar un archivo TYP externo.</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="227"/>
+        <source>Cache Size (MB)</source>
+        <translation>Tamaño de Caché (MiB)</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="247"/>
+        <source>Expiration (Days)</source>
+        <translation>Caducidad (Días)</translation>
+    </message>
+</context>
+<context>
+    <name>IMapVrtBuilder</name>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
+        <source>Advanced Options</source>
+        <translation>Opciones Avanzadas</translation>
+    </message>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+        <source>Source No Data (-srcnodata)</source>
+        <translation>No Data origen (-srcnodata)</translation>
+    </message>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="46"/>
+        <source>Target No Data (-vrtnodata)</source>
+        <translation>No Data salida  (-vrtnodata)</translation>
+    </message>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="56"/>
+        <source>Target Projection (-a_srs)</source>
+        <translation>Proyección/Datum (-a_srs)</translation>
+    </message>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="63"/>
+        <source>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</source>
+        <translation>Estas opciones son para casos particulares y normalmente se dejan en blanco. Consulta la <a href='http://www.gdal.org/gdalbuildvrt.html'>ayuda</a> de GDAL para más información.</translation>
+    </message>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
+        <source><ol>
+<li>Select one or multiple source files.</li>
+<li>Select a file name for the target VRT file.</li>
+<li>Press "Start" button.</li>
+</ol>
+
+Tip:
+<ul>
+<li>If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.</li>
+<li>Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.</li>
+<li>The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</li>
+</ul></source>
+        <translation><ol>
+<li>Seleccione uno o varios archivos.</li>
+<li>Seleccione un nombre de archivo para el archivo VRT de destino.</li>
+<li>Pulse  botón</li>"Comenzar".
+</ol>
+
+Consejos:
+<ul>
+<li>Si tiene varios archivos, colóquelos en una subcarpeta de su carpeta de mapas. Cree el archivo VRT en su carpeta de mapas</li>
+<li>Utilice las opciones avanzadas para añadir un valor de "sin datos"  si sus archivos de origen no lo tiene y no forman un área rectangular. Las áreas sin mapa se volverán transparentes.</li>
+<li>La opción "-a_srs"  está destinada a asignar una Proyección / Datum cuando el archivo de origen no lo tiene. Esto NO reproyecta los datos.</li>
+</ul></translation>
+    </message>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
+        <location filename="../tool/IMapVrtBuilder.ui" line="139"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="156"/>
+        <source>Select source files:</source>
+        <translation>Seleccionar ficheros de origen:</translation>
+    </message>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="121"/>
+        <source>Target Filename:</source>
+        <translation>Fichero VRT de salida:</translation>
+    </message>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="128"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../tool/IMapVrtBuilder.ui" line="20"/>
+        <source>Start</source>
+        <translation>Comenzar</translation>
+    </message>
+</context>
+<context>
+    <name>IMouseEditLine</name>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="249"/>
+        <source><b>New Line</b><br/>Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.<br/></source>
+        <translation><b>Nuevo trazado</b><br/>Mueva el ratón y pulse el botón izquierdo para crear puntos. Puede alternar el modo de dibujo con los botones de herraminetas (O,A,V) sin interrumpir el trazado. Para terminar pulse botón derecho del ratón.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="300"/>
+        <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
+        <translation><b>Borrar punto</b><br/>Mueva el ratón hasta un punto y pulse el botón izquierdo para eliminarlo.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="308"/>
+        <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
+        <translation><b>Seleccionar Rango de Puntos</b><br/>Seleccione el punto inicial con el botón izquierdo del raton. Fije el punto final con una segunda pulsacion y elija entre las opciones. El rango seleccionado se marca en verde. Utilice el botón derecho del ratón para cancelar.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="316"/>
+        <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
+        <translation><b>Mover punto</b><br/>Seleccione el punto con el botón izquierdo del raton y arrastrelo hasta la nueva posición. Suelte el punto con una segunda pulsacion. Utilice el botón derecho del ratón para cancelar.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
+        <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
+        <translation><b>Añadir punto</b><br/>Mueva el ratón cerca de una línea y presione el botón izquierdo para agregar un punto. El punto se pegará al cursor y se puede mover.Suelte el punto en la posición deseada con una segunda pulsacion. Utilice el botón derecho del ratón para cancelar..<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
+        <translation><b>Sin enrutamiento ni ajuste vectorial</b><br/>Todos los puntos se conectarán con una línea recta.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
+        <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
+        <translation><b>Enrutamiento automático</b><br/>El trazado entre los puntos se calcula automáticamente atendiendo a la configuración actual del enrutador. <b>Nota:</b> El enrutador seleccionado debe ser capaz de trabajar al vuelo,por lo general, solo son capaces de hacerlo los instalados localmente.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="343"/>
+        <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
+        <translation><b>Ajuste vectorial</b><br/> El trazado se dibuja ajustandose automáticamente a las lineas de un mapa vectorial.<br/></translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="515"/>
+        <source><b>%1 Metrics</b></source>
+        <translation><b>Datos %1 </b></translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="518"/>
+        <source>Distance:</source>
+        <translation>Distancia:</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="520"/>
+        <source>Ascent:</source>
+        <translation>Ascenso:</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="522"/>
+        <source>Descent:</source>
+        <translation>Descenso:</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IMouseEditLine.h" line="137"/>
+        <source><br/><b>Move the map</b><br/>If you keep the left mouse button pressed and move the mouse, you will move the map.<br/><br/></source>
+        <translation><br/><b>Mover el mapa</b><br/>Mantega pulsado el botón izquierdo mientras mueve el ratón y moverá el mapa.<br/><br/></translation>
+    </message>
+</context>
+<context>
+    <name>IPhotoAlbum</name>
+    <message>
+        <location filename="../widgets/IPhotoAlbum.ui" line="20"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/IPhotoAlbum.ui" line="50"/>
+        <location filename="../widgets/IPhotoAlbum.ui" line="77"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>IPlot</name>
+    <message>
+        <location filename="../plot/IPlot.cpp" line="94"/>
+        <source>Reset Zoom</source>
+        <translation>Restablecer zoom</translation>
+    </message>
+    <message>
+        <location filename="../plot/IPlot.cpp" line="95"/>
+        <source>Stop Range</source>
+        <translation>Rango de parada</translation>
+    </message>
+    <message>
+        <location filename="../plot/IPlot.cpp" line="96"/>
+        <source>Save...</source>
+        <translation>Guardar...</translation>
+    </message>
+    <message>
+        <location filename="../plot/IPlot.cpp" line="98"/>
+        <source>Add Waypoint</source>
+        <translation>Añadir Waypoint</translation>
+    </message>
+    <message>
+        <location filename="../plot/IPlot.cpp" line="99"/>
+        <source>Cut...</source>
+        <translation>Cortar.</translation>
+    </message>
+    <message>
+        <location filename="../plot/IPlot.cpp" line="542"/>
+        <source>Hold CTRL key for vertical zoom, only.
+Hold ALT key for horizontal zoom, only.</source>
+        <translation>Pulse tecla CTRL para zoom vertical unicamente.
+Pulse tecla ALT para zoom horizontal unicamente</translation>
+    </message>
+    <message>
+        <location filename="../plot/IPlot.cpp" line="697"/>
+        <source>No or bad data.</source>
+        <translation>Datos incorrectos o inexistentes.</translation>
+    </message>
+    <message>
+        <location filename="../plot/IPlot.cpp" line="1298"/>
+        <source>Select output file</source>
+        <translation>Seleccione archivo de salida</translation>
+    </message>
+</context>
+<context>
+    <name>IPositionDialog</name>
+    <message>
+        <location filename="../helpers/IPositionDialog.ui" line="14"/>
+        <source>Position ...</source>
+        <translation>Posición ...</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IPositionDialog.ui" line="20"/>
+        <source>Enter new position</source>
+        <translation>Introduzca la nueva posición</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IPositionDialog.ui" line="30"/>
+        <source>Bad position format. Must be: 
+"[N|S] ddd mm.sss [W|E] ddd mm.sss"
+or
+"[N|S] ddd.ddd [W|E] ddd.ddd"</source>
+        <translation>Formato de posición incorrecto. Debe ser: 
+"[N|S] ggg mm.sss [W|E] ggg mm.sss"
+o
+"[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
+    </message>
+</context>
+<context>
+    <name>IPrintDialog</name>
+    <message>
+        <location filename="../print/IPrintDialog.ui" line="20"/>
+        <source>Print map...</source>
+        <translation>Imprimir mapa...</translation>
+    </message>
+    <message>
+        <location filename="../print/IPrintDialog.ui" line="79"/>
+        <source>When printing online maps make sure that the map has been loaded into the cache for the extent to be printed.</source>
+        <translation>Al imprimir mapas en línea asegúrese de que se haya cargado previamente en la memoria caché el mapa correspondiente a la extensión que desea imprimir.</translation>
+    </message>
+    <message>
+        <location filename="../print/IPrintDialog.ui" line="60"/>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <location filename="../print/IPrintDialog.ui" line="37"/>
+        <source>When saving online maps make sure that the map has been loaded into the cache for the extent to be saved.</source>
+        <translation>Al guardar mapas en línea asegúrese de que el mapa se ha cargado en la memoria caché en la medida en la que desea guardarlo.</translation>
+    </message>
+    <message>
+        <location filename="../print/IPrintDialog.ui" line="89"/>
+        <location filename="../print/IPrintDialog.ui" line="102"/>
+        <location filename="../print/IPrintDialog.ui" line="151"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+    <message>
+        <location filename="../print/IPrintDialog.ui" line="118"/>
+        <source>Print</source>
+        <translation>Imprimir</translation>
+    </message>
+</context>
+<context>
+    <name>IProgressDialog</name>
+    <message>
+        <location filename="../helpers/IProgressDialog.ui" line="14"/>
+        <source>Please wait...</source>
+        <translation>Por favor,espere...</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IProgressDialog.ui" line="20"/>
+        <location filename="../helpers/IProgressDialog.ui" line="27"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+</context>
+<context>
+    <name>IProjWizard</name>
+    <message>
+        <location filename="../grid/IProjWizard.ui" line="14"/>
+        <source>Proj4 Wizzard</source>
+        <translation>Asistente de Proj4</translation>
+    </message>
+    <message>
+        <location filename="../grid/IProjWizard.ui" line="29"/>
+        <source>Mercator</source>
+        <translation>Mercator</translation>
+    </message>
+    <message>
+        <location filename="../grid/IProjWizard.ui" line="38"/>
+        <source>UTM</source>
+        <translation>UTM</translation>
+    </message>
+    <message>
+        <location filename="../grid/IProjWizard.ui" line="45"/>
+        <source>zone</source>
+        <translation>zona</translation>
+    </message>
+    <message>
+        <location filename="../grid/IProjWizard.ui" line="82"/>
+        <source>user defined</source>
+        <translation>definido por el usuario</translation>
+    </message>
+    <message>
+        <location filename="../grid/IProjWizard.ui" line="94"/>
+        <source>Datum</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../grid/IProjWizard.ui" line="104"/>
+        <source>World Mercator (OSM)</source>
+        <translation>World Mercator (OSM)</translation>
+    </message>
+    <message>
+        <location filename="../grid/IProjWizard.ui" line="124"/>
+        <source>Result:</source>
+        <translation>Resultado:</translation>
+    </message>
+    <message>
+        <location filename="../grid/IProjWizard.ui" line="138"/>
+        <source>UPS North (North Pole)</source>
+        <translation>UPS Norte (Polo Norte)</translation>
+    </message>
+    <message>
+        <location filename="../grid/IProjWizard.ui" line="145"/>
+        <source>UPS South (South Pole)</source>
+        <translation>UPS Sur (Polo Sur)</translation>
+    </message>
+    <message>
+        <location filename="../grid/IProjWizard.ui" line="152"/>
+        <source>Projection</source>
+        <translation>Proyección</translation>
+    </message>
+</context>
+<context>
+    <name>IProjWpt</name>
+    <message>
+        <location filename="../gis/wpt/IProjWpt.ui" line="14"/>
+        <source>Waypoint Projection</source>
+        <translation>Proyección del Waypoint</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IProjWpt.ui" line="22"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IProjWpt.ui" line="45"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IProjWpt.ui" line="54"/>
+        <source>Clone waypoint and move by:</source>
+        <translation>Duplicar el waypoint y moverlo:</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IProjWpt.ui" line="66"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IProjWpt.ui" line="76"/>
+        <source>°</source>
+        <translation>º</translation>
+    </message>
+</context>
+<context>
+    <name>IRouterBRouter</name>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
+        <source>Profile</source>
+        <translation>Perfil</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
+        <source>Alternative</source>
+        <translation>Alternativa</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
+        <source>display selected routing profile</source>
+        <translation>Mostrar el perfil de enrutamiento seleccionado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="67"/>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="128"/>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="142"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
+        <source>on-the-fly routing</source>
+        <translation>Enrutamiento al vuelo</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
+        <source>BRouter: </source>
+        <translation>BRouter: </translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
+        <source>not running</source>
+        <translation>Parado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
+        <source>start/stop BRouter</source>
+        <translation>iniciar/parar Brouter</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
+        <source>show BRouter console</source>
+        <translation>Mostrar consola de BRouter</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
+        <source>Setup</source>
+        <translation>Configuración</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="181"/>
+        <source>Caution! BRouter is listening on all ports for connections.</source>
+        <translation>¡Precaución! BRouter está escuchando en todos los puertos para las conexiones.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="217"/>
+        <source><p><a href="http://brouter.de/brouter/" target="_blank">BRouter</a> © <a href="https://github.com/abrensch/brouter/blob/master/LICENSE" target="_blank">ABrensch, Licence GPLv3</a></p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="227"/>
+        <source><p>Directions Courtesy of <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></source>
+        <translation><p>Direcciones de <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="237"/>
+        <source><p>Routing data <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a> contributors</p></source>
+        <translation><p>Enrutamiento de <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a></p></translation>
+    </message>
+</context>
+<context>
+    <name>IRouterBRouterInfo</name>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
+        <source>BRouter Profile</source>
+        <translation>Perfil de BRouter</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+</context>
+<context>
+    <name>IRouterBRouterSetupWizard</name>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
+        <source>BRouter Setup</source>
+        <translation>Configuración de BRouter</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="48"/>
+        <source>choose which BRouter to use</source>
+        <translation>Elija que BRouter usar</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
+        <source>BRouter-Web (online)</source>
+        <translation>BRouter-Web (online)</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
+        <source>local Installation</source>
+        <translation>Instalación local</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
+        <source>Expert Mode</source>
+        <translation>Modo experto</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
+        <source>local BRouter Installation directory:</source>
+        <translation>Carpeta de instalación de BRouter local:</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
+        <source>select installation directory</source>
+        <translation>Seleccionar carpeta de instalación</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="162"/>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="342"/>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="356"/>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="389"/>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="400"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="119"/>
+        <source>labelLocalDirResult</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
+        <source>create or update installation</source>
+        <translation>Crear o actualizar instalacion</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
+        <source>Java Executable</source>
+        <translation>Ejecutable Java</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
+        <source>labelLocalJavaResult</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
+        <source>search for installed java</source>
+        <translation>Buscando Java instalado</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="241"/>
+        <source>Download and install BRouter Version</source>
+        <translation>Descargar e instalar BRouter</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
+        <source>about:blank</source>
+        <translation>about:blank</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
+        <source>File to install</source>
+        <translation>Archivo para instalar</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
+        <source>Download and Install</source>
+        <translation>Descargar e instalar</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
+        <source>available Profiles</source>
+        <translation>Perfiles disponibles </translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
+        <source>install profile</source>
+        <translation>Instalar perfil</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
+        <source>remove profile</source>
+        <translation>Eliminar perfil</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
+        <source>installed Profiles</source>
+        <translation>Perfiles instalados</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
+        <source>content of profile</source>
+        <translation>Contenido del perfil</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
+        <source>BRouter-Web URL:</source>
+        <translation>BRouter-Web URL:</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
+        <source>Service-URL</source>
+        <translation>Servicio-URL</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
+        <source>Profile-URL</source>
+        <translation>Perfil-URL</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
+        <source>Hostname</source>
+        <translation>Nombre de Host</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
+        <source>Port</source>
+        <translation>Puerto</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
+        <source>Profile directory</source>
+        <translation>Carpeta de perfiles</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
+        <source>Segments directory</source>
+        <translation>Carpeta de segmentos</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
+        <source>Custom Profiles dir</source>
+        <translation>Carpeta de perfiles personalizados</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
+        <source>Max Runtime</source>
+        <translation>Tiempo máximo de ejecución </translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="621"/>
+        <source>Number Threads</source>
+        <translation>Número de hilos</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
+        <source>Java Options</source>
+        <translation>Opciones de Java</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
+        <source>Profiles Url</source>
+        <translation>URL de perfiles</translation>
+    </message>
+</context>
+<context>
+    <name>IRouterMapQuest</name>
+    <message>
+        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="22"/>
+        <source>Highways</source>
+        <translation>Autopistas</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="29"/>
+        <source>Seasonal</source>
+        <translation>Estacional</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="36"/>
+        <source>Language</source>
+        <translation>Lenguaje</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="43"/>
+        <source>Country Border</source>
+        <translation>Fronteras</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="53"/>
+        <source>Profile</source>
+        <translation>Perfil</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="60"/>
+        <source>Avoid:</source>
+        <translation>Evitar:</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="67"/>
+        <source>Ferry</source>
+        <translation>Ferry</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="74"/>
+        <source>Toll Road</source>
+        <translation>Carreteras de peaje</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="84"/>
+        <source>Unpaved</source>
+        <translation>Sin pavimentar</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterMapQuest.ui" line="106"/>
+        <source><p>Directions Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> </p></source>
+        <translation><p>Direcciones cortesía de <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> </p></translation>
+    </message>
+</context>
+<context>
+    <name>IRouterRoutino</name>
+    <message>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="31"/>
+        <source>Profile</source>
+        <translation>Perfil</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="38"/>
+        <source>Mode</source>
+        <translation>Modo</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="45"/>
+        <source>Database</source>
+        <translation>Base de datos</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="52"/>
+        <source>Add paths with Routino database.</source>
+        <translation>Añadir carpeta con base de datos de Routino.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="55"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="66"/>
+        <source>Language</source>
+        <translation>Lenguaje</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="118"/>
+        <source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path. You can create your own routing data with <b>Tool->Create Routino Database</b>.</source>
+        <translation>Para utilizar el enrutamiento sin conexión es necesario definir rutas de acceso a los datos de enrutamiento locales. Utilice el botón de la herramienta de configuración para indicar una carpeta. Puede crear sus propios datos de enrutamiento con la  <b>herramienta->Crear base de datos de Routino</b>.</translation>
+    </message>
+</context>
+<context>
+    <name>IRouterRoutinoPathSetup</name>
+    <message>
+        <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
+        <source>Setup Routino database...</source>
+        <translation>Configurar base de datos de Routino...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="27"/>
+        <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="47"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="99"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+</context>
+<context>
+    <name>IRouterSetup</name>
+    <message>
+        <location filename="../gis/rte/router/IRouterSetup.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRoutinoDatabaseBuilder</name>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="25"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="63"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="42"/>
+        <source>Select source files:</source>
+        <translation>Seleccionar ficheros de origen:</translation>
+    </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="54"/>
+        <source>Start</source>
+        <translation>Comenzar</translation>
+    </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="86"/>
+        <source>Target Path:</source>
+        <translation>Carpeta de destino:</translation>
+    </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="93"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="100"/>
+        <source>File Prefix</source>
+        <translation>Prefijo del archivo</translation>
+    </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="133"/>
+        <source><p>To create a Routino routing database you need to download *pbf files from <a href='http://download.geofabrik.de/'>GeoFabrik</a>. The process of creating a Routino database is quite slow and the resulting files quite large. Therefore it's recommended not to download whole continents. Limit your download to those countries you really need. However as Routino can't route over several databases you have to include all countries that ar [...]
+
+<ol>
+<li>Select one or multiple source *.pbf files.</li>
+<li>Select a path for your Routino database.</li>
+<li>Select a prefix. The database will be listed by this prefix.</li>
+<li>Press "Start" button.</li>
+</ol></source>
+        <translation><p>Para crear una base de atos de Routino se necesita descargar archivos *.pbf de <a href='http://download.geofabrik.de/'>GeoFabrik</a>. El proceso de creación de una base de datos Routino es bastante lento y los archivos resultantes son bastante grandes. Por lo tanto, se recomienda no descargar continentes completos. Limite su descarga a los países que realmente necesita. Sin embargo, como Routino puede crear una ruta usando varias bases  [...]
+
+<ol>
+<li>Seleccione uno o varios archivos *.pbf.</li>
+<li>Seleccione la carpeta para su base de datos de Routino.</li>
+<li>Seleccione un prefijo. La base de datos será listada por este prefijo.</li>
+<li>Presione  botón </li>"Comenzar".
+</ol></translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptEditLine</name>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="32"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="40"/>
+        <source>Save to original</source>
+        <translation>Guardar al original</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="47"/>
+        <source>Save as new</source>
+        <translation>Guardar como nuevo...</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="54"/>
+        <source>Abort</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="89"/>
+        <source>Move points. (Ctrl+M)</source>
+        <translation>Mover puntos. (Ctrl+M)</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="99"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="115"/>
+        <source>Add new points. (Ctrl++)</source>
+        <translation>Añadir puntos. (Ctrl++)</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="125"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="138"/>
+        <source>Select a range of points. (Ctrl+R)</source>
+        <translation>Seleccionar rango de puntos. (Ctrl+R)</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="148"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="215"/>
+        <source>No auto-routing or line snapping (Ctrl+O)</source>
+        <translation>Dibuja libremente. Sin enrutamiento automático ni ajuste vectorial (Ctrl + O)</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="225"/>
+        <source>Ctrl+O</source>
+        <translation>Ctrl+O</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="238"/>
+        <source>Use auto-routing to between points. (Ctrl+A)</source>
+        <translation>Dibuja usando el enrutamiento automático entre puntos. (Ctrl+A)</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="248"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="261"/>
+        <source>Snap line along lines of a vector map. (Ctrl+V)</source>
+        <translation>Dibuja ajustandose a las lineas de un mapa vectorial. (Ctrl+V)</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="92"/>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="118"/>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="141"/>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="164"/>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="300"/>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="317"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
+        <source>Delete a point. (Ctrl+-)</source>
+        <translation>Borrar un punto. (Ctrl+-)</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
+        <source>Ctrl+-</source>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="241"/>
+        <source>A</source>
+        <translation>A</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="264"/>
+        <source>V</source>
+        <translation>V</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="271"/>
+        <source>Ctrl+V</source>
+        <translation>Ctrl+V</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="297"/>
+        <source>Undo last change</source>
+        <translation>Deshacer</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptEditLine.ui" line="314"/>
+        <source>Redo last change</source>
+        <translation>Rehacer</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptOvlArea</name>
+    <message>
+        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="40"/>
+        <source>View details and edit.</source>
+        <translation>Ver detalles y editar.</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="43"/>
+        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="57"/>
+        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="71"/>
+        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="92"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="54"/>
+        <source>Copy area into another project.</source>
+        <translation>Copiar área en otro proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="68"/>
+        <source>Delete area from project.</source>
+        <translation>Eliminar área de este proyecto</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="89"/>
+        <source>Edit shape of the area.</source>
+        <translation>Editar el contorno del área.</translation>
+    </message>
+    <message>
+        <location filename="../gis/ovl/IScrOptOvlArea.ui" line="121"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptPrint</name>
+    <message>
+        <location filename="../mouse/IScrOptPrint.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptPrint.ui" line="35"/>
+        <source>Save selected area as image.</source>
+        <translation>Guardar el área seleccionada como imagen.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptPrint.ui" line="38"/>
+        <location filename="../mouse/IScrOptPrint.ui" line="58"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptPrint.ui" line="55"/>
+        <source>Print selected area.</source>
+        <translation>Imprimir área seleccionada.</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptRangeLine</name>
+    <message>
+        <location filename="../mouse/line/IScrOptRangeLine.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptRangeLine.ui" line="32"/>
+        <source>Delete all points between the first and last one.</source>
+        <translation>Borre todos los puntos entre el primero y el último.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptRangeLine.ui" line="35"/>
+        <location filename="../mouse/line/IScrOptRangeLine.ui" line="49"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../mouse/line/IScrOptRangeLine.ui" line="46"/>
+        <source><html><head/><body><p>Calculate a route between the first and last selected point.</p></body></html></source>
+        <translation><html><head/><body><p>Calcular una ruta entre el primero y el último punto seleccionado.</p></body></html></translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptRangeTrk</name>
+    <message>
+        <location filename="../mouse/IScrOptRangeTrk.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptRangeTrk.ui" line="40"/>
+        <source>Hide all points.</source>
+        <translation>Ocultar todos los puntos.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptRangeTrk.ui" line="43"/>
+        <location filename="../mouse/IScrOptRangeTrk.ui" line="57"/>
+        <location filename="../mouse/IScrOptRangeTrk.ui" line="71"/>
+        <location filename="../mouse/IScrOptRangeTrk.ui" line="85"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptRangeTrk.ui" line="54"/>
+        <source>Show all points.</source>
+        <translation>Mostrar todos los puntos.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
+        <source>Set an activity for the selected range.</source>
+        <translation>Asigna una Actividad para el rango seleccionado.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
+        <source>Copy track points as new track.</source>
+        <translation>Copiar los puntos del track como un nuevo track.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptRangeTrk.ui" line="117"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptRte</name>
+    <message>
+        <location filename="../gis/rte/IScrOptRte.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IScrOptRte.ui" line="43"/>
+        <location filename="../gis/rte/IScrOptRte.ui" line="57"/>
+        <location filename="../gis/rte/IScrOptRte.ui" line="71"/>
+        <location filename="../gis/rte/IScrOptRte.ui" line="89"/>
+        <location filename="../gis/rte/IScrOptRte.ui" line="106"/>
+        <location filename="../gis/rte/IScrOptRte.ui" line="120"/>
+        <location filename="../gis/rte/IScrOptRte.ui" line="134"/>
+        <location filename="../gis/rte/IScrOptRte.ui" line="148"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IScrOptRte.ui" line="54"/>
+        <source>Copy route into another project.</source>
+        <translation>Copiar ruta en otro proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IScrOptRte.ui" line="40"/>
+        <source>View details and edit.</source>
+        <translation>Ver detalles y editar.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IScrOptRte.ui" line="68"/>
+        <source>Delete route from project.</source>
+        <translation>Borrar ruta del proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IScrOptRte.ui" line="103"/>
+        <source>Calculate route.</source>
+        <translation>Calcular ruta.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IScrOptRte.ui" line="117"/>
+        <source>Reset route calculation.</source>
+        <translation>Reiniciar cálculo de ruta.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IScrOptRte.ui" line="131"/>
+        <source>Move route points.</source>
+        <translation>Mover puntos de ruta.</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IScrOptRte.ui" line="145"/>
+        <source>Convert route to track</source>
+        <translation>Convertir ruta en track</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/IScrOptRte.ui" line="174"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptSelect</name>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="59"/>
+        <source>Copy all selected items to a project.</source>
+        <translation>Copiar todos los elementos seleccionados a un proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="62"/>
+        <location filename="../mouse/IScrOptSelect.ui" line="82"/>
+        <location filename="../mouse/IScrOptSelect.ui" line="102"/>
+        <location filename="../mouse/IScrOptSelect.ui" line="122"/>
+        <location filename="../mouse/IScrOptSelect.ui" line="142"/>
+        <location filename="../mouse/IScrOptSelect.ui" line="156"/>
+        <location filename="../mouse/IScrOptSelect.ui" line="210"/>
+        <location filename="../mouse/IScrOptSelect.ui" line="239"/>
+        <location filename="../mouse/IScrOptSelect.ui" line="299"/>
+        <location filename="../mouse/IScrOptSelect.ui" line="326"/>
+        <location filename="../mouse/IScrOptSelect.ui" line="353"/>
+        <location filename="../mouse/IScrOptSelect.ui" line="380"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="79"/>
+        <source>Create a route from selected waypoints.</source>
+        <translation>Crear ruta con los waypoints seleccionados.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="99"/>
+        <source>Change the icon of all selected waypoints.</source>
+        <translation>Cambiar el icono a los waypoints seleccionados.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="119"/>
+        <source>Combine all selected tracks to a new one.</source>
+        <translation>Combinar todos los tracks seleccionadas en uno nuevo.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="139"/>
+        <source>Set an activity for all selected tracks.</source>
+        <translation>Asigna una Actividad para todos los tracks seleccionados.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="153"/>
+        <source>Delete all selected items.</source>
+        <translation>Borrar los elementos seleccionados.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="207"/>
+        <source>Select all items that intersect the selected area.</source>
+        <translation>Seleccione los elementos que interseccionan el área seleccionada.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="236"/>
+        <source>Select all items that are completely inside the selected area.</source>
+        <translation>Seleccione los elementos que estan dentro del area seleccionada. </translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="296"/>
+        <source>Add tracks to selection.</source>
+        <translation>Añadir tracks a la selección.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="323"/>
+        <source>Add waypoints to selection.</source>
+        <translation>Añadir waypoints a la selección.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="350"/>
+        <source>Add routes to selection.</source>
+        <translation>Añadir rutas a selección.</translation>
+    </message>
+    <message>
+        <location filename="../mouse/IScrOptSelect.ui" line="377"/>
+        <source>Add areas to selection.</source>
+        <translation>Añadir áreas a la selección.</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptTrk</name>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="89"/>
+        <source>Show on-screen profile and detailed information about points.</source>
+        <translation>Mostrar el perfil en pantalla e información detallada de los puntos.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="120"/>
+        <source>Edit position of track points.</source>
+        <translation>Editar la posición de los puntos del track.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="40"/>
+        <source>View details and edit properties of track.</source>
+        <translation>Ver detalles y editar propiedades del track. </translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="43"/>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="57"/>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="71"/>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="92"/>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="109"/>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="123"/>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="137"/>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="151"/>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="170"/>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="184"/>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="198"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="54"/>
+        <source>Copy track into another project.</source>
+        <translation>Copiar track en otro proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="68"/>
+        <source>Delete track from project.</source>
+        <translation>Eliminar track del proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="106"/>
+        <source>Select a range of points.</source>
+        <translation>Seleccionar un rango de puntos.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="134"/>
+        <source>Reverse track.</source>
+        <translation>Invertir track.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="148"/>
+        <source>Combine tracks.</source>
+        <translation>Combinar tracks.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="162"/>
+        <source>Cut track at selected point. You can use this to:
+
+* remove bad points at the start or end of the track
+* use the track parts to plan a new tour
+* cut a long track into stages
+</source>
+        <translation>Dividir el track por el punto seleccionado. Puede usar esto para:
+
+* Eliminar puntos erróneos del principio o del final
+* Utilizar partes del track al planificar un nuevo recorrido
+* Dividir un track muy largo en varias etapas
+</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
+        <source>Set an activity for the complete track.</source>
+        <translation>Asigna una Actividad al track completo.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
+        <source>Copy track together with all attached waypoints into another project.</source>
+        <translation>Copiar track junto con todos los waypoints conectados en otro proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IScrOptTrk.ui" line="224"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptWpt</name>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="49"/>
+        <source>View details and edit.</source>
+        <translation>Ver detalles y editar.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="52"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="66"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="80"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="101"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="118"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="132"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="153"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="170"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="63"/>
+        <source>Copy waypoint into another project.</source>
+        <translation>Copiar waypoint en otro proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="77"/>
+        <source>Delete waypoint from project.</source>
+        <translation>Eliminar waypoint del proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="98"/>
+        <source>Show content as static bubble.</source>
+        <translation>Mostrar contenido en globo de texto.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="115"/>
+        <source>Move waypoint to a new location.</source>
+        <translation>Mover el waypoint a una nueva ubicación.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="129"/>
+        <source>Clone waypoint and move clone a given distance and angle.</source>
+        <translation>Duplicar el waypoint y mover la copia a una distancia y un ángulo dados.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="150"/>
+        <source>edit radius of circular area</source>
+        <translation>editar radio de área circular</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="167"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation type="unfinished">Cambiar entre proximidad y área prohibida</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="185"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation>Eliminar círculo definido por waypoint</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="232"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptWptRadius</name>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="49"/>
+        <source>edit radius of circular area</source>
+        <translation>editar radio de área circular</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="52"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="66"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="84"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="63"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation type="unfinished">Cambiar entre proximidad y área prohibida</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="81"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation type="unfinished">Borrar circulo definido por waypoint</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="128"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Denominación</translation>
+    </message>
+</context>
+<context>
+    <name>ISearchDatabase</name>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
+        <source>Search...</source>
+        <translation>Buscar...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="34"/>
+        <source>Type the word you want to search for and press the search button. 
+If you enter 'word' a search with an exact match is done. If you enter 'word*', 'word' has to be at the beginning of a string.</source>
+        <translation>Escriba la palabra que desea buscar y pulse botón de busqueda. 
+Si introduce la 'palabra' entre apóstrofes se busca una coincidencia exacta . Si introduce 'palabra*', la 'palabra' se busca al principio de una cadena.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="51"/>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="79"/>
+        <source>Search</source>
+        <translation>Buscar</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="86"/>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+</context>
+<context>
+    <name>ISelDevices</name>
+    <message>
+        <location filename="../gis/ISelDevices.ui" line="14"/>
+        <source>Select devices...</source>
+        <translation>Seleccionar dispositivos...</translation>
+    </message>
+</context>
+<context>
+    <name>ISelectActivityColor</name>
+    <message>
+        <location filename="../gis/trk/ISelectActivityColor.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ISelectCopyAction</name>
+    <message>
+        <location filename="../helpers/ISelectCopyAction.ui" line="14"/>
+        <source>Copy item...</source>
+        <translation>Copiar elemento...</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectCopyAction.ui" line="29"/>
+        <source>Replace existing item</source>
+        <translation>Sustituir el elemento existente</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectCopyAction.ui" line="36"/>
+        <location filename="../helpers/ISelectCopyAction.ui" line="46"/>
+        <location filename="../helpers/ISelectCopyAction.ui" line="79"/>
+        <location filename="../helpers/ISelectCopyAction.ui" line="89"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectCopyAction.ui" line="72"/>
+        <source>Do not copy item</source>
+        <translation>No copiar el elemento</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectCopyAction.ui" line="115"/>
+        <source>Create a clone</source>
+        <translation>Crear un duplicado</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectCopyAction.ui" line="122"/>
+        <source>Replace with:</source>
+        <translation>Sustituir por:</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectCopyAction.ui" line="129"/>
+        <source>Keep item:</source>
+        <translation>Mantener:</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectCopyAction.ui" line="136"/>
+        <source>The clone's name will be appended with '_Clone'</source>
+        <translation>Se añadirá el sufijo '_Clone' al nombre del duplicado</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectCopyAction.ui" line="153"/>
+        <source>And for all other items, too.</source>
+        <translation>Hacer igual para todos los elementos.</translation>
+    </message>
+</context>
+<context>
+    <name>ISelectDBFolder</name>
+    <message>
+        <location filename="../gis/db/ISelectDBFolder.ui" line="14"/>
+        <source>Select Parent Folder...</source>
+        <translation>Seleccione la carpeta principal...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectDBFolder.ui" line="26"/>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+</context>
+<context>
+    <name>ISelectDoubleListWidget</name>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="22"/>
+        <source>Available</source>
+        <translation>Disponible</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="46"/>
+        <source>Add to selected items</source>
+        <translation>Añadir a los elementos seleccionados</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="60"/>
+        <source>Remove from selected items</source>
+        <translation>Eliminar de los elementos seleccionados</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="78"/>
+        <source>Selected</source>
+        <translation>Seleccionado</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="102"/>
+        <source>Move selected items up</source>
+        <translation>Mover los elementos seleccionados arriba</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="116"/>
+        <source>Move selected items down</source>
+        <translation>Mover los elementos seleccionados abajo</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="49"/>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="63"/>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="105"/>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="119"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>ISelectProjectDialog</name>
+    <message>
+        <location filename="../helpers/ISelectProjectDialog.ui" line="14"/>
+        <source>Select a project...</source>
+        <translation>Seleccionar un proyecto...</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectProjectDialog.ui" line="20"/>
+        <source>Select project from list or enter new project name.</source>
+        <translation>Seleccione un proyecto de la lista, o introduzca un nuevo nombre de proyecto.</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectProjectDialog.ui" line="33"/>
+        <source>New project's name</source>
+        <translation>Nombre del nuevo proyecto</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectProjectDialog.ui" line="43"/>
+        <source>New project is created as:</source>
+        <translation>El nuevo proyecto se creará como:</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectProjectDialog.ui" line="93"/>
+        <source>*.qms</source>
+        <translation>*.qms</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectProjectDialog.ui" line="103"/>
+        <source>*.gpx</source>
+        <translation>*.gpx</translation>
+    </message>
+    <message>
+        <location filename="../helpers/ISelectProjectDialog.ui" line="110"/>
+        <source>Database</source>
+        <translation>Base de datos</translation>
+    </message>
+</context>
+<context>
+    <name>ISelectSaveAction</name>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="20"/>
+        <source>Copy item...</source>
+        <translation>Copiar elemento...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="35"/>
+        <source>Replace existing item</source>
+        <translation>Sustituir el elemento existente</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="87"/>
+        <source>Add a clone</source>
+        <translation>Añadir duplicado</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="100"/>
+        <source>The clone's name will be appended with '_Clone'</source>
+        <translation>Se añadirá el sufijo '_Clone' al nombre del duplicado</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="171"/>
+        <source>Replace with:</source>
+        <translation>Sustituir por:</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="42"/>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="68"/>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="130"/>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="140"/>
+        <source>TextLabel</source>
+        <translation>Denominación</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="61"/>
+        <source>Do not replace item</source>
+        <translation>No sustituir elemento</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="123"/>
+        <source>Use item:</source>
+        <translation>Utilizar elemento:</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISelectSaveAction.ui" line="116"/>
+        <source>And for all other items, too.</source>
+        <translation>Hacer igual para todos los elementos.</translation>
+    </message>
+</context>
+<context>
+    <name>ISetupDatabase</name>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="14"/>
+        <source>Add database...</source>
+        <translation>Añadir Base de Datos...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="68"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="25"/>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="252"/>
+        <source><p align="justify"><span style=" font-weight:600;">Caution!</span> It is recommended to leave the password blank, as QMapShack will store it as plain text. If you don't give a password you will be asked for it on each startup.</p></source>
+        <translation><p align="justify"><span style=" font-weight:600;">Precaución</span> Se recomienda dejar la contraseña en blanco, ya que QMapShack lo almacenará como texto sin formato. Si no introduce una contraseña, se le pedirá en cada inicio.</p></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="239"/>
+        <source>Do not use a password.</source>
+        <translation>No usar contraseña.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="153"/>
+        <source>SQLite</source>
+        <translation>SQLite</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="115"/>
+        <source>MySQL</source>
+        <translation>MySQL</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="181"/>
+        <source>Server</source>
+        <translation>Servidor</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="193"/>
+        <source>Port</source>
+        <translation>Puerto</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="206"/>
+        <source>00000</source>
+        <translation>00000</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="215"/>
+        <source>User</source>
+        <translation>Usuario</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="225"/>
+        <source>Password</source>
+        <translation>Contraseña</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="275"/>
+        <source><b>Port:</b> Leave the port field empty to use the default port.</source>
+        <translation><b>Puerto:</b> Dejar vacio para usar el puerto predeterminado.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="61"/>
+        <source>File:</source>
+        <translation>Archivo:</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="75"/>
+        <source>Add new database.</source>
+        <translation>Añadir nueva base de datos.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="78"/>
+        <location filename="../gis/db/ISetupDatabase.ui" line="92"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupDatabase.ui" line="89"/>
+        <source>Open existing database.</source>
+        <translation>Abrir base de datos existente.</translation>
+    </message>
+</context>
+<context>
+    <name>ISetupFilter</name>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="38"/>
+        <source>Apply filter to</source>
+        <translation>Aplicar filtro a</translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="45"/>
+        <source>name only</source>
+        <translation>Solo nombre</translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="52"/>
+        <source>complete text</source>
+        <translation>Texto completo</translation>
+    </message>
+</context>
+<context>
+    <name>ISetupFolder</name>
+    <message>
+        <location filename="../gis/db/ISetupFolder.ui" line="14"/>
+        <source>Database Folder...</source>
+        <translation>Carpeta de base de datos</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupFolder.ui" line="20"/>
+        <source>Folder name</source>
+        <translation>Nombre de la carpeta</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupFolder.ui" line="30"/>
+        <source>Group</source>
+        <translation>Grupo</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupFolder.ui" line="41"/>
+        <source>Project</source>
+        <translation>Proyecto</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupFolder.ui" line="55"/>
+        <source>Other</source>
+        <translation>Otros</translation>
+    </message>
+</context>
+<context>
+    <name>ISetupNewWpt</name>
+    <message>
+        <location filename="../gis/wpt/ISetupNewWpt.ui" line="14"/>
+        <source>New Waypoint...</source>
+        <translation>Nuevo waypoint.</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/ISetupNewWpt.ui" line="22"/>
+        <source>Symbol</source>
+        <translation>Símbolo</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/ISetupNewWpt.ui" line="29"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/ISetupNewWpt.ui" line="39"/>
+        <source>Position</source>
+        <translation>Posición</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/ISetupNewWpt.ui" line="49"/>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/ISetupNewWpt.ui" line="59"/>
+        <source>Bad position format. Must be: 
+"[N|S] ddd mm.sss [W|E] ddd mm.sss"
+or
+"[N|S] ddd.ddd [W|E] ddd.ddd"</source>
+        <translation>Formato de posición incorrecto. Debe ser: 
+"[N|S] ggg mm.sss [W|E] ggg mm.sss"
+o
+"[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
+    </message>
+</context>
+<context>
+    <name>ISetupWorkspace</name>
+    <message>
+        <location filename="../gis/db/ISetupWorkspace.ui" line="14"/>
+        <source>Setup workspace...</source>
+        <translation>Configurar espacio de trabajo...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupWorkspace.ui" line="35"/>
+        <source>save workspace on exit, and every</source>
+        <translation>guardar el espacio de trabajo al salir, y cada</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupWorkspace.ui" line="45"/>
+        <source>minutes</source>
+        <translation>minutos</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupWorkspace.ui" line="56"/>
+        <source>listen for database changes from other instances of QMapShack. On port</source>
+        <translation>Escuchar los cambios en la base de datos de otras instancias de QMapShack en puerto</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISetupWorkspace.ui" line="63"/>
+        <source>00000</source>
+        <translation>00000</translation>
+    </message>
+</context>
+<context>
+    <name>ITemplateWidget</name>
+    <message>
+        <location filename="../widgets/ITemplateWidget.ui" line="14"/>
+        <source>Insert Template...</source>
+        <translation>Insertar plantilla...</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITemplateWidget.ui" line="32"/>
+        <source>Templates</source>
+        <translation>Plantillas</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITemplateWidget.ui" line="42"/>
+        <source>Select a path with your own templates.</source>
+        <translation>Selecciona una ruta con tus propias plantillas</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITemplateWidget.ui" line="45"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITemplateWidget.ui" line="77"/>
+        <source>Preview</source>
+        <translation>Vista previa</translation>
+    </message>
+</context>
+<context>
+    <name>ITextEditWidget</name>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="14"/>
+        <source>Edit text...</source>
+        <translation>Editar texto...</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="45"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="351"/>
+        <source>Undo</source>
+        <translation>Deshacer</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="354"/>
+        <source>Ctrl+Z</source>
+        <translation>Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="58"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="363"/>
+        <source>Redo</source>
+        <translation>Rehacer</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="366"/>
+        <source>Ctrl+Shift+Z</source>
+        <translation>Ctrl+Shift+Z</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="71"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="375"/>
+        <source>Cut</source>
+        <translation>Cortar</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="378"/>
+        <source>Ctrl+X</source>
+        <translation>Ctrl+X</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="84"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="387"/>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="390"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="97"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="395"/>
+        <source>Paste</source>
+        <translation>Pegar</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="25"/>
+        <source>Templ.</source>
+        <translation>Plantilla.</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="120"/>
+        <source>A:L</source>
+        <translation>A:L</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="133"/>
+        <source>A:C</source>
+        <translation>A:C</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="146"/>
+        <source>A:R</source>
+        <translation>A:R</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="159"/>
+        <source>A:B</source>
+        <translation>A:B</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="192"/>
+        <source>B</source>
+        <translation>B</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="205"/>
+        <source>I</source>
+        <translation>I</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+        <source>U</source>
+        <translation>U</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="238"/>
+        <source>C</source>
+        <translation>C</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+        <source>Standard</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+        <source>Bullet List (Disc)</source>
+        <translation>Lista de viñetas (Disco)</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <source>Bullet List (Circle)</source>
+        <translation>Lista de viñetas (círculos)</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+        <source>Bullet List (Square)</source>
+        <translation>Lista de viñetas(cuadrados)</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+        <source>Ordered List (Decimal)</source>
+        <translation>Lista ordenada(decimal)</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="310"/>
+        <source>Ordered List (Alpha lower)</source>
+        <translation>Lista ordenada (alfabético descendente)</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="315"/>
+        <source>Ordered List (Alpha upper)</source>
+        <translation>Lista ordenada (alfabético ascendente)</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="320"/>
+        <source>Ordered List (Roman lower)</source>
+        <translation>Lista ordenada (números romanos descendente)</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="325"/>
+        <source>Ordered List (Roman upper)</source>
+        <translation>Lista ordenada (números romanos ascendente)</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="398"/>
+        <source>Ctrl+V</source>
+        <translation>Ctrl+V</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="410"/>
+        <source>Align Left</source>
+        <translation>Alinear a la Izquierda</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="413"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="425"/>
+        <source>Align Right</source>
+        <translation>Alinear a la Derecha</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="428"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="440"/>
+        <source>Align Center</source>
+        <translation>Alinear al Centro</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="443"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="455"/>
+        <source>Align Block</source>
+        <translation>Alinear Bloque</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="458"/>
+        <source>Ctrl+J</source>
+        <translation>Ctrl+J</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="470"/>
+        <source>Underline</source>
+        <translation>Subrayar</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="473"/>
+        <source>Ctrl+U</source>
+        <translation>Ctrl+U</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="485"/>
+        <source>Bold</source>
+        <translation>Negrita</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="488"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="500"/>
+        <source>Italic</source>
+        <translation>Cursiva</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="503"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="515"/>
+        <source>Plain</source>
+        <translation>Plano</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="518"/>
+        <source>Reset the text's format before pasting</source>
+        <translation>Restablecer el formato del texto antes del pegado</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="523"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="526"/>
+        <source>Select All</source>
+        <translation>Seleccionar todo</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="529"/>
+        <source>Ctrl+A</source>
+        <translation>Ctrl+A</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="534"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="537"/>
+        <source>Delete</source>
+        <translation>Borrar</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="542"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+        <source>Reset Font</source>
+        <translation>Restablecer fuente</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="550"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="553"/>
+        <source>Reset Layout</source>
+        <translation>Restablecer diseño</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="565"/>
+        <source>Normal</source>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="568"/>
+        <source>Paste without resetting the text's format</source>
+        <translation>Pegar sin restablecer el formato del texto</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="577"/>
+        <source>Insert From Template</source>
+        <translation>Insertar desde plantilla</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="580"/>
+        <source>Create text from template.</source>
+        <translation>Crear texto desde plantilla.</translation>
+    </message>
+</context>
+<context>
+    <name>ITextEditWidgetSelMenu</name>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="55"/>
+        <source>B</source>
+        <translation>B</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="68"/>
+        <source>I</source>
+        <translation>I</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="81"/>
+        <source>U</source>
+        <translation>U</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="101"/>
+        <source>Cut</source>
+        <translation>Cortar</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="114"/>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="127"/>
+        <source>Paste</source>
+        <translation>Pegar</translation>
+    </message>
+</context>
+<context>
+    <name>ITimeZoneSetup</name>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="14"/>
+        <source>Setup Time Zone ...</source>
+        <translation>Configurar la Zona Horaria.</translation>
+    </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="22"/>
+        <source>UTC</source>
+        <translation>UTC</translation>
+    </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="32"/>
+        <source>Local</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="42"/>
+        <source>Automatic</source>
+        <translation>Automático</translation>
+    </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="75"/>
+        <source>Print date/time in </source>
+        <translation>Imprimir fecha y hora en</translation>
+    </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="82"/>
+        <source>long format, or</source>
+        <translation>Formato largo, o</translation>
+    </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="92"/>
+        <source>short format</source>
+        <translation>formato corto</translation>
+    </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="123"/>
+        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
+        <translation><b>Nota:</b> Para algunos elementos de la interfaz de usuario, cambiar las unidades no tendrá efecto hasta que se reinicie QMapShack.</translation>
+    </message>
+</context>
+<context>
+    <name>IToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/IToolBarSetupDialog.ui" line="14"/>
+        <source>Setup Toolbar</source>
+        <translation>Configuración de barra de herramientas</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
+        <source>Toolbar is visible in Fullscreen-mode</source>
+        <translation>Barra de herramientas visible en modo Pantalla Completa</translation>
+    </message>
+</context>
+<context>
+    <name>IToolShell</name>
+    <message>
+        <location filename="../tool/IToolShell.cpp" line="46"/>
+        <source>Execution of external program `%1` failed: </source>
+        <translation>La ejecución del programa externo %1 falló:</translation>
+    </message>
+    <message>
+        <location filename="../tool/IToolShell.cpp" line="50"/>
+        <source>Process cannot be started.
+</source>
+        <translation>No se puede iniciar el proceso.
+</translation>
+    </message>
+    <message>
+        <location filename="../tool/IToolShell.cpp" line="51"/>
+        <source>Make sure the required packages are installed, `%1` exists and is executable.
+</source>
+        <translation>Asegúrese de que los paquetes necesarios estén instalados, `%1` existe y es ejecutable</translation>
+    </message>
+    <message>
+        <location filename="../tool/IToolShell.cpp" line="55"/>
+        <source>External process crashed.
+</source>
+        <translation>El proceso externo falló.
+</translation>
+    </message>
+    <message>
+        <location filename="../tool/IToolShell.cpp" line="59"/>
+        <source>An unknown error occurred.
+</source>
+        <translation>A ocurrido un error desconocido</translation>
+    </message>
+    <message>
+        <location filename="../tool/IToolShell.cpp" line="172"/>
+        <source>!!! failed !!!
+</source>
+        <translation>!!!falló!!!</translation>
+    </message>
+</context>
+<context>
+    <name>IUnit</name>
+    <message>
+        <location filename="../units/IUnit.cpp" line="770"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnit.cpp" line="770"/>
+        <source>Bad position format. Must be: "[N|S] ddd mm.sss [W|E] ddd mm.sss" or "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
+        <translation>Formato de coordenadas incorrecto. Debe ser: "[N|S] ggg mm.sss [W|E] ggg mm.sss" o "[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnit.cpp" line="776"/>
+        <source>Position values out of bounds. </source>
+        <translation>Valores de posición fuera del límite.</translation>
+    </message>
+</context>
+<context>
+    <name>IUnitsSetup</name>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="14"/>
+        <source>Setup units...</source>
+        <translation>Configurar unidades...</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="36"/>
+        <source>Length unit</source>
+        <translation>Unidad de longitud</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="74"/>
+        <source>Metric</source>
+        <translation>Métrico</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="80"/>
+        <source>Slope unit</source>
+        <translation>">Unidad de pendiente</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="92"/>
+        <source>Degrees (°)</source>
+        <translation>Grados (°)</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="105"/>
+        <source>Percent (%)</source>
+        <translation>Porcentaje (%)</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="133"/>
+        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
+        <translation><b>Nota:</b> Para algunos elementos de la interfaz de usuario, cambiar las unidades no tendrá efecto hasta que se reinicie QMapShack.</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="61"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="48"/>
+        <source>Nautic</source>
+        <translation>Naútico</translation>
+    </message>
+</context>
+<context>
+    <name>IWptIconDialog</name>
+    <message>
+        <location filename="../helpers/IWptIconDialog.ui" line="14"/>
+        <source>Icons...</source>
+        <translation>Iconos.</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IWptIconDialog.ui" line="68"/>
+        <source>External Icons:</source>
+        <translation>Iconos:</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IWptIconDialog.ui" line="75"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IWptIconDialog.ui" line="82"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../helpers/IWptIconDialog.ui" line="95"/>
+        <source>All custom icons have to be *.bmp or *.png format.</source>
+        <translation>Los iconos personalizados deben de ser BMP o PNG</translation>
+    </message>
+</context>
+</TS>
diff --git a/src/locale/qmapshack_fr.ts b/src/locale/qmapshack_fr.ts
index 824f3fc..f70f71b 100644
--- a/src/locale/qmapshack_fr.ts
+++ b/src/locale/qmapshack_fr.ts
@@ -16,7 +16,7 @@
     <message>
         <location filename="../CAbout.cpp" line="49"/>
         <source>(no DBUS: device detection and handling disabled)</source>
-        <translation type="unfinished"></translation>
+        <translation>(DBUS absent : détection et gestion d'appareil désactivée)</translation>
     </message>
 </context>
 <context>
@@ -64,12 +64,12 @@
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
         <source>No Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Pas d'activité</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
         <source>Total</source>
-        <translation type="unfinished"></translation>
+        <translation>Total</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
@@ -89,7 +89,7 @@
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
         <source>Public Transport</source>
-        <translation type="unfinished"></translation>
+        <translation>Transports publics</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
@@ -120,12 +120,12 @@
 <context>
     <name>CCanvas</name>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="61"/>
+        <location filename="../canvas/CCanvas.cpp" line="63"/>
         <source>View %1</source>
         <translation>Vue %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="705"/>
+        <location filename="../canvas/CCanvas.cpp" line="766"/>
         <source>Setup Map Background</source>
         <translation>Réglage de l'arrière-plan de la carte</translation>
     </message>
@@ -270,27 +270,27 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="113"/>
+        <location filename="../gis/db/CDBProject.cpp" line="114"/>
         <source>Failed to load...</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de charger ...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="114"/>
+        <location filename="../gis/db/CDBProject.cpp" line="115"/>
         <source>Can't load file "%1" . It will be skipped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de charger le fichier "%1". Il sera ignoré.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="127"/>
+        <location filename="../gis/db/CDBProject.cpp" line="128"/>
         <source>Project already in database...</source>
-        <translation type="unfinished"></translation>
+        <translation>Projet déjà présent dans le base de données</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="128"/>
+        <location filename="../gis/db/CDBProject.cpp" line="129"/>
         <source>The project "%1" has already been imported into the database. It will be skipped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le projet "%1" a déjà été importé dans la base de données. Il sera ignoré.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="279"/>
+        <location filename="../gis/db/CDBProject.cpp" line="280"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -298,47 +298,47 @@ To solve this conflict you can create and save a clone, force your version or dr
 Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer votre version ou abandonner votre version en prenant celle de la base de données</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="285"/>
+        <location filename="../gis/db/CDBProject.cpp" line="286"/>
         <source>Conflict with database...</source>
         <translation>Confilt avec la base de données...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="286"/>
+        <location filename="../gis/db/CDBProject.cpp" line="287"/>
         <source>Clone && Save</source>
         <translation>Cloner && Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="287"/>
+        <location filename="../gis/db/CDBProject.cpp" line="288"/>
         <source>Force Save</source>
         <translation>Forcer la sauvegarde</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="288"/>
+        <location filename="../gis/db/CDBProject.cpp" line="289"/>
         <source>Take remote</source>
         <translation>Prendre la version de la base de données</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="572"/>
+        <location filename="../gis/db/CDBProject.cpp" line="573"/>
         <source>Missing folder...</source>
         <translation>Répertoire manquant...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="573"/>
+        <location filename="../gis/db/CDBProject.cpp" line="574"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation>Echec de la sauvegarde du projet. Le répertoire a été supprimé de la base de données.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="580"/>
+        <location filename="../gis/db/CDBProject.cpp" line="581"/>
         <source>Save ...</source>
         <translation>Enregistrer...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>There was an unexpected database error:
 
 %1</source>
@@ -347,12 +347,12 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
 %1</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="760"/>
+        <location filename="../gis/db/CDBProject.cpp" line="761"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation>Le projet '%1' est sur le point de se mettre à jour depuis la base de données.Néanmoins il y a des modifications non sauvegardées.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="761"/>
+        <location filename="../gis/db/CDBProject.cpp" line="762"/>
         <source>Save changes?</source>
         <translation>Enregistrer les modifications ?</translation>
     </message>
@@ -492,21 +492,6 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
         <translation>Jusqu'à la fin</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
-        <source>distance: </source>
-        <translation>Distance:</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
-        <source>ascent: </source>
-        <translation>montée:</translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
-        <source>descent: </source>
-        <translation>descente:</translation>
-    </message>
-    <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
         <source><h2>Areas</h2></source>
         <translation><h2>Surfaces</h2></translation>
@@ -527,6 +512,21 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
         <translation>Résumé de toutes les traces du projet</translation>
     </message>
     <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
+        <source>Distance: </source>
+        <translation>Distance: </translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
+        <source>Ascent: </source>
+        <translation>Montée: </translation>
+    </message>
+    <message>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
+        <source>Descent: </source>
+        <translation>Descente: </translation>
+    </message>
+    <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
         <source><h2>Routes</h2></source>
         <translation><h2>Routes</h2></translation>
@@ -579,7 +579,7 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
         <source>Miscellaneous</source>
-        <translation type="unfinished"></translation>
+        <translation>Divers</translation>
     </message>
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
@@ -639,7 +639,7 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
     <message>
         <location filename="../gis/db/CExportDatabase.cpp" line="90"/>
         <source>Select export path...</source>
-        <translation type="unfinished"></translation>
+        <translation>Selectionner le chemin d'exportation</translation>
     </message>
 </context>
 <context>
@@ -648,40 +648,40 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="79"/>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="123"/>
         <source>Create %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Créer %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="82"/>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="126"/>
         <source>Failed to create %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de créer %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="88"/>
         <source>Done!</source>
-        <translation type="unfinished"></translation>
+        <translation>Fait !</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="100"/>
         <source>Abort by user!</source>
-        <translation type="unfinished"></translation>
+        <translation>Annulé par l'utilisateur !</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="108"/>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="140"/>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="165"/>
         <source>Database Error: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur de base de données : %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="153"/>
         <source>Save project as %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarder le projet sous %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="157"/>
         <source>Failed!</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur !</translation>
     </message>
 </context>
 <context>
@@ -739,12 +739,12 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
     <message>
         <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
         <source>Missing field definition for development field.</source>
-        <translation type="unfinished"></translation>
+        <translation>Définition de champ manquante pour le champ de développement</translation>
     </message>
     <message>
         <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="226"/>
         <source>FIT decoding error: invalid field def nr %1 while creating dev field profile.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erruer de décodage FIT : définition de champ invalide %1 lors de la création du profil de développement</translation>
     </message>
 </context>
 <context>
@@ -917,8 +917,19 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
-        <source>Length: %1 %2</source>
-        <translation>Longueur: %1 %2</translation>
+        <source>Length: %1%2</source>
+        <translation>Longueur: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
+        <source>Time: %1%2</source>
+        <translation>Durée: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
+        <source>Distance: %1%2</source>
+        <translation>Distance: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
@@ -926,12 +937,6 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
         <translation>Longueur: -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
-        <source>Time: %1 %2</source>
-        <translation>Durée: %1 %2</translation>
-    </message>
-    <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
         <source>Time: -</source>
         <translation>Heure : -</translation>
@@ -952,11 +957,6 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
         <translation>avec %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
-        <source>Distance: %1 %2</source>
-        <translation>Distance: %1 %2</translation>
-    </message>
-    <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
         <source>Changed route points.</source>
         <translation>Points de route modifiés.</translation>
@@ -996,262 +996,284 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
         <translation>Impossible de lire les données.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="80"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="78"/>
         <source>_Clone</source>
         <translation>_Clone</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="251"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="261"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation>Points de la trace modifiés, les données antérieures sont perdues.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
-        <source>Length: %1 %2</source>
-        <translation>Longueur: %1 %2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="396"/>
+        <source>Time: %1%2, Speed: %3%4</source>
+        <translation>Temps: %1%2, Vitesse: %3%4</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
-        <source>, %1%2 %3, %4%5 %6</source>
-        <translation>, %1%2 %3, %4%5 %6</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+        <source>Moving: %1%2, Speed: %3%4</source>
+        <translation>En déplacement: %1%2, Vitesse: %3%4</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="421"/>
         <source>Start: %1</source>
         <translation>Début: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
         <source>Start: -</source>
         <translation>Début: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
         <source>End: %1</source>
         <translation>Fin: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
         <source>End: -</source>
         <translation>Fin: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
         <source>Points: %1 (%2)</source>
         <translation>Points: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="443"/>
         <source>Invalid elevations!</source>
         <translation>Altitudes invalides !</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>Invalid timestamps!</source>
         <translation>Temps invalides !</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
         <source>Invalid positions!</source>
         <translation>Positions invalides !</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
         <source>Activities: %1</source>
         <translation>Activités: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
         <source>Index: %1</source>
         <translation>Index: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
         <source>Index: visible %1, total %2</source>
         <translation>Index: visibles %1, total %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
-        <source>Ele.: %1 %2</source>
-        <translation>Altitude: %1 %2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+        <source>, Slope: %1%2</source>
+        <translation>, Pente : %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
-        <source> slope: %1%3 (%2%)</source>
-        <translation> pente: %1%3(%2%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
-        <source> speed: %1%2</source>
-        <translation> vitesse: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
         <source>... and %1 tags not displayed</source>
         <translation>... and %1 tags non affichés</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
         <source>Distance: - (-)</source>
         <translation>Distance: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
         <source>Moving: - (-)</source>
         <translation>En déplacement: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1318"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1331"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1387"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1570"/>
         <source>track</source>
         <translation>trace</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1522"/>
         <source>Hide point %1.</source>
         <translation>Cacher les points %1.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1526"/>
         <source>Hide points %1..%2.</source>
         <translation>Cacher les points %1..%2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
-        <source> Moving: %1%2 (%3%)</source>
-        <translation>  En mouvement: %1%2 (%3%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="701"/>
         <source>, %1%2</source>
         <translation>,%1,%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
-        <source> Time: %1%2</source>
-        <translation> Temps : %1%2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="124"/>
+        <source>Invalid points....</source>
+        <translation>Points invalides ...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
-        <source>, %1-, %2-</source>
-        <translation>, %1-, %2-</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="125"/>
+        <source>The track '%1' has %2 invalid points out of %3 visible points. Do you want to hide invalid points now?</source>
+        <translation>La trace '%1' a %2 points invalides sur %3 points visibles. Voulez-vous cacher les points invalides maintenant ?</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
-        <source>Time: %1, Speed: %2 %3</source>
-        <translation>Temps: %1, Vitesse: %2 %3</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>min.</source>
+        <translation>min.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
-        <source>Time: -, Speed: -</source>
-        <translation>Time: -, Speed: -</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>max.</source>
+        <translation>max.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
-        <source>Moving: %1, Speed: %2 %3</source>
-        <translation>En déplacement: %1, Vitesse: %2 %3</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="377"/>
+        <source>Length: %1%2</source>
+        <translation>Longueur: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <source>, %1%2%3, %4%5%6</source>
+        <translation>, %1%2%3, %4%5%6</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <source>, %1-, %2-</source>
+        <translation>, %1-, %2-</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
+        <source>Time: -, Speed: -</source>
+        <translation>Time: -, Speed: -</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Moving: -, Speed: -</source>
         <translation>En déplacement: -, Vitesse: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="589"/>
+        <source>Ele.: %1%2</source>
+        <translation>Altitude: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <source>, Speed: %1%2</source>
+        <translation>, Vitesse: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="636"/>
         <source>Ascent: - (-)</source>
         <translation>Montée: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>Descent: - (-)</source>
         <translation>Descente: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="644"/>
         <source>Ascent: %1%2 (%3%)</source>
         <translation>Montée: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
-        <source> Descent: %1%2 (%3%)</source>
-        <translation> Descente: %1%2 (%3%)</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
+        <source>, Descent: %1%2 (%3%)</source>
+        <translation>, Descente: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
         <source>Distance: %1%2 (%3%)</source>
         <translation>Distance: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <source>, Moving: %1%2 (%3%)</source>
+        <translation>, En déplacement: %1%2 (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
         <source>Ascent: -</source>
         <translation>Ascent: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
         <source>Descent: -</source>
         <translation>Descente: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
         <source>Ascent: %1%2</source>
         <translation>Montée: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
-        <source> Descent: %1%2</source>
-        <translation> Descente: %1%2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="696"/>
+        <source>, Descent: %1%2</source>
+        <translation>, Descente: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="706"/>
         <source>Distance: %1%2</source>
         <translation>Distance: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="711"/>
+        <source>, Time: %1%2</source>
+        <translation>, Durée: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1377"/>
         <source>Permanently removed points %1..%2</source>
         <translation>Points supprimés de manière permanente %1..%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1555"/>
         <source>Show points.</source>
         <translation>Afficher les points.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2194"/>
         <source>Changed name</source>
         <translation>Nom modifié</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2200"/>
         <source>Changed comment</source>
         <translation>Commentaire modifié</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2206"/>
         <source>Changed description</source>
         <translation>Description modifiée</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed links</source>
         <translation>Liens modifiés</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2223"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation>Altitudes modifiées du point %1 à %2 %3</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2247"/>
         <source>Changed activity to '%1' for complete track.</source>
-        <translation>Acirvité modifiée pour '%1' pour la trace complète.</translation>
+        <translation>Activité modifiée pour '%1' pour la trace complète.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2286"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation>Activité modifiée pur '%1' for la plage (%2..%3).</translation>
     </message>
@@ -1283,7 +1305,7 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="221"/>
         <source>Added terrain slope from DEM file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouté la pente du terrain à partir du fichier MNT</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="243"/>
@@ -1333,10 +1355,10 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="394"/>
         <source>Converted subpoints from routing to track points</source>
-        <translation type="unfinished"></translation>
+        <translation>Converti les sous-points de routage en points de trace</translation>
     </message>
     <message>
-        <location filename="../qlgt/converter.cpp" line="195"/>
+        <location filename="../qlgt/converter.cpp" line="196"/>
         <source>Copy flag information from QLandkarte GT track</source>
         <translation>Copier la balise d'information de la trace QLandkarte GT</translation>
     </message>
@@ -1359,70 +1381,85 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
         <translation>Non disponible</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="104"/>
         <source>_Clone</source>
         <translation>_Clone</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
-        <source>Elevation: %1 %2</source>
-        <translation>Altitude: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="277"/>
+        <source>Elevation: %1%2</source>
+        <translation>Altitude: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
-        <source>Proximity: %1 %2</source>
-        <translation>Proximité: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="288"/>
+        <source>Proximity: %1%2</source>
+        <translation>Proximité: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
         <source>Changed name</source>
         <translation>Nom modifié</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
         <source>Changed position</source>
         <translation>Position modifiée</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
         <source>Changed elevation</source>
         <translation>Altitude modifiée</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="413"/>
+        <source>Removed proximity</source>
+        <translation>Enlevé proximité</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="417"/>
         <source>Changed proximity</source>
         <translation>Rayon de proximité modifié</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="432"/>
         <source>Changed icon</source>
         <translation>Icône modifié</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="438"/>
         <source>Changed comment</source>
         <translation>Commentaire modifié</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="444"/>
         <source>Changed description</source>
         <translation>Description modifiée</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="450"/>
         <source>Changed links</source>
         <translation>Liens modifiés</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="456"/>
         <source>Changed images</source>
         <translation>Images modifiées</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="462"/>
         <source>Add image</source>
         <translation>Ajouter une image</translation>
     </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="877"/>
+        <source>Changed to proximity-radius</source>
+        <translation>Changé pour rayon de proximité</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="882"/>
+        <source>Changed to nogo-area</source>
+        <translation>Changé pour zone interdite</translation>
+    </message>
 </context>
 <context>
     <name>CGisListDB</name>
@@ -1469,12 +1506,12 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
     <message>
         <location filename="../gis/CGisListDB.cpp" line="127"/>
         <source>Import from Files...</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer depuis des fichiers ...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="128"/>
         <source>Export to GPX...</source>
-        <translation type="unfinished"></translation>
+        <translation>Exporter vers GPX...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="131"/>
@@ -1550,7 +1587,7 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
     <message>
         <location filename="../gis/CGisListDB.cpp" line="1055"/>
         <source>Import GIS Data...</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer des données SIG...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="508"/>
@@ -1577,249 +1614,269 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
 <context>
     <name>CGisListWks</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="101"/>
+        <location filename="../gis/CGisListWks.cpp" line="106"/>
         <source>Edit..</source>
         <translation>Éditer..</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
         <source>Show on Map</source>
         <translation>Afficher sur la carte</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="109"/>
         <source>Hide from Map</source>
         <translation>Masquer</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="109"/>
+        <location filename="../gis/CGisListWks.cpp" line="114"/>
         <source>Sort by Time</source>
         <translation>Trier par date</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="110"/>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Sort by Name</source>
         <translation>Trier par nom</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="117"/>
+        <location filename="../gis/CGisListWks.cpp" line="122"/>
         <source>Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="119"/>
+        <location filename="../gis/CGisListWks.cpp" line="124"/>
         <source>Save as GPX 1.1 w/o ext...</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarder comme GPX 1.1 sans extensions...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="122"/>
+        <location filename="../gis/CGisListWks.cpp" line="127"/>
         <source>Send to Devices</source>
         <translation>Envoyer vers les appareils</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Sync. with Database</source>
         <translation>Synchroniser avec la base de données</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="126"/>
+        <location filename="../gis/CGisListWks.cpp" line="131"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="140"/>
         <source>Update Project on Device</source>
         <translation>Mettre à jour le projet sur l'appareil</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="166"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="149"/>
+        <location filename="../gis/CGisListWks.cpp" line="154"/>
         <source>Edit...</source>
         <translation>Éditer...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="102"/>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="155"/>
         <source>Copy to...</source>
         <translation>Copier vers...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="113"/>
+        <location filename="../gis/CGisListWks.cpp" line="118"/>
         <source>Autom. Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Sauvg. auto</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="118"/>
+        <location filename="../gis/CGisListWks.cpp" line="123"/>
         <source>Save as...</source>
         <translation>Sauvegarder sous...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Track Profile</source>
         <translation>Profile de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="154"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Select Range</source>
         <translation>Sélectionner des points</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="155"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Edit Track Points</source>
         <translation>Éditer les points de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="156"/>
+        <location filename="../gis/CGisListWks.cpp" line="161"/>
         <source>Reverse Track</source>
         <translation>Inverser la trace</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="157"/>
+        <location filename="../gis/CGisListWks.cpp" line="162"/>
         <source>Combine Tracks</source>
         <translation>Joindre des traces</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="159"/>
+        <location filename="../gis/CGisListWks.cpp" line="164"/>
         <source>Copy Track with Waypoints</source>
         <translation>Copier la trace avec ses waypoints</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="167"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Show Bubble</source>
         <translation>Afficher la bulle</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="169"/>
+        <location filename="../gis/CGisListWks.cpp" line="175"/>
         <source>Move Waypoint</source>
         <translation>Déplacer le waypoint</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="170"/>
+        <location filename="../gis/CGisListWks.cpp" line="176"/>
         <source>Proj. Waypoint...</source>
         <translation>Projection du waypoint...</translation>
     </message>
     <message>
+        <location filename="../gis/CGisListWks.cpp" line="177"/>
+        <source>Change Radius</source>
+        <translation>Changer le rayon</translation>
+    </message>
+    <message>
         <location filename="../gis/CGisListWks.cpp" line="178"/>
+        <source>Toggle Nogo-Area</source>
+        <translation>Activer zone interdite</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <source>Delete Radius</source>
+        <translation>Supprimer le rayon</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
         <source>Route Instructions</source>
         <translation>Instructions de guidage</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <location filename="../gis/CGisListWks.cpp" line="191"/>
         <source>Calculate Route</source>
         <translation>Calculer l'itinéraire</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="181"/>
+        <location filename="../gis/CGisListWks.cpp" line="192"/>
         <source>Reset Route</source>
         <translation>Réinitialiser la route</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="193"/>
         <source>Edit Route</source>
         <translation>Éditer la route</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="183"/>
+        <location filename="../gis/CGisListWks.cpp" line="194"/>
         <source>Convert to Track</source>
         <translation>Convertir en trace</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="192"/>
+        <location filename="../gis/CGisListWks.cpp" line="204"/>
         <source>Edit Area Points</source>
         <translation>Éditer les points de la surface</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="199"/>
+        <location filename="../gis/CGisListWks.cpp" line="212"/>
         <source>Create Route</source>
         <translation>Créer une route</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="200"/>
+        <location filename="../gis/CGisListWks.cpp" line="213"/>
         <source>Change Icon (sel. waypt. only)</source>
-        <translation type="unfinished"></translation>
+        <translation>Change l'icône (waypoint séléctionné seulement)</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="158"/>
+        <location filename="../gis/CGisListWks.cpp" line="163"/>
         <source>Set Track Activity</source>
-        <translation type="unfinished">Choisir l'activité de la trace</translation>
+        <translation>Choisir l'activité de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="634"/>
+        <location filename="../gis/CGisListWks.cpp" line="646"/>
         <source>Drop items...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="785"/>
+        <location filename="../gis/CGisListWks.cpp" line="797"/>
         <source>Saving workspace. Please wait.</source>
         <translation>Sauvegarde de l'espace de travail. Patientez.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="831"/>
+        <location filename="../gis/CGisListWks.cpp" line="843"/>
         <source>Loading workspace. Please wait.</source>
         <translation>Chargement de l'espace de travail. Patientez.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>Close all projects...</source>
         <translation>Fermer tous les projets...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>This will remove all projects from the workspace.</source>
         <translation>Ceci enlevera tous les projets de l'espace de travail.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Delete project...</source>
         <translation>Supprimer le projet...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Do you really want to delete %1?</source>
         <translation>Êtes-vous sûr de vouloir supprimer %1?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="659"/>
-        <location filename="../gis/CGisListWks.cpp" line="1691"/>
-        <location filename="../gis/CGisListWks.cpp" line="1729"/>
+        <location filename="../gis/CGisListWks.cpp" line="671"/>
+        <location filename="../gis/CGisListWks.cpp" line="1771"/>
+        <location filename="../gis/CGisListWks.cpp" line="1809"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation><b>Mise à jour des appareils</b><p>Mise à jour de %1<br/>Patientez...</p></translation>
     </message>
 </context>
 <context>
-    <name>CGisWidget</name>
+    <name>CGisWorkspace</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>Load project...</source>
         <translation>Charger le projet...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>The project "%1" is already in the workspace.</source>
         <translation>Le projet "%1" est déjà présent dans l'espace de travail.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="559"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="213"/>
+        <source><b>Item Selection: </b>Item selected from workspace list. Click on the map to switch back to normal mouse selection behavior.</source>
+        <translation><b>Sélection d'objets : </b>Objet sélectionné depuis l'espace de travail. Cliquez sur la carte pour revenir au mode normal de sélection à la souris.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="626"/>
         <source>Copy items...</source>
         <translation>Copier les éléments...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="578"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="645"/>
         <source>Change waypoint symbols.</source>
-        <translation type="unfinished"></translation>
+        <translation>Changer les symboles de waypoint.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Cut Track...</source>
         <translation>Couper la trace...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Do you want to delete the original track?</source>
         <translation>Voulez-vous supprimer la trace originale?</translation>
     </message>
@@ -1948,99 +2005,298 @@ ligne %2, colonne %3:
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <source>Speed</source>
+        <comment>extLongName</comment>
+        <translation>Vitesse</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
+        <source>Cadence</source>
+        <comment>extShortName</comment>
+        <translation>Cadence</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
+        <source>Air Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp. Air</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
         <source>Air Temperature</source>
+        <comment>extLongName</comment>
         <translation>Température de l'air</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
+        <source>Water Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp. eau</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
         <source>Water Temperature</source>
+        <comment>extLongName</comment>
         <translation>Température de l'eau</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
+        <source>Depth</source>
+        <comment>extShortName</comment>
+        <translation>Prof.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
         <source>Depth</source>
+        <comment>extLongName</comment>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
+        <source>Heart R.</source>
+        <comment>extShortName</comment>
+        <translation>Fréq. Card.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
         <source>Heart Rate</source>
+        <comment>extLongName</comment>
         <translation>Fréquence cardiaque</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="93"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="112"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
         <source>Cadence</source>
-        <translation>Cadence</translation>
+        <comment>extLongName</comment>
+        <translation>Cad.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
         <source>Speed</source>
-        <translation>Vitesse</translation>
+        <comment>extShortName</comment>
+        <translation>Vit.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+        <source>Accel.</source>
+        <comment>extShortName</comment>
+        <translation>Accel.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
         <source>Acceleration</source>
+        <comment>extLongName</comment>
         <translation>Accélération</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
+        <source>Course</source>
+        <comment>extShortName</comment>
+        <translation>Cap</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
         <source>Course</source>
+        <comment>extLongName</comment>
         <translation>Cap</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
+        <source>Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Temp.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
         <source>Temperature</source>
+        <comment>extLongName</comment>
         <translation>Température</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
+        <source>Dist.</source>
+        <comment>extShortName</comment>
+        <translation>Dist.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
         <source>Distance</source>
+        <comment>extLongName</comment>
         <translation>Distance</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Ele.</source>
+        <comment>extShortName</comment>
+        <translation>Alt.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <source>Elevation</source>
+        <comment>extLongName</comment>
+        <translation>Altitude</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
         <source>Energy</source>
+        <comment>extShortName</comment>
+        <translation>Energ</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
+        <source>Energy</source>
+        <comment>extLongName</comment>
         <translation>Energie</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Sea Lev. Pres.</source>
+        <comment>extShortName</comment>
+        <translation>Pres. Niv. Mer</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
         <source>Sea Level Pressure</source>
+        <comment>extLongName</comment>
         <translation>Pression au niveau de la mer</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
-        <source>Speed (vertical)</source>
-        <translation>Vitesse (verticale)</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>v. Speed</source>
+        <comment>extShortName</comment>
+        <translation>Vit. vert.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>Vertical Speed</source>
+        <comment>extLongName</comment>
+        <translation>Vitesse verticale</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope</source>
+        <comment>extShortName</comment>
+        <translation>Pente</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <source>Speed over Distance*</source>
+        <comment>extLongName</comment>
+        <translation>Vitesse par rapport à la distance*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
+        <source>Speed over Time*</source>
+        <comment>extLongName</comment>
+        <translation>Vitesse par rapport au temps*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Elevation*</source>
+        <comment>extLongName</comment>
+        <translation>Altitude*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
+        <source>Progress</source>
+        <comment>extShortName</comment>
+        <translation>Progress.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
+        <source>Progress*</source>
+        <comment>extLongName</comment>
+        <translation>Progression*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terr. Slope</source>
+        <comment>extShortName</comment>
+        <translation>Pent. Terr.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terrain Slope*</source>
+        <comment>extLongName</comment>
+        <translation>Pente du terrain*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
         <source>Slope*</source>
         <translation>Pente*</translation>
     </message>
+</context>
+<context>
+    <name>CLogProject</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
-        <source>Speed*</source>
-        <translation>Vitesse*</translation>
+        <location filename="../gis/suunto/CLogProject.cpp" line="62"/>
+        <source>Failed to load file %1...</source>
+        <translation>Impossible de charger le fichier %1...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
-        <source>Elevation</source>
-        <translation>Altitude</translation>
+        <location filename="../gis/suunto/CLogProject.cpp" line="84"/>
+        <source>Failed to open %1</source>
+        <translation>Impossible d'ouvrir %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
-        <source>Progress</source>
-        <translation>Progression</translation>
+        <location filename="../gis/suunto/CLogProject.cpp" line="95"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Erreur de lecture: %1
+ligne %2, colonne %3:
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="102"/>
+        <source>Not an Openambit log file: %1</source>
+        <translation>Ce n'est pas un fichier Openambit : %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
-        <source>Terrain slope</source>
-        <translation>Pente du terrain</translation>
+        <location filename="../gis/suunto/CLogProject.cpp" line="113"/>
+        <source>Device: %1<br/></source>
+        <translation>Appareil: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="140"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation>Temps de récupération : %1 h<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="145"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation>Pic d'effet d'entraînement : %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="150"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation>Energie: %1 kCal<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="182"/>
+        <source>Use of local time...</source>
+        <translation>Utilisation de l'heure locale...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="183"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation>Aucune heure UTC trouvée dans le fichier %1. L'heure locale de l'ordinateur sera utilisée. Vous pouvez utiliser un filtre pour ajuster l'heure si nécessaire.</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="245"/>
+        <source>This LOG file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation>Ce fichier LOG ne contient aucune information de position et ne peut être affiché par QMapShack : %1</translation>
     </message>
 </context>
 <context>
@@ -2054,55 +2310,56 @@ ligne %2, colonne %3:
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="813"/>
+        <location filename="../CMainWindow.cpp" line="859"/>
         <source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
         <translation>Utilisez <b>Menu->Vue->Add Map View</b> pour ouvrir une nouvelle vue. Ou <b>Menu->Fichier->Charger une vue cartographique</b> pour charger une vue sauvegardée. Ou cliquez <a href='newview'>ici</a>.</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="941"/>
-        <source>Ele: %1%2</source>
+        <location filename="../CMainWindow.cpp" line="987"/>
+        <source>Ele.: %1%2</source>
         <translation>Altitude: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="953"/>
+        <location filename="../CMainWindow.cpp" line="999"/>
         <source>Slope: %1%2</source>
-        <translation type="unfinished"></translation>
+        <comment>terrain</comment>
+        <translation>Pente du terrain : %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="969"/>
+        <location filename="../CMainWindow.cpp" line="1015"/>
         <source>[Grid: %1]</source>
         <translation>[Grille: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1110"/>
+        <location filename="../CMainWindow.cpp" line="1156"/>
         <source>Load GIS Data...</source>
         <translation>Charger des données SIG...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
         <source>Select output file</source>
         <translation>Sélectionner le fichier de sortie</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>QMapShack View (*.view)</source>
         <translation>Vue QMapShack (*.view)</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>Select file to load</source>
         <translation>Sélectionner le fichier à charger</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1481"/>
+        <location filename="../CMainWindow.cpp" line="1532"/>
         <source>Fatal...</source>
         <translation>Fatal...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1482"/>
+        <location filename="../CMainWindow.cpp" line="1533"/>
         <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
-        <translation type="unfinished"></translation>
+        <translation>QMapShack a détecter une bibliothèque Proj4 mal installée. Les tables de translation pour les projections ESPG lstockées en généra dans /usr/share/proj sont manquantes. Contactez votre gestionnaire de distribution pour réparer cela.</translation>
     </message>
 </context>
 <context>
@@ -2112,7 +2369,7 @@ ligne %2, colonne %3:
         <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
 
 If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -2683,13 +2940,13 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
     <message>
         <location filename="../map/CMapIMG.cpp" line="432"/>
         <source>Read external type file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lire un fichier TYP externe...</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="432"/>
         <source>Failed to read type file: %1
 Fall back to internal types.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur de lecture du fichier TYP : %1 Utilisation du TYP interne.</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="474"/>
@@ -2811,7 +3068,7 @@ Fall back to internal types.</source>
     <message>
         <location filename="../map/CMapPropSetup.cpp" line="196"/>
         <source>Select type file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélctionnez un type de fichier...</translation>
     </message>
 </context>
 <context>
@@ -3049,42 +3306,42 @@ Structure inconnue.</translation>
 <context>
     <name>CMouseNormal</name>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="39"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
         <source>Add POI as Waypoint</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter PI comme waypoint</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
         <source>Add Waypoint</source>
         <translation>Ajouter un waypoint</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
         <source>Add Track</source>
         <translation>Ajouter une trace</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
         <source>Add Route</source>
         <translation>Ajouter une route</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="44"/>
         <source>Add Area</source>
         <translation>Ajouter une surface</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="45"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="46"/>
         <source>Select Items On Map</source>
         <translation>Selectionner des objets sur la carte</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
         <source>Copy position</source>
         <translation>Copier la position</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="49"/>
         <source>Copy position (Grid)</source>
         <translation>Copier la position (grille)</translation>
     </message>
@@ -3100,9 +3357,9 @@ Structure inconnue.</translation>
 <context>
     <name>CMouseRangeTrk</name>
     <message>
-        <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
+        <location filename="../mouse/CMouseRangeTrk.cpp" line="239"/>
         <source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
-        <translation type="unfinished"></translation>
+        <translation><b>Sélectionner une plage</b><br/>Sélectionner le 1er pointpar un clic gauche. Puis un second point. Clic droit pour quitter le mode "sélection de plage".<br/></translation>
     </message>
 </context>
 <context>
@@ -3150,25 +3407,25 @@ Structure inconnue.</translation>
     <name>CPlot</name>
     <message>
         <location filename="../plot/CPlot.cpp" line="55"/>
-        <source>distance [%1]</source>
-        <translation>distance [%1]</translation>
+        <source>Distance [%1]</source>
+        <translation>Distance [%1]</translation>
     </message>
     <message>
         <location filename="../plot/CPlot.cpp" line="60"/>
-        <source>time</source>
-        <translation>Temps</translation>
+        <source>Time</source>
+        <translation>Durée</translation>
     </message>
 </context>
 <context>
     <name>CPlotProfile</name>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="79"/>
-        <source>distance [%1]</source>
-        <translation></translation>
+        <source>Distance [%1]</source>
+        <translation>Distance [%1]</translation>
     </message>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="80"/>
-        <source>alt. [%1]</source>
+        <source>Ele. [%1]</source>
         <translation>Alt. [%1]</translation>
     </message>
 </context>
@@ -3221,12 +3478,12 @@ y: %4 m/px</translation>
 <context>
     <name>CProgressDialog</name>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="46"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="48"/>
         <source>Elapsed time: %1</source>
         <translation>Temps écoulé : %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="132"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="134"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation>Temps écoulé : %1 secondes</translation>
     </message>
@@ -3274,6 +3531,29 @@ n'est pas une définition de système de coordonnées:
     </message>
 </context>
 <context>
+    <name>CQlbProject</name>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open...</source>
+        <translation>Impossible d'ouvrir...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open %1</source>
+        <translation>Impossible d'ouvrir %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="138"/>
+        <source>Could not convert...</source>
+        <translation>Impossible de convertir...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="139"/>
+        <source>The file contains overlays that can not be converted. This is because QMapShack does not support all overlay types of QLandkarte.</source>
+        <translation>Le fichier contient des superpositions qui ne peuvent être converties. QMapShack ne supporte pas tous les types de superpostion de QLandKarte.</translation>
+    </message>
+</context>
+<context>
     <name>CQlgtDb</name>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="308"/>
@@ -3459,114 +3739,120 @@ n'est pas une définition de système de coordonnées:
 <context>
     <name>CRouterBRouter</name>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
         <source>original</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
         <source>first alternative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
         <source>second alternative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="53"/>
         <source>third alternative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="148"/>
         <source>BRouter (offline)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="155"/>
         <source>BRouter (online)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="185"/>
         <source>profile: %1, alternative: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="283"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="408"/>
+        <source>BRouter does not support more then 1 nogo-area in this version, consider to upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="297"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="420"/>
         <source>response is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="334"/>
         <source>Bad response from server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="386"/>
         <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="270"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="389"/>
         <source>Calculate route with %1</source>
         <translation type="unfinished">Calculer l'itinéraire avec %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="454"/>
         <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="444"/>
         <source><br/>Calculation time: %1s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="548"/>
         <source>Error</source>
         <translation type="unfinished">Erreur</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="600"/>
         <source>running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="592"/>
         <source>starting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="554"/>
         <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="581"/>
         <source>Warning...</source>
         <translation type="unfinished">Avertissement...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="586"/>
         <source>I understand the risk. Don't tell me again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="607"/>
         <source>stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="618"/>
         <source>not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="629"/>
         <source>online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3899,13 +4185,13 @@ n'est pas une définition de système de coordonnées:
         <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
         <source>!!! done !!!
 </source>
-        <translation type="unfinished">!!! fait !!!</translation>
+        <translation>!!! fait !!!!</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
         <source>!!! failed !!!
 </source>
-        <translation type="unfinished">!!! échec !!!</translation>
+        <translation>!!! échec !!!</translation>
     </message>
 </context>
 <context>
@@ -4279,7 +4565,7 @@ n'est pas une définition de système de coordonnées:
     <message>
         <location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
         <source>BRouter (online)</source>
-        <translation type="unfinished"></translation>
+        <translation>Brouter (en ligne)</translation>
     </message>
 </context>
 <context>
@@ -4290,17 +4576,17 @@ n'est pas une définition de système de coordonnées:
         <translation>Créer une base de données Routino</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="58"/>
         <source>Select files...</source>
         <translation>Sélectionnez les fichiers...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="82"/>
         <source>Select target path...</source>
         <translation>Sélectionnez le répertoire cible...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="143"/>
         <source>!!! done !!!
 </source>
         <translation>!!! fait !!!</translation>
@@ -4469,24 +4755,91 @@ ligne %2, colonne %3:
  %4</translation>
     </message>
     <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="99"/>
-        <source>Not a SLF file: %1</source>
-        <translation>Ce n'est pas un fichier SLF: %1</translation>
+        <location filename="../gis/slf/CSlfReader.cpp" line="99"/>
+        <source>Not a SLF file: %1</source>
+        <translation>Ce n'est pas un fichier SLF: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/slf/CSlfReader.cpp" line="106"/>
+        <source>Unsupported revision %1: %2</source>
+        <translation>Révision non supportée %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../gis/slf/CSlfReader.cpp" line="181"/>
+        <source>Break %1</source>
+        <translation>Break %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
+        <source>Lap %1</source>
+        <translation>Tour %1</translation>
+    </message>
+</context>
+<context>
+    <name>CSmlProject</name>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="63"/>
+        <source>Failed to load file %1...</source>
+        <translation>Impossible de charger le fichier %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="85"/>
+        <source>Failed to open %1</source>
+        <translation>Impossible d'ouvrir %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="96"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Erreur de lecture : %1
+ligne %2, colonne %3:
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="103"/>
+        <source>Not an sml file: %1</source>
+        <translation>Ce n'est pas un fichier sml : %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="129"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation>Temps de récupération : %1 h<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="134"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation>Pic d'effet d'entraînemet : %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="139"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation>Energie : %1 kCal<br/></translation>
     </message>
     <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="106"/>
-        <source>Unsupported revision %1: %2</source>
-        <translation>Révision non supportée %1: %2</translation>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="160"/>
+        <source>Device: %1<br/></source>
+        <translation>Appareil : %1<br/></translation>
     </message>
     <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="181"/>
-        <source>Break %1</source>
-        <translation>Break %1</translation>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="148"/>
+        <source>Battery usage: %1 %/hour</source>
+        <translation>Utilisation de la batterie : %1 %/heure</translation>
     </message>
     <message>
-        <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
-        <source>Lap %1</source>
-        <translation>Tour %1</translation>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="195"/>
+        <source>Use of local time...</source>
+        <translation>Utilisation de l'heure locale...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="196"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation>Aucune heure UTC trouvée dans le fichier %1. L'heure locale de l'ordinateur sera utilisée. Vous pouvez utiliser un filtre pour ajuster l'heure si nécessaire.</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="245"/>
+        <source>This SML file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation>Ce fichier SML ne contient aucune donnée de position et ne peut pas être affiché par QMapShack : %1</translation>
     </message>
 </context>
 <context>
@@ -4503,8 +4856,8 @@ ligne %2, colonne %3:
         <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
-        <source>%1 %2</source>
-        <translation>%1 %2</translation>
+        <source>%1%2</source>
+        <translation>%1%2</translation>
     </message>
 </context>
 <context>
@@ -4586,7 +4939,7 @@ ligne %2, colonne %3:
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
         <source>QMapShack does not know how track <b>%1</b> should be saved. <b>Do you want to save it as a course or as an activity? </b>Remember that only waypoints close enough to the track will be saved when saving as a course. Waypoints will not be saved when saving as an activity.</source>
-        <translation type="unfinished">QMapShack ne sait pas comment la trace <b>%1</b> doit être sauvegardée. <b>Voulez-vous la sauvegarder comme une activité ou comme une course ?</b> Seuls les waypoints proches de la trace seront inclus si "course" est choisi. Si "activité" est choisi aucun waypoint ne sera inclus.</translation>
+        <translation>QMapShack ne sait pas comment la trace <b>%1</b> doit être sauvegardée. <b>Voulez-vous la sauvegarder comme une activité ou comme une course ?</b> Seuls les waypoints proches de la trace seront inclus si "course" est choisi. Si "activité" est choisi aucun waypoint ne sera inclus.</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="432"/>
@@ -4610,32 +4963,32 @@ ligne %2, colonne %3:
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
         <source>choose one...</source>
-        <translation type="unfinished"></translation>
+        <translation>choisir ...</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
         <source>Hiking Tour Summary (built-in)</source>
-        <translation type="unfinished"></translation>
+        <translation>Compte-rendu de randonnée (intégré)</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>-</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
         <source>Template path...</source>
-        <translation type="unfinished"></translation>
+        <translation>Chemin du template</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
         <source>Failed to read template file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de lire le template %1.</translation>
     </message>
     <message>
         <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
         <source>Preview...</source>
-        <translation type="unfinished"></translation>
+        <translation>Aperçu...</translation>
     </message>
 </context>
 <context>
@@ -4656,12 +5009,12 @@ ligne %2, colonne %3:
     <message>
         <location filename="../helpers/CToolBarSetupDialog.cpp" line="43"/>
         <source>Available Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Actions Disponibles</translation>
     </message>
     <message>
         <location filename="../helpers/CToolBarSetupDialog.cpp" line="44"/>
         <source>Selected Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Actions Sélectionnées</translation>
     </message>
 </context>
 <context>
@@ -4717,187 +5070,187 @@ ligne %2, colonne %3:
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formulaire</translation>
+        <translation>Formulaire</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
         <source>Participants</source>
-        <translation type="unfinished"></translation>
+        <translation>Participants</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
         <source>Weather</source>
-        <translation type="unfinished"></translation>
+        <translation>Climat</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
         <source>rain</source>
-        <translation type="unfinished"></translation>
+        <translation>pluie</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
         <source>sunny</source>
-        <translation type="unfinished"></translation>
+        <translation>ensoleillé</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
         <source>snow</source>
-        <translation type="unfinished"></translation>
+        <translation>neige</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
         <source>clouds</source>
-        <translation type="unfinished"></translation>
+        <translation>nuages</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
         <source>windy</source>
-        <translation type="unfinished"></translation>
+        <translation>venteux</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
         <source>hot</source>
-        <translation type="unfinished"></translation>
+        <translation>chaud</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
         <source>warm</source>
-        <translation type="unfinished"></translation>
+        <translation>tiède</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
         <source>cold</source>
-        <translation type="unfinished"></translation>
+        <translation>froid</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
         <source>freezing</source>
-        <translation type="unfinished"></translation>
+        <translation>gel</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
         <source>foggy</source>
-        <translation type="unfinished"></translation>
+        <translation>brouillard</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
         <source>humid</source>
-        <translation type="unfinished"></translation>
+        <translation>humide</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
         <source>Character</source>
-        <translation type="unfinished"></translation>
+        <translation>Caractéristiques</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
         <source>easy hiking</source>
-        <translation type="unfinished"></translation>
+        <translation>randonnée facile</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
         <source>climbing</source>
-        <translation type="unfinished"></translation>
+        <translation>montée</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
         <source>alpine</source>
-        <translation type="unfinished"></translation>
+        <translation>alpin</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
         <source>large ascend</source>
-        <translation type="unfinished"></translation>
+        <translation>longue descente</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
         <source>long distance</source>
-        <translation type="unfinished"></translation>
+        <translation>longue distance</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
         <source>via ferrata</source>
-        <translation type="unfinished"></translation>
+        <translation>via ferrata</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
         <source>hail/soft hail</source>
-        <translation type="unfinished"></translation>
+        <translation>Grêle / grêle molle</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
         <source>Rating</source>
-        <translation type="unfinished"></translation>
+        <translation>Notation</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
         <source>Rating 5 stars</source>
-        <translation type="unfinished"></translation>
+        <translation>Notation 5 étoiles</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
         <source>Rating 4 stars</source>
-        <translation type="unfinished"></translation>
+        <translation>Notation 4 étoiles</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
         <source>Rating 3 stars</source>
-        <translation type="unfinished"></translation>
+        <translation>Notation 3 étoiles</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
         <source>Rating 2 stars</source>
-        <translation type="unfinished"></translation>
+        <translation>Notation 2 étoiles</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
         <source>Rating 1 star</source>
-        <translation type="unfinished"></translation>
+        <translation>Notation 1 étoile</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
         <source>aborted</source>
-        <translation type="unfinished"></translation>
+        <translation>abandonné</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
         <source>Equipment</source>
-        <translation type="unfinished"></translation>
+        <translation>Equipement</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
         <source>ferrata gear</source>
-        <translation type="unfinished"></translation>
+        <translation>Equipement de via ferrata</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
         <source>night gear</source>
-        <translation type="unfinished"></translation>
+        <translation>Equipement de nuit</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
         <source>snow shoes</source>
-        <translation type="unfinished"></translation>
+        <translation>Bottes de neige</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
         <source>climbing gear</source>
-        <translation type="unfinished"></translation>
+        <translation>Equipement d'escalade</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
         <source>ski</source>
-        <translation type="unfinished"></translation>
+        <translation>ski</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
         <source>camping gear</source>
-        <translation type="unfinished"></translation>
+        <translation>Equipement de camping</translation>
     </message>
     <message>
         <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Détails</translation>
     </message>
 </context>
 <context>
@@ -4954,7 +5307,7 @@ ligne %2, colonne %3:
     <message>
         <location filename="../IAbout.ui" line="212"/>
         <source>Oliver Eichler</source>
-        <translation type="unfinished"></translation>
+        <translation>Oliver Eichler</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="225"/>
@@ -4974,17 +5327,17 @@ ligne %2, colonne %3:
     <message>
         <location filename="../IAbout.ui" line="295"/>
         <source>Russian:</source>
-        <translation type="unfinished"></translation>
+        <translation>Russe:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="302"/>
         <source>Wolfgang Thämelt</source>
-        <translation type="unfinished"></translation>
+        <translation>Wolfgang Thämelt</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="428"/>
         <source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
-        <translation type="unfinished"></translation>
+        <translation>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="189"/>
@@ -5051,7 +5404,9 @@ ligne %2, colonne %3:
         <source>Christian Eichler (qms at christian-eichler.de)
 Ivo Kronenberg
 Norbert Truchsess (norbert.truchsess at t-online.de)</source>
-        <translation type="unfinished"></translation>
+        <translation>Christian Eichler (qms at christian-eichler.de)
+Ivo Kronenberg
+Norbert Truchsess (norbert.truchsess at t-online.de)</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="421"/>
@@ -5089,7 +5444,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../canvas/ICanvasSetup.ui" line="66"/>
         <source>Square (optimized for TMS and WMTS tiles)</source>
-        <translation type="unfinished"></translation>
+        <translation>Carré (optimisé pour tuiles TMS et WMTS)</translation>
     </message>
 </context>
 <context>
@@ -5110,7 +5465,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
         <source>Available Tracks</source>
-        <translation type="unfinished"></translation>
+        <translation>Traces Disponibles</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
@@ -5123,7 +5478,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
         <source>Combined Tracks</source>
-        <translation type="unfinished"></translation>
+        <translation>Traces Combinées</translation>
     </message>
 </context>
 <context>
@@ -5188,7 +5543,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="55"/>
         <source>Cut Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mode de découpe :</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="136"/>
@@ -5402,42 +5757,42 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
         <translation></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="118"/>
+        <location filename="../dem/IDemList.ui" line="112"/>
         <source>To add files with elevation data use <b>File->Setup DEM Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
         <translation>Pour ajouter des fichiers DEM cliquez sur <b>Fichier -> Configurer les répertoires DEM</b>.  Or cliquez <a href=réglages'><b>ici</b></a></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="131"/>
+        <location filename="../dem/IDemList.ui" line="125"/>
         <source>Use the context menu (right mouse button click on entry) to activate a file. Use drag-n-drop to move the activated file in the process order. </source>
         <translation>Utilisez le menu contextuel (clic droite sur le fichier) pour activer un fichier. Utilisez glisser-déposer pour changer la position du fichier dans la liste.</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="156"/>
+        <location filename="../dem/IDemList.ui" line="150"/>
         <source>Activate</source>
         <translation>Activer</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="165"/>
+        <location filename="../dem/IDemList.ui" line="159"/>
         <source>Move Up</source>
         <translation>Déplacer vers le haut</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="168"/>
+        <location filename="../dem/IDemList.ui" line="162"/>
         <source>Hide DEM behind previous one</source>
         <translation>Cacher le DEM derrière le précédent</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="177"/>
+        <location filename="../dem/IDemList.ui" line="171"/>
         <source>Move down</source>
         <translation>Déplacer vers le bas</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="180"/>
+        <location filename="../dem/IDemList.ui" line="174"/>
         <source>Show DEM on top of next one</source>
         <translation>Afficher DEM par-dessus le suivant</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="189"/>
+        <location filename="../dem/IDemList.ui" line="183"/>
         <source>Reload DEM</source>
         <translation>Recharger DEM</translation>
     </message>
@@ -5517,7 +5872,7 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="132"/>
         <source>The area was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation type="unfinished"></translation>
+        <translation>La  surface à été importée dans QMapShack et a été modifiée. Les données originales ne sont plus visibles. Voir l'historique pour connaître les changements.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="148"/>
@@ -5631,7 +5986,7 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
     <message>
         <location filename="../gis/rte/IDetailsRte.ui" line="154"/>
         <source>The route was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation type="unfinished"></translation>
+        <translation>L'itinéraire à été importé dans QMapShack et a été modifié. Les données originales ne sont plus visibles. Voir l'historique pour connaître les changements.</translation>
     </message>
     <message>
         <location filename="../gis/rte/IDetailsRte.ui" line="205"/>
@@ -5808,7 +6163,7 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
         <source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation type="unfinished"></translation>
+        <translation>La trace à été importée dans QMapShack et a été modifiée. Les données originales ne sont plus visibles. Voir l'historique pour connaître les changements.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
@@ -5854,7 +6209,7 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
         <source>Time</source>
-        <translation>Durée</translation>
+        <translation>Date</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
@@ -5940,7 +6295,7 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
         <source>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
-        <translation type="unfinished"></translation>
+        <translation>Le waypoint à été importé dans QMapShack et a été modifié. Les données originales ne sont plus visibles. Voir l'historique pour connaître les changements.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="321"/>
@@ -5979,7 +6334,7 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="292"/>
+        <location filename="../device/IDevice.cpp" line="314"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation>Un autre projet du même nom existe déjà. Si vous confirmez, il sera supprimé et remplacé.</translation>
     </message>
@@ -6017,42 +6372,42 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="14"/>
         <source>Export database to GPX...</source>
-        <translation type="unfinished"></translation>
+        <translation>Exporter la base de données en GPX ...</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="22"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="33"/>
         <source>Export Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>Chemin d'exportation :</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="46"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>-</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="55"/>
         <source>GPX 1.1 without extensions</source>
-        <translation type="unfinished"></translation>
+        <translation>GPX 1.1 sans extensions</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="83"/>
         <source>Start</source>
-        <translation type="unfinished">Démarrer</translation>
+        <translation>Démarrer</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="93"/>
         <source>Abort</source>
-        <translation type="unfinished">Annuler</translation>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="100"/>
         <source>Close</source>
-        <translation type="unfinished">Fermer</translation>
+        <translation>Fermer</translation>
     </message>
 </context>
 <context>
@@ -6419,22 +6774,22 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formulaire</translation>
+        <translation>Formulaire</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="35"/>
         <source><b>Convert track subpoints to points</b></source>
-        <translation type="unfinished"></translation>
+        <translation><b>Convertir les sous-points de la trace en points</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="47"/>
         <source>Convert subpoints obtained from routing to ordinary track points </source>
-        <translation type="unfinished"></translation>
+        <translation>Convertir les points calculés par le routage en points ordinaires </translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -6442,22 +6797,22 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formulaire</translation>
+        <translation>Formulaire</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="51"/>
         <source><b>Calculate Terrain Slope</b></source>
-        <translation type="unfinished"></translation>
+        <translation><b>Calculer la pente du terrain</b></translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="63"/>
         <source>Calculate slope of the terrain based on loaded DEM files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Calculer la pente du terrain à partir des fichies MNT chargés.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="70"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -6470,93 +6825,121 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
     <message>
         <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="124"/>
         <source>FIT decoding error: a development field with the field_definition_number %1 already exists.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur de décodage FIT : un champ de développement avec le numéro de définition %1 existe déjà</translation>
+    </message>
+</context>
+<context>
+    <name>IGisDatabase</name>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulaire</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="59"/>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="64"/>
+        <source>Age</source>
+        <translation>Age</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="97"/>
+        <source>To add a database do a right click on the database list above.</source>
+        <translation>Pour ajouter une base de données cliquez droit sur la liste ci-dessus.</translation>
     </message>
 </context>
 <context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="44"/>
+        <location filename="../gis/IGisItem.cpp" line="45"/>
         <source>[no name]</source>
         <translation>[sans nom]</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>The item is not part of the project in the database.</source>
         <translation>L'objet ne fait pas partie du projet dans la base de données</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="317"/>
+        <location filename="../gis/IGisItem.cpp" line="318"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation>Il s'agit soit d'un nouvel objet soit d'un objet qui a été supprimé de la base de donnée par quelqu'un d'autre</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="323"/>
+        <location filename="../gis/IGisItem.cpp" line="324"/>
         <source>The item is not in the database.</source>
         <translation>L'objet n'est pas dans la base de données.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="329"/>
+        <location filename="../gis/IGisItem.cpp" line="330"/>
         <source>The item might need to be saved</source>
         <translation>L'objet aurait besoin d'être sauvegardé.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="413"/>
+        <location filename="../gis/IGisItem.cpp" line="414"/>
         <source>Initial version.</source>
         <translation>Version initiale</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="529"/>
+        <location filename="../gis/IGisItem.cpp" line="534"/>
+        <source>Never ask again.</source>
+        <translation>Ne plus demander.</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="535"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation><h3>%1</h3>Cet élément est probablement en lecture seule car il n'a pas été créé dans QMapShack. En général les données importées ne sont pas modifiées par les utilisateurs. Mais si c'est bien votre intention cliquez 'OK'.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="530"/>
+        <location filename="../gis/IGisItem.cpp" line="536"/>
         <source>Read Only Mode...</source>
         <translation>Mode lecture seule</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="700"/>
-        <location filename="../gis/IGisItem.cpp" line="753"/>
+        <location filename="../gis/IGisItem.cpp" line="713"/>
+        <location filename="../gis/IGisItem.cpp" line="766"/>
         <source><h4>Description:</h4></source>
         <translation><h4>Description:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="703"/>
-        <location filename="../gis/IGisItem.cpp" line="756"/>
+        <location filename="../gis/IGisItem.cpp" line="716"/>
+        <location filename="../gis/IGisItem.cpp" line="769"/>
         <source><p>--- no description ---</p></source>
         <translation><p>--- pas de description ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="714"/>
+        <location filename="../gis/IGisItem.cpp" line="727"/>
         <source><h4>Comment:</h4></source>
         <translation><h4>Commentaire:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="717"/>
+        <location filename="../gis/IGisItem.cpp" line="730"/>
         <source><p>--- no comment ---</p></source>
         <translation><p>--- pas de commentaire ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="728"/>
-        <location filename="../gis/IGisItem.cpp" line="767"/>
+        <location filename="../gis/IGisItem.cpp" line="741"/>
+        <location filename="../gis/IGisItem.cpp" line="780"/>
         <source><h4>Links:</h4></source>
         <translation><h4>Liens:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="731"/>
-        <location filename="../gis/IGisItem.cpp" line="770"/>
+        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="783"/>
         <source><p>--- no links ---</p></source>
         <translation><p>--- pas de liens ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Edit name...</source>
         <translation>Éditer le nom...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Enter new %1 name.</source>
         <translation>Entrez un nouveau %1 nom.</translation>
     </message>
@@ -6564,121 +6947,110 @@ It is either a new item or it has been deleted in the database by someone else.<
 <context>
     <name>IGisProject</name>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source>Save project?</source>
         <translation>Enregistrer le projet ?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source><h3>%1</h3>The project was changed. Save before closing it?</source>
         <translation><h3>%1</h3>Le projet a été modifié. Sauvegarder avant de quitter ?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="356"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="375"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation>%1: Corréler les traces et les waypoints.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="366"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="385"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation><h3>%1</h3>Etait-ce trop long ? Voulez-vous ne pas faire la corrélation des traces et waypoints la prochaine fois pour ce projet ?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="367"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="386"/>
         <source>Canceled correlation...</source>
         <translation>Corrélation annulée...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="412"/>
-        <location filename="../gis/prj/IGisProject.cpp" line="469"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="431"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="488"/>
         <source>Save "%1" to...</source>
         <translation>Sauvegarder"%1" dans ...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="554"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="573"/>
         <source><br/>
 Filename: %1</source>
         <translation><br/>
 Nom de fichier: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="559"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="578"/>
         <source>Waypoints: %1</source>
         <translation>Waypoints: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="563"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="582"/>
         <source>Tracks: %1</source>
         <translation>Traces: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="567"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="586"/>
         <source>Routes: %1</source>
         <translation>Routes: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="571"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="590"/>
         <source>Areas: %1</source>
         <translation>Surfaces: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="691"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="733"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation>Êtes-vous sûr de vouloir supprimer %1 du projet '%2'?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="692"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="734"/>
         <source>Delete...</source>
         <translation>Supprimer...</translation>
     </message>
 </context>
 <context>
-    <name>IGisWidget</name>
+    <name>IGisWorkspace</name>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="14"/>
+        <location filename="../gis/IGisWorkspace.ui" line="14"/>
         <source>Form</source>
-        <translation></translation>
+        <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="43"/>
+        <location filename="../gis/IGisWorkspace.ui" line="43"/>
         <source>Opacity</source>
         <translation>Opacité</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="50"/>
+        <location filename="../gis/IGisWorkspace.ui" line="50"/>
         <source>Change the opacity of all GIS Items on the map.</source>
-        <translation>Modifier l'opacité de tous les objets SIG sur la carte</translation>
+        <translation>Modifier l'opacité de tous les objets SIG sur la carte.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="66"/>
+        <location filename="../gis/IGisWorkspace.ui" line="66"/>
         <source>Filter</source>
-        <translation type="unfinished">Filtre</translation>
+        <translation>Filtre</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="116"/>
-        <location filename="../gis/IGisWidget.ui" line="146"/>
+        <location filename="../gis/IGisWorkspace.ui" line="116"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="151"/>
-        <source>Age</source>
-        <translation>Age</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="185"/>
-        <source>To add a database do a right click on the database list above.</source>
-        <translation>Pour ajouter une base de données cliquez droit sur la liste ci-dessus</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="205"/>
+        <location filename="../gis/IGisWorkspace.ui" line="129"/>
         <source>Clear Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>RAZ filtre</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <location filename="../gis/IGisWorkspace.ui" line="138"/>
         <source>Setup Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Réglages Filtre</translation>
     </message>
 </context>
 <context>
@@ -6778,7 +7150,7 @@ Nom de fichier: %1</translation>
 <context>
     <name>ILineOp</name>
     <message>
-        <location filename="../mouse/line/ILineOp.cpp" line="212"/>
+        <location filename="../mouse/line/ILineOp.cpp" line="279"/>
         <source>Routing</source>
         <translation>Routage</translation>
     </message>
@@ -6830,377 +7202,393 @@ Nom de fichier: %1</translation>
         <translation>Vue</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="103"/>
+        <location filename="../IMainWindow.ui" line="104"/>
         <source>Window</source>
         <translation>Fenêtre</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="113"/>
+        <location filename="../IMainWindow.ui" line="114"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="121"/>
-        <source>Project</source>
-        <translation>Projet</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="132"/>
+        <location filename="../IMainWindow.ui" line="133"/>
         <source>Tool</source>
         <translation>Outils</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="157"/>
+        <location filename="../IMainWindow.ui" line="152"/>
         <source>Maps</source>
         <translation>Cartes</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="200"/>
+        <location filename="../IMainWindow.ui" line="189"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation>Modèle numérique de terrain (DEM)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="239"/>
-        <source>Data</source>
-        <translation>Données</translation>
+        <location filename="../IMainWindow.ui" line="122"/>
+        <location filename="../IMainWindow.ui" line="222"/>
+        <source>Workspace</source>
+        <translation>Espace de travail</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="257"/>
-        <source>Route</source>
-        <translation>Calcul d'itinéraire</translation>
+        <location filename="../IMainWindow.ui" line="231"/>
+        <source>Toolbar</source>
+        <translation>Barre d'outils</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="287"/>
-        <source>Toolbar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../IMainWindow.ui" line="257"/>
+        <source>Routing</source>
+        <translation>Routage</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="302"/>
-        <location filename="../IMainWindow.ui" line="305"/>
+        <location filename="../IMainWindow.ui" line="276"/>
+        <location filename="../IMainWindow.ui" line="279"/>
         <source>Add Map View</source>
         <translation>Ajouter une vue cartographique</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="308"/>
+        <location filename="../IMainWindow.ui" line="282"/>
         <source>Ctrl+T</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="323"/>
+        <location filename="../IMainWindow.ui" line="297"/>
         <source>Show Scale</source>
         <translation>Afficher l'échelle</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="335"/>
+        <location filename="../IMainWindow.ui" line="309"/>
         <source>Setup Map Font</source>
         <translation>Configurer la police de la carte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="350"/>
+        <location filename="../IMainWindow.ui" line="324"/>
         <source>Show Grid</source>
         <translation>Afficher la grille</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="353"/>
+        <location filename="../IMainWindow.ui" line="327"/>
         <source>Ctrl+G</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="365"/>
+        <location filename="../IMainWindow.ui" line="339"/>
         <source>Setup Grid</source>
         <translation>Configurer la grille</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="368"/>
+        <location filename="../IMainWindow.ui" line="342"/>
         <source>Ctrl+Alt+G</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="383"/>
+        <location filename="../IMainWindow.ui" line="357"/>
         <source>Flip Mouse Wheel</source>
         <translation>Inverser le sens de la molette de souris</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="395"/>
-        <location filename="../IMainWindow.ui" line="398"/>
+        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="372"/>
         <source>Setup Map Paths</source>
         <translation>Configurer les répertoires des cartes</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="413"/>
+        <location filename="../IMainWindow.ui" line="387"/>
         <source>POI Text</source>
         <translation>Libellés des points d'interêt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="428"/>
+        <location filename="../IMainWindow.ui" line="402"/>
         <source>Night / Day</source>
         <translation>Jour / Nuit</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="443"/>
+        <location filename="../IMainWindow.ui" line="417"/>
         <source>Map Tool Tip</source>
         <translation>Infobulles sur la carte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="446"/>
+        <location filename="../IMainWindow.ui" line="420"/>
         <source>Ctrl+I</source>
         <translation>CTRL + I</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="458"/>
+        <location filename="../IMainWindow.ui" line="432"/>
         <source>Setup DEM Paths</source>
         <translation>Configurer les répertoires DEM</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="470"/>
+        <location filename="../IMainWindow.ui" line="444"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="482"/>
+        <location filename="../IMainWindow.ui" line="456"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="485"/>
+        <location filename="../IMainWindow.ui" line="459"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="497"/>
-        <location filename="../IMainWindow.ui" line="500"/>
+        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="474"/>
         <source>Setup Map View</source>
         <translation>Configurer la vue cartographique</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="512"/>
+        <location filename="../IMainWindow.ui" line="486"/>
         <source>Load GIS Data</source>
         <translation>Charger des données SIG...</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="515"/>
+        <location filename="../IMainWindow.ui" line="489"/>
         <source>Load projects from file</source>
         <translation>Charger un fichier projet</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="518"/>
+        <location filename="../IMainWindow.ui" line="492"/>
         <source>Ctrl+L</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="530"/>
+        <location filename="../IMainWindow.ui" line="504"/>
         <source>Save All GIS Data</source>
         <translation>Enregistrer toutes les données SIG</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="533"/>
+        <location filename="../IMainWindow.ui" line="507"/>
         <source>Save all projects in the workspace</source>
         <translation>Enregistrer tous les projets de l'espace de travail</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="536"/>
+        <location filename="../IMainWindow.ui" line="510"/>
         <source>Ctrl+S</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="548"/>
+        <location filename="../IMainWindow.ui" line="522"/>
         <source>Setup Time Zone</source>
         <translation>Configurer le fuseau horaire</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="560"/>
+        <location filename="../IMainWindow.ui" line="534"/>
         <source>Add empty project</source>
         <translation>Ajouter un projet vide</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="575"/>
+        <location filename="../IMainWindow.ui" line="549"/>
         <source>Search Google</source>
         <translation>Recherche Google</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="587"/>
+        <location filename="../IMainWindow.ui" line="561"/>
         <source>Close all projects</source>
         <translation>Fermer tous les projets</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="590"/>
+        <location filename="../IMainWindow.ui" line="564"/>
         <source>F8</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="602"/>
+        <location filename="../IMainWindow.ui" line="576"/>
         <source>Setup Units</source>
         <translation>Configurer les unités</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="614"/>
+        <location filename="../IMainWindow.ui" line="588"/>
         <source>Setup Workspace</source>
         <translation>Configurer l'espace de travail</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="617"/>
+        <location filename="../IMainWindow.ui" line="591"/>
         <source>Setup save on exit.</source>
         <translation>Sauvegarde de la configuration en quittant</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="629"/>
+        <location filename="../IMainWindow.ui" line="603"/>
         <source>Import Database from QLandkarte</source>
         <translation>Importer une base de données QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="632"/>
+        <location filename="../IMainWindow.ui" line="606"/>
         <source>Import QLandkarte GT database</source>
         <translation>Importer une base de données QLandkarte GT</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="644"/>
+        <location filename="../IMainWindow.ui" line="618"/>
         <source>VRT Builder</source>
         <translation>Générateur de VRT</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="647"/>
+        <location filename="../IMainWindow.ui" line="621"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation>Interface utilisateur pour gdalbuildvrt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="659"/>
+        <location filename="../IMainWindow.ui" line="633"/>
         <source>Store Map View</source>
         <translation>Enregistrer une vue cartographique</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="662"/>
+        <location filename="../IMainWindow.ui" line="636"/>
         <source>Write current active map and DEM list including the properties to a file</source>
         <translation>Sauvegarder les cartes et calques DEM actives et leurs paramètres dans un fichier</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="674"/>
+        <location filename="../IMainWindow.ui" line="648"/>
         <source>Load Map View</source>
         <translation>Charger une vue cartographique</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="677"/>
+        <location filename="../IMainWindow.ui" line="651"/>
         <source>Restore view with active map and DEM list including the properties from a file</source>
         <translation>Rétablir une vue avec les cartes et calques DEM et leurs paramètres à partir d'un fichier</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="692"/>
+        <location filename="../IMainWindow.ui" line="666"/>
         <source>Ext. Profile</source>
         <translation>Profile externe</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="695"/>
+        <location filename="../IMainWindow.ui" line="669"/>
         <source>Ctrl+E</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="707"/>
+        <location filename="../IMainWindow.ui" line="681"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="710"/>
+        <location filename="../IMainWindow.ui" line="684"/>
         <source>Ctrl+Q</source>
         <translation>CTRL + Q</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="722"/>
+        <location filename="../IMainWindow.ui" line="696"/>
         <source>Clone Map View</source>
         <translation>Dupliquer une vue cartographique</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="725"/>
+        <location filename="../IMainWindow.ui" line="699"/>
         <source>Ctrl+Shift+T</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="737"/>
+        <location filename="../IMainWindow.ui" line="711"/>
         <source>Create Routino Database</source>
         <translation>Créer une base de données Routino</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="749"/>
+        <location filename="../IMainWindow.ui" line="723"/>
         <source>Save(Print) Map Screenshot</source>
         <translation>Sauvegarder (Imprimer) une capture d'écran de la carte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="752"/>
+        <location filename="../IMainWindow.ui" line="726"/>
         <source>Print a selected area of the map</source>
         <translation>Imprimer une zone sélectionnée de la carte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="755"/>
+        <location filename="../IMainWindow.ui" line="729"/>
         <source>Ctrl+P</source>
         <translation>CTRL + P</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="767"/>
+        <location filename="../IMainWindow.ui" line="741"/>
         <source>Setup Coord. Format</source>
         <translation>Choisir le format de coordonnées</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="770"/>
+        <location filename="../IMainWindow.ui" line="744"/>
         <source>Change the format coordinates are displayed</source>
         <translation>Modifier le format des coordonnées affichées</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="782"/>
+        <location filename="../IMainWindow.ui" line="756"/>
         <source>Setup Map Background</source>
         <translation>Modifier l'arrière-plan de la carte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="794"/>
+        <location filename="../IMainWindow.ui" line="768"/>
         <source>Setup Waypoint Icons</source>
         <translation>Modifer les icônes des waypoints</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="797"/>
+        <location filename="../IMainWindow.ui" line="771"/>
         <source>Setup path to custom icons</source>
         <translation>Modifier le chemin des icônes personnalisés</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="806"/>
+        <location filename="../IMainWindow.ui" line="780"/>
         <source>Close Tab</source>
         <translation>Fermer l'onglet</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="809"/>
+        <location filename="../IMainWindow.ui" line="783"/>
         <source>Ctrl+W</source>
         <translation>CTRL + W</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="818"/>
+        <location filename="../IMainWindow.ui" line="792"/>
         <source>Quickstart Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Aide Rapide</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="827"/>
+        <location filename="../IMainWindow.ui" line="801"/>
         <source>Setup Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Réglages barre d'outils</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="839"/>
+        <location filename="../IMainWindow.ui" line="813"/>
         <source>Toggle Docks</source>
-        <translation type="unfinished"></translation>
+        <translation>Activer les docks</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="842"/>
+        <location filename="../IMainWindow.ui" line="816"/>
         <source>Toggle visibility of dockable windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Activer la visibilité des fenêtres dockables</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="845"/>
+        <location filename="../IMainWindow.ui" line="819"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished">CTRL + D</translation>
+        <translation>CTRL + D</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="854"/>
+        <location filename="../IMainWindow.ui" line="828"/>
         <source>Full Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Plein écran</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="857"/>
+        <location filename="../IMainWindow.ui" line="831"/>
         <source>F11</source>
-        <translation type="unfinished">F11</translation>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="843"/>
+        <source>Min./Max. Track Values</source>
+        <translation>Valeurs Min./Max. des traces</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="846"/>
+        <source>Show the minimum and maximum values of the track properties along the track in the map view.</source>
+        <translation>Afficher les valeurs min/max le long de la trace dans la vue carte</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="849"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="245"/>
+        <source>Database</source>
+        <translation>Base de données</translation>
     </message>
 </context>
 <context>
@@ -7263,17 +7651,17 @@ Je n'ai pas envie de lire la documentation !</translation>
     <message>
         <location filename="../map/IMapOnline.cpp" line="41"/>
         <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
-        <translation type="unfinished">L'affichage de cette carte nécessite l'utilisation d'OpenSSL. Par défaut OpenSSL n'est pas inclus dans QMapShack à cause de restriction légales dans certains pays. Vous pouvez consulter <a href='https://www.openssl.org/community/binaries.html'>la page d'accueil OpenSSL</a> pour trouver des fichiers binaires. Vous devez copier libeay32.dll et ssleay32.dll dans le répertoire programme de QMapShack.</translation>
+        <translation>L'affichage de cette carte nécessite l'utilisation d'OpenSSL. Par défaut OpenSSL n'est pas inclus dans QMapShack à cause de restriction légales dans certains pays. Vous pouvez consulter <a href='https://www.openssl.org/community/binaries.html'>la page d'accueil OpenSSL</a> pour trouver des fichiers binaires. Vous devez copier libeay32.dll et ssleay32.dll dans le répertoire programme de QMapShack.</translation>
     </message>
     <message>
         <location filename="../map/IMapOnline.cpp" line="47"/>
         <source>Error...</source>
-        <translation type="unfinished">Erreur...</translation>
+        <translation>Erreur...</translation>
     </message>
     <message>
         <location filename="../map/IMapOnline.cpp" line="98"/>
         <source><b>%1</b>: %2 tiles pending<br/></source>
-        <translation type="unfinished"><b>%1</b>: %2 tuiles à charger<br/></translation>
+        <translation><b>%1</b>: %2 tuiles à charger<br/></translation>
     </message>
 </context>
 <context>
@@ -7362,7 +7750,7 @@ Je n'ai pas envie de lire la documentation !</translation>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="170"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Détails</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="264"/>
@@ -7377,17 +7765,17 @@ Je n'ai pas envie de lire la documentation !</translation>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="353"/>
         <source>Type File:</source>
-        <translation type="unfinished"></translation>
+        <translation>Type de fichier :</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="367"/>
         <source>Forget external type file and use internal types.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ne pas utiliser de TYP¨externe et utiliser le TYP interne.</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="381"/>
         <source>Load an external type file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Charger un fichier TYP externe.</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="227"/>
@@ -7410,7 +7798,7 @@ Je n'ai pas envie de lire la documentation !</translation>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
         <source>Advanced Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Options avancées</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
@@ -7434,14 +7822,18 @@ Je n'ai pas envie de lire la documentation !</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
-        <source>1. Select one or multiple source files.
-2. Select a file name for the target VRT file.
-3. Press "Start" button.
+        <source><ol>
+<li>Select one or multiple source files.</li>
+<li>Select a file name for the target VRT file.</li>
+<li>Press "Start" button.</li>
+</ol>
 
 Tip:
-* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
-* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
-* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
+<ul>
+<li>If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.</li>
+<li>Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.</li>
+<li>The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</li>
+</ul></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7479,62 +7871,62 @@ Tip:
         <translation><b>Nouvelle ligne</b><br/>Déplacez la souris et utilisez le bouton gauche pour ajouter des points. Cliquez droit pour terminer.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="289"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="300"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation><b>Supprimer un point</b><br/>Approchez le pointeur du point et cliquez gauche pour le supprimer.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="297"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="308"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation><b>Sélectionner une série de points</b><br/> Pour commencer la sélection, cliquez gauche sur le premier point. Cliquez gauche sur le sur le deuxième point pour terminer la sélection et choisissez une option. Utilisez le bouton droit pour annuler.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="305"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="316"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Déplacer un point</b><br/>Approchez le pointeur près d'un point et cliquez gauche pour le coller au pointeur. Déplacez le point avec la souris. Déposez le point avec un clic gauche. Utilisez le bouton droit pour annuler.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="313"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Ajouter un point</b><br/>Placez le pointeur de la souris près d'un segment de ligne et cliquez gauche pour ajouter un point. Le nouveau point va coller au pointeur et vous pouvez le déplacer. Déposez le point par un clic gauche. Utilisez le clic droit pour annuler.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="321"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation><b>Aucun calcul d'itinéraire</b><br/>Les points seront connectés par une ligne droite.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="327"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation><b>Calcul d'itinéraire automatique</b><br/>Les paramètres de calcul d'itinéraire actuels serviront pour calculer un tracé entre les points. <b>Remarque :</b>Le routeur sélectionné doit être capable de faire le calcul à la volée. Généralement, les routeurs hors ligne en sont capables, les routeurs en ligne ne le sont pas.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="343"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation><b>Calcul d'itinéraire vecteur</b><br/>Connecter les points avec une ligne basée sur une carte vecteur active, si possible.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="504"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="515"/>
         <source><b>%1 Metrics</b></source>
         <translation><b>%1 Mesures</b></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="507"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="518"/>
         <source>Distance:</source>
         <translation>Distance:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="509"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="520"/>
         <source>Ascent:</source>
         <translation>Montée:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="511"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="522"/>
         <source>Descent:</source>
         <translation>Descente:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.h" line="135"/>
+        <location filename="../mouse/line/IMouseEditLine.h" line="137"/>
         <source><br/><b>Move the map</b><br/>If you keep the left mouse button pressed and move the mouse, you will move the map.<br/><br/></source>
         <translation type="unfinished"></translation>
     </message>
@@ -7579,7 +7971,7 @@ Tip:
     <message>
         <location filename="../plot/IPlot.cpp" line="99"/>
         <source>Cut...</source>
-        <translation type="unfinished"></translation>
+        <translation>Couper...</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="542"/>
@@ -7765,17 +8157,17 @@ or
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="20"/>
         <source>Form</source>
-        <translation type="unfinished">Formulaire</translation>
+        <translation>Formulaire</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
         <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
         <source>Alternative</source>
-        <translation type="unfinished"></translation>
+        <translation>Alternative</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
@@ -7787,7 +8179,7 @@ or
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="128"/>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="142"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="87"/>
@@ -7824,6 +8216,21 @@ or
         <source>Caution! BRouter is listening on all ports for connections.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="217"/>
+        <source><p><a href="http://brouter.de/brouter/" target="_blank">BRouter</a> © <a href="https://github.com/abrensch/brouter/blob/master/LICENSE" target="_blank">ABrensch, Licence GPLv3</a></p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="227"/>
+        <source><p>Directions Courtesy of <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="237"/>
+        <source><p>Routing data <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a> contributors</p></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRouterBRouterInfo</name>
@@ -8112,7 +8519,7 @@ or
         <translation>Langue</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="131"/>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="118"/>
         <source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path. You can create your own routing data with <b>Tool->Create Routino Database</b>.</source>
         <translation>Pour pouvoir utiliser le calcul d'itinéraire hors ligne, vous devez spécifier les répertoires qui contiennent les données locales de calcul d'itinéraire. Utilisez le bouton de configuration pour ajouter des répertoires. Vous pouvez créer vos propres données de calcul d'itinéraires avec <b>Outils->Créer une base de données Routino</b>.</translation>
     </message>
@@ -8152,13 +8559,13 @@ or
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="22"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="25"/>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="63"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="39"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="42"/>
         <source>Select source files:</source>
         <translation>Sélectionnez les fichiers source:</translation>
     </message>
@@ -8182,6 +8589,18 @@ or
         <source>File Prefix</source>
         <translation>Préfixe du fichier</translation>
     </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="133"/>
+        <source><p>To create a Routino routing database you need to download *pbf files from <a href='http://download.geofabrik.de/'>GeoFabrik</a>. The process of creating a Routino database is quite slow and the resulting files quite large. Therefore it's recommended not to download whole continents. Limit your download to those countries you really need. However as Routino can't route over several databases you have to include all countries that ar [...]
+
+<ol>
+<li>Select one or multiple source *.pbf files.</li>
+<li>Select a path for your Routino database.</li>
+<li>Select a prefix. The database will be listed by this prefix.</li>
+<li>Press "Start" button.</li>
+</ol></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IScrOptEditLine</name>
@@ -8273,12 +8692,12 @@ or
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
         <source>Delete a point. (Ctrl+-)</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer un point. (Ctrl+-)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
         <source>Ctrl+-</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+-</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
@@ -8428,7 +8847,7 @@ or
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
         <source>Set an activity for the selected range.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner une activité pour la plage sélectionnée.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
@@ -8537,7 +8956,7 @@ or
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="99"/>
         <source>Change the icon of all selected waypoints.</source>
-        <translation type="unfinished"></translation>
+        <translation>Changer les icônes de tous les waypoints sélectionnés</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="119"/>
@@ -8547,7 +8966,7 @@ or
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="139"/>
         <source>Set an activity for all selected tracks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Choisir un activité pour toutes les traces sélectionnées.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="153"/>
@@ -8562,7 +8981,7 @@ or
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="236"/>
         <source>Select all items that are completely inside the selected area.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionner tous les objets qui sont totalement inclues dans la zone sélectionnée.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="296"/>
@@ -8665,7 +9084,7 @@ or
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
         <source>Set an activity for the complete track.</source>
-        <translation type="unfinished"></translation>
+        <translation>Choisir une activité pour la totalité de la trace.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
@@ -8697,6 +9116,8 @@ or
         <location filename="../gis/wpt/IScrOptWpt.ui" line="101"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="118"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="132"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="153"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="170"/>
         <source>...</source>
         <translation></translation>
     </message>
@@ -8727,7 +9148,57 @@ or
         <translation>Dupliquer le waypoint et déplacer la copie d'une distance et d'un angle défini.</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="176"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="150"/>
+        <source>edit radius of circular area</source>
+        <translation>changer le rayon de la zone circulaire</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="167"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation>basculer entre proximité et zone interdite</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="185"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation>Supprimer le cercle défini par le waypoint</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="232"/>
+        <source>TextLabel</source>
+        <translation>Libellé</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptWptRadius</name>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="20"/>
+        <source>Form</source>
+        <translation>Formulaire</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="49"/>
+        <source>edit radius of circular area</source>
+        <translation>changer le rayon de la zone circulaire</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="52"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="66"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="84"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="63"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation>basculer entre proximité et zone interdite</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="81"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation>Supprimer le cercle défini par le waypoint</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="128"/>
         <source>TextLabel</source>
         <translation>Libellé</translation>
     </message>
@@ -8847,37 +9318,37 @@ Si vous entrez 'mot' alors 'mot' uniquement sera recherché.
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formulaire</translation>
+        <translation>Formulaire</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="22"/>
         <source>Available</source>
-        <translation type="unfinished">Disponible</translation>
+        <translation>Disponible</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="46"/>
         <source>Add to selected items</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter aux objets sélectionnés</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="60"/>
         <source>Remove from selected items</source>
-        <translation type="unfinished"></translation>
+        <translation>Enlever des objets sélectionnés</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="78"/>
         <source>Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionné</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="102"/>
         <source>Move selected items up</source>
-        <translation type="unfinished"></translation>
+        <translation>Déplacer les objets sémectionnés vers le haut</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="116"/>
         <source>Move selected items down</source>
-        <translation type="unfinished"></translation>
+        <translation>Déplacer les objets sémectionnés vers le bas</translation>
     </message>
     <message>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="49"/>
@@ -8885,7 +9356,7 @@ Si vous entrez 'mot' alors 'mot' uniquement sera recherché.
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="105"/>
         <location filename="../widgets/ISelectDoubleListWidget.ui" line="119"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -9071,22 +9542,22 @@ Si vous entrez 'mot' alors 'mot' uniquement sera recherché.
     <message>
         <location filename="../gis/ISetupFilter.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formulaire</translation>
+        <translation>Formulaire</translation>
     </message>
     <message>
         <location filename="../gis/ISetupFilter.ui" line="38"/>
         <source>Apply filter to</source>
-        <translation type="unfinished"></translation>
+        <translation>Appliquer le filtre à</translation>
     </message>
     <message>
         <location filename="../gis/ISetupFilter.ui" line="45"/>
         <source>name only</source>
-        <translation type="unfinished"></translation>
+        <translation>nom seulement</translation>
     </message>
     <message>
         <location filename="../gis/ISetupFilter.ui" line="52"/>
         <source>complete text</source>
-        <translation type="unfinished"></translation>
+        <translation>texte complet</translation>
     </message>
 </context>
 <context>
@@ -9186,27 +9657,27 @@ or
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="14"/>
         <source>Insert Template...</source>
-        <translation type="unfinished"></translation>
+        <translation>Insérer un template</translation>
     </message>
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="32"/>
         <source>Templates</source>
-        <translation type="unfinished"></translation>
+        <translation>Templates</translation>
     </message>
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="42"/>
         <source>Select a path with your own templates.</source>
-        <translation type="unfinished"></translation>
+        <translation>Séléctionner le chemin vers vos propres templates.</translation>
     </message>
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="45"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../widgets/ITemplateWidget.ui" line="77"/>
         <source>Preview</source>
-        <translation type="unfinished">Aperçu</translation>
+        <translation>Aperçu</translation>
     </message>
 </context>
 <context>
@@ -9269,7 +9740,7 @@ or
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="25"/>
         <source>Templ.</source>
-        <translation type="unfinished"></translation>
+        <translation>Templ.</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="120"/>
@@ -9483,12 +9954,12 @@ or
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="577"/>
         <source>Insert From Template</source>
-        <translation type="unfinished"></translation>
+        <translation>Insérer depuis le template</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="580"/>
         <source>Create text from template.</source>
-        <translation type="unfinished"></translation>
+        <translation>Créer le texte depuis le template</translation>
     </message>
 </context>
 <context>
@@ -9561,18 +10032,23 @@ or
         <source>short format</source>
         <translation>court</translation>
     </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="123"/>
+        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
+        <translation><b>Note:</b> Le changement d'unités ne sera totalement visible qu'après le redémarrage de QMapShack.</translation>
+    </message>
 </context>
 <context>
     <name>IToolBarSetupDialog</name>
     <message>
         <location filename="../helpers/IToolBarSetupDialog.ui" line="14"/>
         <source>Setup Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Réglages de la barre d'outils</translation>
     </message>
     <message>
         <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
         <source>Toolbar is visible in Fullscreen-mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Barre d'outils visible en mode plein écran</translation>
     </message>
 </context>
 <context>
@@ -9618,18 +10094,18 @@ or
 <context>
     <name>IUnit</name>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
         <source>Bad position format. Must be: "[N|S] ddd mm.sss [W|E] ddd mm.sss" or "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
         <translation>Format de position incorrect. Formats valides: "[N|S] ddd mm.sss [W|E] ddd mm.sss" ou "[N|S] ddd.ddd [W|E] ddd.ddd" </translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Position values out of bounds. </source>
         <translation>Valeurs de la position hors de la plage autorisée.</translation>
     </message>
@@ -9642,22 +10118,42 @@ or
         <translation>Configurer les unités</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="38"/>
+        <location filename="../units/IUnitsSetup.ui" line="36"/>
+        <source>Length unit</source>
+        <translation>Unité de longueur</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="74"/>
         <source>Metric</source>
         <translation>Métrique</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="47"/>
+        <location filename="../units/IUnitsSetup.ui" line="80"/>
+        <source>Slope unit</source>
+        <translation>Unité de pente</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="92"/>
+        <source>Degrees (°)</source>
+        <translation>Degrés (°)</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="105"/>
+        <source>Percent (%)</source>
+        <translation>Pourcents (%)</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="133"/>
         <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
         <translation><b>Note:</b> Le changement d'unités ne sera totalement visible qu'après le redémarrage de QMapShack.</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="31"/>
+        <location filename="../units/IUnitsSetup.ui" line="61"/>
         <source>Imperial</source>
         <translation>Impérial</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="24"/>
+        <location filename="../units/IUnitsSetup.ui" line="48"/>
         <source>Nautic</source>
         <translation>Nautique</translation>
     </message>
diff --git a/src/locale/qmapshack_nl.ts b/src/locale/qmapshack_nl.ts
index addff4f..c28dd28 100644
--- a/src/locale/qmapshack_nl.ts
+++ b/src/locale/qmapshack_nl.ts
@@ -120,12 +120,12 @@
 <context>
     <name>CCanvas</name>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="61"/>
+        <location filename="../canvas/CCanvas.cpp" line="63"/>
         <source>View %1</source>
         <translation>Venster %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="705"/>
+        <location filename="../canvas/CCanvas.cpp" line="766"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
@@ -270,27 +270,27 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="113"/>
+        <location filename="../gis/db/CDBProject.cpp" line="114"/>
         <source>Failed to load...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="114"/>
+        <location filename="../gis/db/CDBProject.cpp" line="115"/>
         <source>Can't load file "%1" . It will be skipped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="127"/>
+        <location filename="../gis/db/CDBProject.cpp" line="128"/>
         <source>Project already in database...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="128"/>
+        <location filename="../gis/db/CDBProject.cpp" line="129"/>
         <source>The project "%1" has already been imported into the database. It will be skipped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="279"/>
+        <location filename="../gis/db/CDBProject.cpp" line="280"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -299,47 +299,47 @@ To solve this conflict you can create and save a clone, force your version or dr
 Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer huidige versie of verwijder deze versie en kies een ander uit de database</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="285"/>
+        <location filename="../gis/db/CDBProject.cpp" line="286"/>
         <source>Conflict with database...</source>
         <translation>Conflict met database...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="286"/>
+        <location filename="../gis/db/CDBProject.cpp" line="287"/>
         <source>Clone && Save</source>
         <translation>Kloon && Opslaan</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="287"/>
+        <location filename="../gis/db/CDBProject.cpp" line="288"/>
         <source>Force Save</source>
         <translation>Forceer opslaan</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="288"/>
+        <location filename="../gis/db/CDBProject.cpp" line="289"/>
         <source>Take remote</source>
         <translation>Neem huidige</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="572"/>
+        <location filename="../gis/db/CDBProject.cpp" line="573"/>
         <source>Missing folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="573"/>
+        <location filename="../gis/db/CDBProject.cpp" line="574"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="580"/>
+        <location filename="../gis/db/CDBProject.cpp" line="581"/>
         <source>Save ...</source>
         <translation>Opslaan...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>There was an unexpected database error:
 
 %1</source>
@@ -348,12 +348,12 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
 %1</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="760"/>
+        <location filename="../gis/db/CDBProject.cpp" line="761"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation>Het project '%1' zal geupdated worden met de database.Er zijn nog veranderingen niet opgeslagen.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="761"/>
+        <location filename="../gis/db/CDBProject.cpp" line="762"/>
         <source>Save changes?</source>
         <translation>Veranderingen opslaan?</translation>
     </message>
@@ -508,17 +508,17 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
-        <source>distance: </source>
+        <source>Distance: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
-        <source>ascent: </source>
+        <source>Ascent: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
-        <source>descent: </source>
+        <source>Descent: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -917,8 +917,19 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
-        <source>Length: %1 %2</source>
-        <translation>Lengte: %1 %2</translation>
+        <source>Length: %1%2</source>
+        <translation type="unfinished">Lengte: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
+        <source>Time: %1%2</source>
+        <translation type="unfinished">Tijd: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
+        <source>Distance: %1%2</source>
+        <translation type="unfinished">Afstand: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
@@ -926,12 +937,6 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation>Lengte: -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
-        <source>Time: %1 %2</source>
-        <translation>Tijd: %1 %2</translation>
-    </message>
-    <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
         <source>Time: -</source>
         <translation>Tijd: -</translation>
@@ -952,11 +957,6 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation>met %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
-        <source>Distance: %1 %2</source>
-        <translation>Afstand: %1 %2</translation>
-    </message>
-    <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
         <source>Changed route points.</source>
         <translation>Routepunten aangepast.</translation>
@@ -996,262 +996,284 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation>Lezen gegevens mislukt.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="80"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="78"/>
         <source>_Clone</source>
         <translation>_Kloon</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="251"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="261"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation>Trackpunten aangepast, vorige gegevens overschreven.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
-        <source>Length: %1 %2</source>
-        <translation>Lengte: %1 %2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="396"/>
+        <source>Time: %1%2, Speed: %3%4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
-        <source>, %1%2 %3, %4%5 %6</source>
-        <translation>, %1%2 %3, %4%5 %6</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+        <source>Moving: %1%2, Speed: %3%4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="421"/>
         <source>Start: %1</source>
         <translation>Start: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
         <source>Start: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
         <source>End: %1</source>
         <translation>Einde: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
         <source>End: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
         <source>Points: %1 (%2)</source>
         <translation>Punten: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="443"/>
         <source>Invalid elevations!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>Invalid timestamps!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
         <source>Invalid positions!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
         <source>Activities: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
         <source>Index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
         <source>Index: visible %1, total %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
-        <source>Ele.: %1 %2</source>
-        <translation>Hoogte.: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
-        <source> slope: %1%3 (%2%)</source>
-        <translation> helling: %1%3 (%2%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
-        <source> speed: %1%2</source>
-        <translation> snelheid: %1%2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+        <source>, Slope: %1%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
         <source>... and %1 tags not displayed</source>
         <translation>... en %1 tags niet getoont</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
         <source>Distance: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
         <source>Moving: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1318"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1331"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1387"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1570"/>
         <source>track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1522"/>
         <source>Hide point %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1526"/>
         <source>Hide points %1..%2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
-        <source> Moving: %1%2 (%3%)</source>
-        <translation> Beweging: %1%2 (%3%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="701"/>
         <source>, %1%2</source>
         <translation>, %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
-        <source> Time: %1%2</source>
-        <translation> Tijd: %1%2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="124"/>
+        <source>Invalid points....</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
-        <source>, %1-, %2-</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="125"/>
+        <source>The track '%1' has %2 invalid points out of %3 visible points. Do you want to hide invalid points now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
-        <source>Time: %1, Speed: %2 %3</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
-        <source>Time: -, Speed: -</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>max.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="377"/>
+        <source>Length: %1%2</source>
+        <translation type="unfinished">Lengte: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <source>, %1%2%3, %4%5%6</source>
+        <translation type="unfinished">, %1%2 %3, %4%5%6 {1%2%3,?}</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <source>, %1-, %2-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
-        <source>Moving: %1, Speed: %2 %3</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
+        <source>Time: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Moving: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="589"/>
+        <source>Ele.: %1%2</source>
+        <translation type="unfinished">Hoogte.: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <source>, Speed: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="636"/>
         <source>Ascent: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>Descent: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="644"/>
         <source>Ascent: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
-        <source> Descent: %1%2 (%3%)</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
+        <source>, Descent: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
         <source>Distance: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <source>, Moving: %1%2 (%3%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
         <source>Ascent: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
         <source>Descent: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
         <source>Ascent: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
-        <source> Descent: %1%2</source>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="696"/>
+        <source>, Descent: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="706"/>
         <source>Distance: %1%2</source>
         <translation type="unfinished">Afstand: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="711"/>
+        <source>, Time: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1377"/>
         <source>Permanently removed points %1..%2</source>
         <translation>Permanent verwijderde punten %1..%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1555"/>
         <source>Show points.</source>
         <translation>Toon punten.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2194"/>
         <source>Changed name</source>
         <translation>Naam aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2200"/>
         <source>Changed comment</source>
         <translation>Notitie aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2206"/>
         <source>Changed description</source>
         <translation>Beschrijving aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed links</source>
         <translation>Link aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2223"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2247"/>
         <source>Changed activity to '%1' for complete track.</source>
         <translation>Activiteit aangepast naar '%1' voor gehele track.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2286"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation>Activiteit aangepast naar '%1' voor bereik(%2..%3).</translation>
     </message>
@@ -1336,7 +1358,7 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qlgt/converter.cpp" line="195"/>
+        <location filename="../qlgt/converter.cpp" line="196"/>
         <source>Copy flag information from QLandkarte GT track</source>
         <translation>Kopieer flag informatie vanuit QLandkarte GT track</translation>
     </message>
@@ -1359,70 +1381,85 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation>Niet beschikbaar</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="104"/>
         <source>_Clone</source>
         <translation>_Kloon</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
-        <source>Elevation: %1 %2</source>
-        <translation>Hoogte: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="277"/>
+        <source>Elevation: %1%2</source>
+        <translation type="unfinished">Hoogte: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
-        <source>Proximity: %1 %2</source>
-        <translation>Nabijheid: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="288"/>
+        <source>Proximity: %1%2</source>
+        <translation type="unfinished">Nabijheid: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
         <source>Changed name</source>
         <translation>Naam aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
         <source>Changed position</source>
         <translation>Positie aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
         <source>Changed elevation</source>
         <translation>Hoogte aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="413"/>
+        <source>Removed proximity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="417"/>
         <source>Changed proximity</source>
         <translation>Nabijheid aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="432"/>
         <source>Changed icon</source>
         <translation>Pictogram aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="438"/>
         <source>Changed comment</source>
         <translation>Notitie aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="444"/>
         <source>Changed description</source>
         <translation>Beschrijving aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="450"/>
         <source>Changed links</source>
         <translation>Link aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="456"/>
         <source>Changed images</source>
         <translation>Afbeelding aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="462"/>
         <source>Add image</source>
         <translation>Afbeelding toevoegen</translation>
     </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="877"/>
+        <source>Changed to proximity-radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="882"/>
+        <source>Changed to nogo-area</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CGisListDB</name>
@@ -1577,251 +1614,271 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
 <context>
     <name>CGisListWks</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="101"/>
+        <location filename="../gis/CGisListWks.cpp" line="106"/>
         <source>Edit..</source>
         <translation>Bewerken..</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
         <source>Show on Map</source>
         <translation>Toon op kaart</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="109"/>
         <source>Hide from Map</source>
         <translation>Toon niet op kaart</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="109"/>
+        <location filename="../gis/CGisListWks.cpp" line="114"/>
         <source>Sort by Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="110"/>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Sort by Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="117"/>
+        <location filename="../gis/CGisListWks.cpp" line="122"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="119"/>
+        <location filename="../gis/CGisListWks.cpp" line="124"/>
         <source>Save as GPX 1.1 w/o ext...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="122"/>
+        <location filename="../gis/CGisListWks.cpp" line="127"/>
         <source>Send to Devices</source>
         <translation>Verzend naar GPS</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Sync. with Database</source>
         <translation>Syngroniseren met database</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="126"/>
+        <location filename="../gis/CGisListWks.cpp" line="131"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="140"/>
         <source>Update Project on Device</source>
         <translation>Update project op GPS</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="166"/>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="149"/>
+        <location filename="../gis/CGisListWks.cpp" line="154"/>
         <source>Edit...</source>
         <translation>Bewerken...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="102"/>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="155"/>
         <source>Copy to...</source>
         <translation>Kopieer naar...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="113"/>
+        <location filename="../gis/CGisListWks.cpp" line="118"/>
         <source>Autom. Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="118"/>
+        <location filename="../gis/CGisListWks.cpp" line="123"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Track Profile</source>
         <translation>Track profiel</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="154"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Select Range</source>
         <translation>Selecteer afstand</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="155"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Edit Track Points</source>
         <translation>Trackpunten bewerken</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="156"/>
+        <location filename="../gis/CGisListWks.cpp" line="161"/>
         <source>Reverse Track</source>
         <translation>Track omdraaien</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="157"/>
+        <location filename="../gis/CGisListWks.cpp" line="162"/>
         <source>Combine Tracks</source>
         <translation>Combineer tracks</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="159"/>
+        <location filename="../gis/CGisListWks.cpp" line="164"/>
         <source>Copy Track with Waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="167"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Show Bubble</source>
         <translation>Toon ballon</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="169"/>
+        <location filename="../gis/CGisListWks.cpp" line="175"/>
         <source>Move Waypoint</source>
         <translation>Verplaats waypoint</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="170"/>
+        <location filename="../gis/CGisListWks.cpp" line="176"/>
         <source>Proj. Waypoint...</source>
         <translation>Projecteer waypoint...</translation>
     </message>
     <message>
+        <location filename="../gis/CGisListWks.cpp" line="177"/>
+        <source>Change Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../gis/CGisListWks.cpp" line="178"/>
+        <source>Toggle Nogo-Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <source>Delete Radius</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
         <source>Route Instructions</source>
         <translation>Route instructies</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <location filename="../gis/CGisListWks.cpp" line="191"/>
         <source>Calculate Route</source>
         <translation>Route berekenen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="181"/>
+        <location filename="../gis/CGisListWks.cpp" line="192"/>
         <source>Reset Route</source>
         <translation>Route omkeren</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="193"/>
         <source>Edit Route</source>
         <translation>Bewerk route</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="183"/>
+        <location filename="../gis/CGisListWks.cpp" line="194"/>
         <source>Convert to Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="192"/>
+        <location filename="../gis/CGisListWks.cpp" line="204"/>
         <source>Edit Area Points</source>
         <translation>Bewerk gebied punten</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="199"/>
+        <location filename="../gis/CGisListWks.cpp" line="212"/>
         <source>Create Route</source>
         <translation>Maak route</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="200"/>
+        <location filename="../gis/CGisListWks.cpp" line="213"/>
         <source>Change Icon (sel. waypt. only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="158"/>
+        <location filename="../gis/CGisListWks.cpp" line="163"/>
         <source>Set Track Activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="634"/>
+        <location filename="../gis/CGisListWks.cpp" line="646"/>
         <source>Drop items...</source>
         <translation>Elementen wissen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="659"/>
-        <location filename="../gis/CGisListWks.cpp" line="1691"/>
-        <location filename="../gis/CGisListWks.cpp" line="1729"/>
+        <location filename="../gis/CGisListWks.cpp" line="671"/>
+        <location filename="../gis/CGisListWks.cpp" line="1771"/>
+        <location filename="../gis/CGisListWks.cpp" line="1809"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation><b>Updaten GPS</b><p>Updaten %1<br/>Moment geduld...</p></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="785"/>
+        <location filename="../gis/CGisListWks.cpp" line="797"/>
         <source>Saving workspace. Please wait.</source>
         <translation>Werkruimte opslaan. Moment geduld.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="831"/>
+        <location filename="../gis/CGisListWks.cpp" line="843"/>
         <source>Loading workspace. Please wait.</source>
         <translation>Laden werkruimte. Moment geduld.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>Close all projects...</source>
         <translation>Sluit alle projecten...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>This will remove all projects from the workspace.</source>
         <translation>Dit zal alle projecten uit de werkruimte verwijderen.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Delete project...</source>
         <translation>Project verwijderen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Do you really want to delete %1?</source>
         <translation>Moet %1 werkelijk verwijderd worden?</translation>
     </message>
 </context>
 <context>
-    <name>CGisWidget</name>
+    <name>CGisWorkspace</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>Load project...</source>
-        <translation>Project laden...</translation>
+        <translation type="unfinished">Project laden...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>The project "%1" is already in the workspace.</source>
-        <translation>Het project "%1" is al geopend.</translation>
+        <translation type="unfinished">Het project "%1" is al geopend.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="559"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="213"/>
+        <source><b>Item Selection: </b>Item selected from workspace list. Click on the map to switch back to normal mouse selection behavior.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="626"/>
         <source>Copy items...</source>
         <translation type="unfinished">Kopieer elementen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="578"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="645"/>
         <source>Change waypoint symbols.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Cut Track...</source>
-        <translation>Track knippen...</translation>
+        <translation type="unfinished">Track knippen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Do you want to delete the original track?</source>
-        <translation>Moet de orginele track verwijderd worden?</translation>
+        <translation type="unfinished">Moet de orginele track verwijderd worden?</translation>
     </message>
 </context>
 <context>
@@ -1948,98 +2005,297 @@ lijn %2, kolom %3:
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <source>Speed</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Snelheid</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
+        <source>Cadence</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Cadans</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
+        <source>Air Temp.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
         <source>Air Temperature</source>
-        <translation>Luchttemperatuur</translation>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
+        <source>Water Temp.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
         <source>Water Temperature</source>
-        <translation>Watertemperatuur</translation>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
         <source>Depth</source>
-        <translation>Diepte</translation>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Diepte</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
+        <source>Depth</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Diepte</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
+        <source>Heart R.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
         <source>Heart Rate</source>
-        <translation>Hartslag</translation>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="93"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="112"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
         <source>Cadence</source>
-        <translation>Cadans</translation>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Cadans</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
         <source>Speed</source>
-        <translation>Snelheid</translation>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Snelheid</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+        <source>Accel.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
         <source>Acceleration</source>
-        <translation>Versnelling</translation>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
         <source>Course</source>
-        <translation>Richting</translation>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Richting</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
+        <source>Course</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Richting</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
+        <source>Temp.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
         <source>Temperature</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
+        <source>Dist.</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Afstand.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
         <source>Distance</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Ele.</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <source>Elevation</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished">Hoogte</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
         <source>Energy</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
+        <source>Energy</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Sea Lev. Pres.</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
         <source>Sea Level Pressure</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
-        <source>Speed (vertical)</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>v. Speed</source>
+        <comment>extShortName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
-        <source>Slope*</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>Vertical Speed</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
-        <source>Speed*</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Helling</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <source>Speed over Distance*</source>
+        <comment>extLongName</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
-        <source>Elevation</source>
-        <translation>Hoogte</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
+        <source>Speed over Time*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Elevation*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
         <source>Progress</source>
-        <translation>Voortgang</translation>
+        <comment>extShortName</comment>
+        <translation type="unfinished">Voortgang</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
+        <source>Progress*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terr. Slope</source>
+        <comment>extShortName</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terrain Slope*</source>
+        <comment>extLongName</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
-        <source>Terrain slope</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope*</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLogProject</name>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="62"/>
+        <source>Failed to load file %1...</source>
+        <translation type="unfinished">Kan bestand %1 niet laden...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="84"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished">Openen mislukt-%1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="95"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation type="unfinished">Lezen mislukt: %1
+lijn %2, kolom %3:
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="102"/>
+        <source>Not an Openambit log file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="113"/>
+        <source>Device: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="140"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="145"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="150"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="182"/>
+        <source>Use of local time...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="183"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="245"/>
+        <source>This LOG file does not contain any position data and can not be displayed by QMapShack: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2054,53 +2310,54 @@ lijn %2, kolom %3:
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="813"/>
+        <location filename="../CMainWindow.cpp" line="859"/>
         <source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="941"/>
-        <source>Ele: %1%2</source>
-        <translation>Hoogte: %1%2</translation>
+        <location filename="../CMainWindow.cpp" line="987"/>
+        <source>Ele.: %1%2</source>
+        <translation type="unfinished">Hoogte.: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="953"/>
+        <location filename="../CMainWindow.cpp" line="999"/>
         <source>Slope: %1%2</source>
+        <comment>terrain</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="969"/>
+        <location filename="../CMainWindow.cpp" line="1015"/>
         <source>[Grid: %1]</source>
         <translation>[Raster: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1110"/>
+        <location filename="../CMainWindow.cpp" line="1156"/>
         <source>Load GIS Data...</source>
         <translation>GIS gegevens laden...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
         <source>Select output file</source>
         <translation>Selecteer bestand</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>QMapShack View (*.view)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>Select file to load</source>
         <translation>Selecteer bestand</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1481"/>
+        <location filename="../CMainWindow.cpp" line="1532"/>
         <source>Fatal...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1482"/>
+        <location filename="../CMainWindow.cpp" line="1533"/>
         <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3050,42 +3307,42 @@ Onbekende structuur.</translation>
 <context>
     <name>CMouseNormal</name>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="39"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
         <source>Add POI as Waypoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
         <source>Add Waypoint</source>
         <translation>Maak waypoint</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
         <source>Add Track</source>
         <translation>Maak track</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
         <source>Add Route</source>
         <translation>Maak route</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="44"/>
         <source>Add Area</source>
         <translation>Maak gebied</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="45"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="46"/>
         <source>Select Items On Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
         <source>Copy position</source>
         <translation>Kopieer positie</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="49"/>
         <source>Copy position (Grid)</source>
         <translation>Kopieer positie (Raster)</translation>
     </message>
@@ -3101,7 +3358,7 @@ Onbekende structuur.</translation>
 <context>
     <name>CMouseRangeTrk</name>
     <message>
-        <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
+        <location filename="../mouse/CMouseRangeTrk.cpp" line="239"/>
         <source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
         <translation type="unfinished"></translation>
     </message>
@@ -3151,26 +3408,26 @@ Onbekende structuur.</translation>
     <name>CPlot</name>
     <message>
         <location filename="../plot/CPlot.cpp" line="55"/>
-        <source>distance [%1]</source>
-        <translation type="unfinished">afstand [%1]</translation>
+        <source>Distance [%1]</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../plot/CPlot.cpp" line="60"/>
-        <source>time</source>
-        <translation type="unfinished">tijd</translation>
+        <source>Time</source>
+        <translation type="unfinished">Tijd</translation>
     </message>
 </context>
 <context>
     <name>CPlotProfile</name>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="79"/>
-        <source>distance [%1]</source>
-        <translation>afstand [%1]</translation>
+        <source>Distance [%1]</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="80"/>
-        <source>alt. [%1]</source>
-        <translation>hoogte [%1]</translation>
+        <source>Ele. [%1]</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3222,12 +3479,12 @@ y: %4 m/px</translation>
 <context>
     <name>CProgressDialog</name>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="46"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="48"/>
         <source>Elapsed time: %1</source>
         <translation>Verstreken tijd: %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="132"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="134"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation>Verstreken tijd: %1 seconden.</translation>
     </message>
@@ -3275,6 +3532,29 @@ is geen geldig coordinaat definitie:
     </message>
 </context>
 <context>
+    <name>CQlbProject</name>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open...</source>
+        <translation type="unfinished">Openen mislukt...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished">Openen mislukt-%1</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="138"/>
+        <source>Could not convert...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="139"/>
+        <source>The file contains overlays that can not be converted. This is because QMapShack does not support all overlay types of QLandkarte.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CQlgtDb</name>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="308"/>
@@ -3460,114 +3740,120 @@ is geen geldig coordinaat definitie:
 <context>
     <name>CRouterBRouter</name>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
         <source>original</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
         <source>first alternative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
         <source>second alternative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="53"/>
         <source>third alternative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="148"/>
         <source>BRouter (offline)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="155"/>
         <source>BRouter (online)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="185"/>
         <source>profile: %1, alternative: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="283"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="408"/>
+        <source>BRouter does not support more then 1 nogo-area in this version, consider to upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="297"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="420"/>
         <source>response is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="334"/>
         <source>Bad response from server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="386"/>
         <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="270"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="389"/>
         <source>Calculate route with %1</source>
         <translation type="unfinished">Bereken route met %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="454"/>
         <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="444"/>
         <source><br/>Calculation time: %1s</source>
         <translation type="unfinished"><br/>Berekenen tijd: %1s</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="548"/>
         <source>Error</source>
         <translation type="unfinished">Fout</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="600"/>
         <source>running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="592"/>
         <source>starting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="554"/>
         <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="581"/>
         <source>Warning...</source>
         <translation type="unfinished">Waarschuwing...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="586"/>
         <source>I understand the risk. Don't tell me again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="607"/>
         <source>stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="618"/>
         <source>not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="629"/>
         <source>online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4293,17 +4579,17 @@ is geen geldig coordinaat definitie:
         <translation>Maak Routino database</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="58"/>
         <source>Select files...</source>
         <translation>Selecteer bestanden...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="82"/>
         <source>Select target path...</source>
         <translation>Selecteer doel map...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="143"/>
         <source>!!! done !!!
 </source>
         <translation>!!! klaar !!!
@@ -4494,6 +4780,73 @@ lijn %2, kolom %3:
     </message>
 </context>
 <context>
+    <name>CSmlProject</name>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="63"/>
+        <source>Failed to load file %1...</source>
+        <translation type="unfinished">Kan bestand %1 niet laden...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="85"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished">Openen mislukt-%1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="96"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation type="unfinished">Lezen mislukt: %1
+lijn %2, kolom %3:
+ %4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="103"/>
+        <source>Not an sml file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="129"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="134"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="139"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="160"/>
+        <source>Device: %1<br/></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="148"/>
+        <source>Battery usage: %1 %/hour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="195"/>
+        <source>Use of local time...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="196"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="245"/>
+        <source>This SML file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CTableTrk</name>
     <message>
         <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
@@ -4507,8 +4860,8 @@ lijn %2, kolom %3:
         <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
-        <source>%1 %2</source>
-        <translation type="unfinished">%1 %2</translation>
+        <source>%1%2</source>
+        <translation type="unfinished">%1%2</translation>
     </message>
 </context>
 <context>
@@ -5406,42 +5759,42 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="118"/>
+        <location filename="../dem/IDemList.ui" line="112"/>
         <source>To add files with elevation data use <b>File->Setup DEM Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="131"/>
+        <location filename="../dem/IDemList.ui" line="125"/>
         <source>Use the context menu (right mouse button click on entry) to activate a file. Use drag-n-drop to move the activated file in the process order. </source>
         <translation>Gebruik het menu (rechter muisklik op item) om bestand te activeren. Gebruik selecteer en slepen om geactiveerde bestanden in volgorde te plaatsen.</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="156"/>
+        <location filename="../dem/IDemList.ui" line="150"/>
         <source>Activate</source>
         <translation>Activeer</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="165"/>
+        <location filename="../dem/IDemList.ui" line="159"/>
         <source>Move Up</source>
         <translation>Omhoog</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="168"/>
+        <location filename="../dem/IDemList.ui" line="162"/>
         <source>Hide DEM behind previous one</source>
         <translation>Verberg DEM onder vorige</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="177"/>
+        <location filename="../dem/IDemList.ui" line="171"/>
         <source>Move down</source>
         <translation>Omlaag</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="180"/>
+        <location filename="../dem/IDemList.ui" line="174"/>
         <source>Show DEM on top of next one</source>
         <translation>Toon DEM op de volgende</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="189"/>
+        <location filename="../dem/IDemList.ui" line="183"/>
         <source>Reload DEM</source>
         <translation>DEM herladen</translation>
     </message>
@@ -5982,7 +6335,7 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="292"/>
+        <location filename="../device/IDevice.cpp" line="314"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation>Er is al een ander project met dezelfde naam. Bij drukken op 'OK' zal deze overschreven worden.</translation>
     </message>
@@ -6477,89 +6830,117 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
     </message>
 </context>
 <context>
+    <name>IGisDatabase</name>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulier</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="59"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="64"/>
+        <source>Age</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="97"/>
+        <source>To add a database do a right click on the database list above.</source>
+        <translation type="unfinished">Om nieuwe database te maken doe een rechterklik op database erboven.</translation>
+    </message>
+</context>
+<context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="44"/>
+        <location filename="../gis/IGisItem.cpp" line="45"/>
         <source>[no name]</source>
         <translation>[geen naam]</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>The item is not part of the project in the database.</source>
         <translation>Het item is geen deel van het project in de database.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="317"/>
+        <location filename="../gis/IGisItem.cpp" line="318"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="323"/>
+        <location filename="../gis/IGisItem.cpp" line="324"/>
         <source>The item is not in the database.</source>
         <translation>Het item is niet in de database.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="329"/>
+        <location filename="../gis/IGisItem.cpp" line="330"/>
         <source>The item might need to be saved</source>
         <translation>Het item dient opgeslagen te worden</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="413"/>
+        <location filename="../gis/IGisItem.cpp" line="414"/>
         <source>Initial version.</source>
         <translation>Orginele versie.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="529"/>
+        <location filename="../gis/IGisItem.cpp" line="534"/>
+        <source>Never ask again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="535"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation><h3>%1<h3>Dit element is waarschijnlijk alleen lezen omdat dit niet gemaakt is in QMapShack. Normaal hoeven geen gegevens aangepast te worden na het importeren.  Om toch aan te passen druk dan op 'OK'.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="530"/>
+        <location filename="../gis/IGisItem.cpp" line="536"/>
         <source>Read Only Mode...</source>
         <translation>Alleen lezen modus...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="700"/>
-        <location filename="../gis/IGisItem.cpp" line="753"/>
+        <location filename="../gis/IGisItem.cpp" line="713"/>
+        <location filename="../gis/IGisItem.cpp" line="766"/>
         <source><h4>Description:</h4></source>
         <translation><h4>Beschrijving:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="703"/>
-        <location filename="../gis/IGisItem.cpp" line="756"/>
+        <location filename="../gis/IGisItem.cpp" line="716"/>
+        <location filename="../gis/IGisItem.cpp" line="769"/>
         <source><p>--- no description ---</p></source>
         <translation><p>--- geen beschrijving ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="714"/>
+        <location filename="../gis/IGisItem.cpp" line="727"/>
         <source><h4>Comment:</h4></source>
         <translation><h4>Notitie:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="717"/>
+        <location filename="../gis/IGisItem.cpp" line="730"/>
         <source><p>--- no comment ---</p></source>
         <translation><p>--- geen notitie ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="728"/>
-        <location filename="../gis/IGisItem.cpp" line="767"/>
+        <location filename="../gis/IGisItem.cpp" line="741"/>
+        <location filename="../gis/IGisItem.cpp" line="780"/>
         <source><h4>Links:</h4></source>
         <translation><h4>Links:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="731"/>
-        <location filename="../gis/IGisItem.cpp" line="770"/>
+        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="783"/>
         <source><p>--- no links ---</p></source>
         <translation><p>--- geen links ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Edit name...</source>
         <translation type="unfinished">Bewerk naam...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Enter new %1 name.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6567,119 +6948,108 @@ It is either a new item or it has been deleted in the database by someone else.<
 <context>
     <name>IGisProject</name>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source>Save project?</source>
         <translation>Project opslaan?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source><h3>%1</h3>The project was changed. Save before closing it?</source>
         <translation><h3>%1</h3>Het project is veranderd. Voor het sluiten opslaan?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="356"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="375"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation>%1: Correlatie van tracks en waypointen.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="366"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="385"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation><h3>%1</h3>Duurde dit te lang? Moet de correlatie van tracks en waypointen in dit project in de toekomst overgeslagen worden?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="367"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="386"/>
         <source>Canceled correlation...</source>
         <translation>Correlatie geanuleerd...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="412"/>
-        <location filename="../gis/prj/IGisProject.cpp" line="469"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="431"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="488"/>
         <source>Save "%1" to...</source>
         <translation>Opslaan "%1" als...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="554"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="573"/>
         <source><br/>
 Filename: %1</source>
         <translation><br/>
 Bestandsnaam: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="559"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="578"/>
         <source>Waypoints: %1</source>
         <translation>Waypoints: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="563"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="582"/>
         <source>Tracks: %1</source>
         <translation>Tracks: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="567"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="586"/>
         <source>Routes: %1</source>
         <translation>Routes: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="571"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="590"/>
         <source>Areas: %1</source>
         <translation>Gebieden: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="691"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="733"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation>Moet '%1' werkelijk verwijderd worden uit project '%2'?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="692"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="734"/>
         <source>Delete...</source>
         <translation>Verwijderen...</translation>
     </message>
 </context>
 <context>
-    <name>IGisWidget</name>
+    <name>IGisWorkspace</name>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="14"/>
+        <location filename="../gis/IGisWorkspace.ui" line="14"/>
         <source>Form</source>
-        <translation>Formulier</translation>
+        <translation type="unfinished">Formulier</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="43"/>
+        <location filename="../gis/IGisWorkspace.ui" line="43"/>
         <source>Opacity</source>
         <translation type="unfinished">Transparantie</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="50"/>
+        <location filename="../gis/IGisWorkspace.ui" line="50"/>
         <source>Change the opacity of all GIS Items on the map.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="66"/>
+        <location filename="../gis/IGisWorkspace.ui" line="66"/>
         <source>Filter</source>
         <translation type="unfinished">Filter</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="116"/>
-        <location filename="../gis/IGisWidget.ui" line="146"/>
+        <location filename="../gis/IGisWorkspace.ui" line="116"/>
         <source>Name</source>
-        <translation>Naam</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="151"/>
-        <source>Age</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="185"/>
-        <source>To add a database do a right click on the database list above.</source>
-        <translation>Om nieuwe database te maken doe een rechterklik op database erboven.</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="205"/>
+        <location filename="../gis/IGisWorkspace.ui" line="129"/>
         <source>Clear Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <location filename="../gis/IGisWorkspace.ui" line="138"/>
         <source>Setup Filter</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6781,7 +7151,7 @@ Bestandsnaam: %1</translation>
 <context>
     <name>ILineOp</name>
     <message>
-        <location filename="../mouse/line/ILineOp.cpp" line="212"/>
+        <location filename="../mouse/line/ILineOp.cpp" line="279"/>
         <source>Routing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6833,378 +7203,394 @@ Bestandsnaam: %1</translation>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="103"/>
+        <location filename="../IMainWindow.ui" line="104"/>
         <source>Window</source>
         <translation>Venster</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="113"/>
+        <location filename="../IMainWindow.ui" line="114"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="121"/>
-        <source>Project</source>
-        <translation>Project</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="132"/>
+        <location filename="../IMainWindow.ui" line="133"/>
         <source>Tool</source>
         <translation>Extra</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="157"/>
+        <location filename="../IMainWindow.ui" line="152"/>
         <source>Maps</source>
         <translation>Kaarten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="200"/>
+        <location filename="../IMainWindow.ui" line="189"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation>Dig. Elev. Model (DEM)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="239"/>
-        <source>Data</source>
-        <translation>Gegevens</translation>
+        <location filename="../IMainWindow.ui" line="122"/>
+        <location filename="../IMainWindow.ui" line="222"/>
+        <source>Workspace</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="257"/>
-        <source>Route</source>
-        <translation>Route</translation>
+        <location filename="../IMainWindow.ui" line="231"/>
+        <source>Toolbar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="287"/>
-        <source>Toolbar</source>
+        <location filename="../IMainWindow.ui" line="257"/>
+        <source>Routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="302"/>
-        <location filename="../IMainWindow.ui" line="305"/>
+        <location filename="../IMainWindow.ui" line="276"/>
+        <location filename="../IMainWindow.ui" line="279"/>
         <source>Add Map View</source>
         <translation>Nieuw venster</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="308"/>
+        <location filename="../IMainWindow.ui" line="282"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="323"/>
+        <location filename="../IMainWindow.ui" line="297"/>
         <source>Show Scale</source>
         <translation>Toon schaal</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="335"/>
+        <location filename="../IMainWindow.ui" line="309"/>
         <source>Setup Map Font</source>
         <translation>Lettertype kaart instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="350"/>
+        <location filename="../IMainWindow.ui" line="324"/>
         <source>Show Grid</source>
         <translation>Toon raster</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="353"/>
+        <location filename="../IMainWindow.ui" line="327"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="365"/>
+        <location filename="../IMainWindow.ui" line="339"/>
         <source>Setup Grid</source>
         <translation>Raster instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="368"/>
+        <location filename="../IMainWindow.ui" line="342"/>
         <source>Ctrl+Alt+G</source>
         <translation>Ctrl+Alt+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="383"/>
+        <location filename="../IMainWindow.ui" line="357"/>
         <source>Flip Mouse Wheel</source>
         <translation>Draai muiswiel om</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="395"/>
-        <location filename="../IMainWindow.ui" line="398"/>
+        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="372"/>
         <source>Setup Map Paths</source>
         <translation>Map met kaarten instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="413"/>
+        <location filename="../IMainWindow.ui" line="387"/>
         <source>POI Text</source>
         <translation>POI tekst</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="428"/>
+        <location filename="../IMainWindow.ui" line="402"/>
         <source>Night / Day</source>
         <translation>Dag/Nacht</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="443"/>
+        <location filename="../IMainWindow.ui" line="417"/>
         <source>Map Tool Tip</source>
         <translation>Map Tool Tip</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="446"/>
+        <location filename="../IMainWindow.ui" line="420"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="458"/>
+        <location filename="../IMainWindow.ui" line="432"/>
         <source>Setup DEM Paths</source>
         <translation>Map DEM instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="470"/>
+        <location filename="../IMainWindow.ui" line="444"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="482"/>
+        <location filename="../IMainWindow.ui" line="456"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="485"/>
+        <location filename="../IMainWindow.ui" line="459"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="497"/>
-        <location filename="../IMainWindow.ui" line="500"/>
+        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="474"/>
         <source>Setup Map View</source>
         <translation>Kaartinstellingen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="512"/>
+        <location filename="../IMainWindow.ui" line="486"/>
         <source>Load GIS Data</source>
         <translation>GIS gegevens laden</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="515"/>
+        <location filename="../IMainWindow.ui" line="489"/>
         <source>Load projects from file</source>
         <translation>Project laden uit bestand</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="518"/>
+        <location filename="../IMainWindow.ui" line="492"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="530"/>
+        <location filename="../IMainWindow.ui" line="504"/>
         <source>Save All GIS Data</source>
         <translation>GIS gegevens opslaan</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="533"/>
+        <location filename="../IMainWindow.ui" line="507"/>
         <source>Save all projects in the workspace</source>
         <translation>Sla alle projecten op in werkruimte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="536"/>
+        <location filename="../IMainWindow.ui" line="510"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="548"/>
+        <location filename="../IMainWindow.ui" line="522"/>
         <source>Setup Time Zone</source>
         <translation>Tijdzone instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="560"/>
+        <location filename="../IMainWindow.ui" line="534"/>
         <source>Add empty project</source>
         <translation>Nieuw leeg project</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="575"/>
+        <location filename="../IMainWindow.ui" line="549"/>
         <source>Search Google</source>
         <translation>Zoeken Google</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="587"/>
+        <location filename="../IMainWindow.ui" line="561"/>
         <source>Close all projects</source>
         <translation>Sluit alle projecten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="590"/>
+        <location filename="../IMainWindow.ui" line="564"/>
         <source>F8</source>
         <translation>F8</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="602"/>
+        <location filename="../IMainWindow.ui" line="576"/>
         <source>Setup Units</source>
         <translation>Eenheden instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="614"/>
+        <location filename="../IMainWindow.ui" line="588"/>
         <source>Setup Workspace</source>
         <translation>Werkruimte instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="617"/>
+        <location filename="../IMainWindow.ui" line="591"/>
         <source>Setup save on exit.</source>
         <translation>Oplaan bij afsluiten instellen.</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="629"/>
+        <location filename="../IMainWindow.ui" line="603"/>
         <source>Import Database from QLandkarte</source>
         <translation>Database van QLandkarte importeren</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="632"/>
+        <location filename="../IMainWindow.ui" line="606"/>
         <source>Import QLandkarte GT database</source>
         <translation>QLandkarte database importeren</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="644"/>
+        <location filename="../IMainWindow.ui" line="618"/>
         <source>VRT Builder</source>
         <translation>VRT maken</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="647"/>
+        <location filename="../IMainWindow.ui" line="621"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation>GUI front end naar gdalbuildvrt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="659"/>
+        <location filename="../IMainWindow.ui" line="633"/>
         <source>Store Map View</source>
         <translation>Kaart opslaan</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="662"/>
+        <location filename="../IMainWindow.ui" line="636"/>
         <source>Write current active map and DEM list including the properties to a file</source>
         <translation>Schrijf huidige actieve kaart en DEM lijst inclusief de eigenschappen naar een bestand</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="674"/>
+        <location filename="../IMainWindow.ui" line="648"/>
         <source>Load Map View</source>
         <translation>Kaart laden</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="677"/>
+        <location filename="../IMainWindow.ui" line="651"/>
         <source>Restore view with active map and DEM list including the properties from a file</source>
         <translation>Herstel huidige actieve kaart en DEM lijst inclusief de eigenschappen naar een bestand</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="692"/>
+        <location filename="../IMainWindow.ui" line="666"/>
         <source>Ext. Profile</source>
         <translation>Ext. profiel</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="695"/>
+        <location filename="../IMainWindow.ui" line="669"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="707"/>
+        <location filename="../IMainWindow.ui" line="681"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="710"/>
+        <location filename="../IMainWindow.ui" line="684"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="722"/>
+        <location filename="../IMainWindow.ui" line="696"/>
         <source>Clone Map View</source>
         <translation>Kloon venster</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="725"/>
+        <location filename="../IMainWindow.ui" line="699"/>
         <source>Ctrl+Shift+T</source>
         <translation>Ctrl+Shift+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="737"/>
+        <location filename="../IMainWindow.ui" line="711"/>
         <source>Create Routino Database</source>
         <translation>Maak Routino database</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="749"/>
+        <location filename="../IMainWindow.ui" line="723"/>
         <source>Save(Print) Map Screenshot</source>
         <translation>Kaartdeel opslaan/afdrukken</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="752"/>
+        <location filename="../IMainWindow.ui" line="726"/>
         <source>Print a selected area of the map</source>
         <translation>Geselecteerde deel van kaart afdrukken</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="755"/>
+        <location filename="../IMainWindow.ui" line="729"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="767"/>
+        <location filename="../IMainWindow.ui" line="741"/>
         <source>Setup Coord. Format</source>
         <translation>Coördinaat formaat instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="770"/>
+        <location filename="../IMainWindow.ui" line="744"/>
         <source>Change the format coordinates are displayed</source>
         <translation>Getoonde coördinaat formaat aanpassen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="782"/>
+        <location filename="../IMainWindow.ui" line="756"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="794"/>
+        <location filename="../IMainWindow.ui" line="768"/>
         <source>Setup Waypoint Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="797"/>
+        <location filename="../IMainWindow.ui" line="771"/>
         <source>Setup path to custom icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="806"/>
+        <location filename="../IMainWindow.ui" line="780"/>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="809"/>
+        <location filename="../IMainWindow.ui" line="783"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="818"/>
+        <location filename="../IMainWindow.ui" line="792"/>
         <source>Quickstart Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="827"/>
+        <location filename="../IMainWindow.ui" line="801"/>
         <source>Setup Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="839"/>
+        <location filename="../IMainWindow.ui" line="813"/>
         <source>Toggle Docks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="842"/>
+        <location filename="../IMainWindow.ui" line="816"/>
         <source>Toggle visibility of dockable windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="845"/>
+        <location filename="../IMainWindow.ui" line="819"/>
         <source>Ctrl+D</source>
         <translation type="unfinished">Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="854"/>
+        <location filename="../IMainWindow.ui" line="828"/>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="857"/>
+        <location filename="../IMainWindow.ui" line="831"/>
         <source>F11</source>
         <translation type="unfinished">F11</translation>
     </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="843"/>
+        <source>Min./Max. Track Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="846"/>
+        <source>Show the minimum and maximum values of the track properties along the track in the map view.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="849"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="245"/>
+        <source>Database</source>
+        <translation type="unfinished">Database</translation>
+    </message>
 </context>
 <context>
     <name>IMapList</name>
@@ -7437,14 +7823,18 @@ Ik wil de documentatie niet lezen!</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
-        <source>1. Select one or multiple source files.
-2. Select a file name for the target VRT file.
-3. Press "Start" button.
+        <source><ol>
+<li>Select one or multiple source files.</li>
+<li>Select a file name for the target VRT file.</li>
+<li>Press "Start" button.</li>
+</ol>
 
 Tip:
-* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
-* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
-* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
+<ul>
+<li>If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.</li>
+<li>Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.</li>
+<li>The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</li>
+</ul></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7482,62 +7872,62 @@ Tip:
         <translation><b>Nieuwe lijn</b><br/>Verplaats de muis en gebruik linker muisknop om een punt te plaatsen. Gebruik rechter muisknop om te stoppen.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="289"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="300"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation><b>Verwijder punt</b><br/>Beweeg de muis dicht bij een punt en druk op linkermuisknop om te verwijderen.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="297"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="308"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation><b>Selecteer reeks punten</b><br/>Klik op eerste punt van reeks. Klik op laatste punt van reeks en selecteer een optie. Gebruik rechter muisknop om te annuleren.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="305"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="316"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Verplaats punt</b><br/>Beweeg de muis dicht bij een punt en druk op linkermuisknop om het punt te laten plakken. Beweeg de muis om het punt te verplaatsen. Laat het punt los met linker muisknop. Gebruik rechterknop om te annuleren.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="313"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Punt toevoegen</b><br/>Beweeg de muis dicht bij een lijndeel en druk op linkermuisknop om het punt te laten plakken. Beweeg de muis om het punt te verplaatsen. Laat het punt los met linker muisknop. Gebruik rechterknop om te annuleren.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="321"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation><b>Geen routing</b><br/>Alle punten zullen met rechte lijnen verbonden worden.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="327"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation><b>Auto routing</b><br/>De huidige instelling wordt gebruikt voor berekening van een route tussen punten. <b>Notitie:</b>De geselecteerd route moet zelf routes kunnen maken. Offline routers kunnen dit online routers meestal niet.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="343"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation><b>Vector routing</b><br/>Verbind punten met een lijn op een geladen vector kaart indien mogelijk.</br></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="504"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="515"/>
         <source><b>%1 Metrics</b></source>
         <translation><b>%1 gegevens</b></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="507"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="518"/>
         <source>Distance:</source>
         <translation>Afstand:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="509"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="520"/>
         <source>Ascent:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="511"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="522"/>
         <source>Descent:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.h" line="135"/>
+        <location filename="../mouse/line/IMouseEditLine.h" line="137"/>
         <source><br/><b>Move the map</b><br/>If you keep the left mouse button pressed and move the mouse, you will move the map.<br/><br/></source>
         <translation type="unfinished"></translation>
     </message>
@@ -7828,6 +8218,21 @@ of
         <source>Caution! BRouter is listening on all ports for connections.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="217"/>
+        <source><p><a href="http://brouter.de/brouter/" target="_blank">BRouter</a> © <a href="https://github.com/abrensch/brouter/blob/master/LICENSE" target="_blank">ABrensch, Licence GPLv3</a></p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="227"/>
+        <source><p>Directions Courtesy of <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="237"/>
+        <source><p>Routing data <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a> contributors</p></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRouterBRouterInfo</name>
@@ -8116,7 +8521,7 @@ of
         <translation>Taal</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="131"/>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="118"/>
         <source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path. You can create your own routing data with <b>Tool->Create Routino Database</b>.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8156,13 +8561,13 @@ of
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="22"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="25"/>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="63"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="39"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="42"/>
         <source>Select source files:</source>
         <translation>Selecteer bronbestand:</translation>
     </message>
@@ -8186,6 +8591,18 @@ of
         <source>File Prefix</source>
         <translation>Bestandsextentie</translation>
     </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="133"/>
+        <source><p>To create a Routino routing database you need to download *pbf files from <a href='http://download.geofabrik.de/'>GeoFabrik</a>. The process of creating a Routino database is quite slow and the resulting files quite large. Therefore it's recommended not to download whole continents. Limit your download to those countries you really need. However as Routino can't route over several databases you have to include all countries that ar [...]
+
+<ol>
+<li>Select one or multiple source *.pbf files.</li>
+<li>Select a path for your Routino database.</li>
+<li>Select a prefix. The database will be listed by this prefix.</li>
+<li>Press "Start" button.</li>
+</ol></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IScrOptEditLine</name>
@@ -8701,6 +9118,8 @@ of
         <location filename="../gis/wpt/IScrOptWpt.ui" line="101"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="118"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="132"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="153"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="170"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -8730,12 +9149,62 @@ of
         <translation>Kloon waypoint en verplaats deze naar aangegeven afstand en hoek.</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="176"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="150"/>
+        <source>edit radius of circular area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="167"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="185"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="232"/>
         <source>TextLabel</source>
         <translation>Benaming</translation>
     </message>
 </context>
 <context>
+    <name>IScrOptWptRadius</name>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulier</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="49"/>
+        <source>edit radius of circular area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="52"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="66"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="84"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="63"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="81"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="128"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ISearchDatabase</name>
     <message>
         <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
@@ -9566,6 +10035,11 @@ of
         <source>short format</source>
         <translation>kort formaat</translation>
     </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="123"/>
+        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
+        <translation type="unfinished"><b>Notitie:</b>Na het wijzigingen  van de eenheden is het nodig om QMapShack opnieuw op te starten.</translation>
+    </message>
 </context>
 <context>
     <name>IToolBarSetupDialog</name>
@@ -9626,13 +10100,13 @@ of
 <context>
     <name>IUnit</name>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
         <source>Bad position format. Must be: "[N|S] ddd mm.sss [W|E] ddd mm.sss" or "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
         <translation>Verkeerde invoer. Moet zijn: 
 "[N|Z] ddd mm.sss [W|O] ddd mm.sss"
@@ -9640,7 +10114,7 @@ of
 "[N|Z] ddd.ddd [W|O] ddd.ddd"</translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Position values out of bounds. </source>
         <translation>Positiewaarden vallen buiten bereik. </translation>
     </message>
@@ -9653,22 +10127,42 @@ of
         <translation>Eenheden instellen...</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="38"/>
+        <location filename="../units/IUnitsSetup.ui" line="36"/>
+        <source>Length unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="74"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="47"/>
+        <location filename="../units/IUnitsSetup.ui" line="80"/>
+        <source>Slope unit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="92"/>
+        <source>Degrees (°)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="105"/>
+        <source>Percent (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="133"/>
         <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
         <translation><b>Notitie:</b>Na het wijzigingen  van de eenheden is het nodig om QMapShack opnieuw op te starten.</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="31"/>
+        <location filename="../units/IUnitsSetup.ui" line="61"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="24"/>
+        <location filename="../units/IUnitsSetup.ui" line="48"/>
         <source>Nautic</source>
         <translation>Nautisch</translation>
     </message>
diff --git a/src/locale/qmapshack_ru.ts b/src/locale/qmapshack_ru.ts
index 0ba893f..f18ece6 100644
--- a/src/locale/qmapshack_ru.ts
+++ b/src/locale/qmapshack_ru.ts
@@ -120,12 +120,12 @@
 <context>
     <name>CCanvas</name>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="61"/>
+        <location filename="../canvas/CCanvas.cpp" line="63"/>
         <source>View %1</source>
         <translation>Вид %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="705"/>
+        <location filename="../canvas/CCanvas.cpp" line="766"/>
         <source>Setup Map Background</source>
         <translation>Настройка фона карт</translation>
     </message>
@@ -270,27 +270,27 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="113"/>
+        <location filename="../gis/db/CDBProject.cpp" line="114"/>
         <source>Failed to load...</source>
         <translation>Не удалось загрузить...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="114"/>
+        <location filename="../gis/db/CDBProject.cpp" line="115"/>
         <source>Can't load file "%1" . It will be skipped.</source>
         <translation>Загрузить файл %1 не удалось. Он будет пропущен.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="127"/>
+        <location filename="../gis/db/CDBProject.cpp" line="128"/>
         <source>Project already in database...</source>
         <translation>Проект уже в базе данных...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="128"/>
+        <location filename="../gis/db/CDBProject.cpp" line="129"/>
         <source>The project "%1" has already been imported into the database. It will be skipped.</source>
         <translation>Проект "%1" уже был загружен в базу данных. Он будет пропущен.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="279"/>
+        <location filename="../gis/db/CDBProject.cpp" line="280"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -299,47 +299,47 @@ To solve this conflict you can create and save a clone, force your version or dr
 Для решения этого конфликта можно создать и сохранить клон, заставить вашу версию или бросить вашу версию и взять версию базы данных</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="285"/>
+        <location filename="../gis/db/CDBProject.cpp" line="286"/>
         <source>Conflict with database...</source>
         <translation>Конфликт с базой данных...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="286"/>
+        <location filename="../gis/db/CDBProject.cpp" line="287"/>
         <source>Clone && Save</source>
         <translation>Клонировать и сохранить</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="287"/>
+        <location filename="../gis/db/CDBProject.cpp" line="288"/>
         <source>Force Save</source>
         <translation>Сохранить принудительно</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="288"/>
+        <location filename="../gis/db/CDBProject.cpp" line="289"/>
         <source>Take remote</source>
         <translation>Взять удаленную версию</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="572"/>
+        <location filename="../gis/db/CDBProject.cpp" line="573"/>
         <source>Missing folder...</source>
         <translation>Отсутствует папка...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="573"/>
+        <location filename="../gis/db/CDBProject.cpp" line="574"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation>Не удалось сохранить проект. Папка удалена с базы данных.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="580"/>
+        <location filename="../gis/db/CDBProject.cpp" line="581"/>
         <source>Save ...</source>
         <translation>Сохранить ...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="644"/>
+        <location filename="../gis/db/CDBProject.cpp" line="645"/>
         <source>There was an unexpected database error:
 
 %1</source>
@@ -348,12 +348,12 @@ To solve this conflict you can create and save a clone, force your version or dr
 %1</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="760"/>
+        <location filename="../gis/db/CDBProject.cpp" line="761"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation>Проект '%1' собирается обновить себя с базы данных. Однако имеются несохранённые изменения.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="761"/>
+        <location filename="../gis/db/CDBProject.cpp" line="762"/>
         <source>Save changes?</source>
         <translation>Сохранить изменения?</translation>
     </message>
@@ -508,17 +508,17 @@ To solve this conflict you can create and save a clone, force your version or dr
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
-        <source>distance: </source>
+        <source>Distance: </source>
         <translation>Расстояние: </translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
-        <source>ascent: </source>
+        <source>Ascent: </source>
         <translation>Подъем: </translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
-        <source>descent: </source>
+        <source>Descent: </source>
         <translation>Спуск: </translation>
     </message>
     <message>
@@ -597,7 +597,7 @@ To solve this conflict you can create and save a clone, force your version or dr
     <message>
         <location filename="../gis/wpt/CDetailsWpt.cpp" line="166"/>
         <source>Enter new proximity range.</source>
-        <translation>Ввести новый диапазон приближения.</translation>
+        <translation>Ввести новый радиус близости.</translation>
     </message>
 </context>
 <context>
@@ -917,8 +917,19 @@ To solve this conflict you can create and save a clone, force your version or dr
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
-        <source>Length: %1 %2</source>
-        <translation>Длина: %1 %2</translation>
+        <source>Length: %1%2</source>
+        <translation>Длина: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
+        <source>Time: %1%2</source>
+        <translation>Время: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
+        <source>Distance: %1%2</source>
+        <translation>Расстояние: %1 %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
@@ -926,12 +937,6 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation>Длина: -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="600"/>
-        <source>Time: %1 %2</source>
-        <translation>Время: %1 %2</translation>
-    </message>
-    <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
         <source>Time: -</source>
         <translation>Время: -</translation>
@@ -952,11 +957,6 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation>с %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
-        <source>Distance: %1 %2</source>
-        <translation>Расстояние: %1 %2</translation>
-    </message>
-    <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
         <source>Changed route points.</source>
         <translation>Изменены точки маршрута.</translation>
@@ -996,262 +996,284 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation>Не удалось читать данные.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="80"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="78"/>
         <source>_Clone</source>
         <translation>_клон</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="251"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="261"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation>Изменены точки трека, удалены все предыдущие данные.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
-        <source>Length: %1 %2</source>
-        <translation>Длина: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
-        <source>, %1%2 %3, %4%5 %6</source>
-        <translation>, %1%2 %3, %4%5 %6</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
         <source>, %1-, %2-</source>
         <translation>, %1-, %2-</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="396"/>
+        <source>Time: %1%2, Speed: %3%4</source>
+        <translation>Время: %1%2, Скорость: %3%4</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
         <source>Time: -, Speed: -</source>
         <translation>Время: -, скорость: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="408"/>
+        <source>Moving: %1%2, Speed: %3%4</source>
+        <translation>В движении: %1%2, Скорость: %3%4</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Moving: -, Speed: -</source>
         <translation>В движении: -, скорость: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="421"/>
         <source>Start: %1</source>
         <translation>Начало: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
         <source>Start: -</source>
         <translation>Начало: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
         <source>End: %1</source>
         <translation>Конец: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
         <source>End: -</source>
         <translation>Конец: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
         <source>Points: %1 (%2)</source>
         <translation>Точки: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="443"/>
         <source>Invalid elevations!</source>
         <translation>Неверные высоты!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>Invalid timestamps!</source>
         <translation>Неверные метки времени!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
         <source>Invalid positions!</source>
         <translation>Неверные позиции!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
         <source>Activities: %1</source>
         <translation>Мероприятие: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="574"/>
         <source>Index: %1</source>
         <translation>Индекс: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
         <source>Index: visible %1, total %2</source>
         <translation>Индекс: видимо %1, всего %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
-        <source>Ele.: %1 %2</source>
-        <translation>Высота: %1 %2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+        <source>, Slope: %1%2</source>
+        <translation>, Склон: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
-        <source> slope: %1%3 (%2%)</source>
-        <translation> склон: %1%3 (%2%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
-        <source> speed: %1%2</source>
-        <translation> скорость: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
         <source>... and %1 tags not displayed</source>
         <translation>... и %1 не показанных элементов</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
         <source>Distance: - (-)</source>
         <translation>Расстояние: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
         <source>Moving: - (-)</source>
         <translation>В движении: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1318"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1331"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1387"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1570"/>
         <source>track</source>
         <translation>трек</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1522"/>
         <source>Hide point %1.</source>
         <translation>Скрыть точку %1.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1526"/>
         <source>Hide points %1..%2.</source>
         <translation>Скрыть точки %1..%2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
-        <source> Moving: %1%2 (%3%)</source>
-        <translation> В движении: %1 %2 (%3%)</translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="701"/>
         <source>, %1%2</source>
         <translation>, %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
-        <source> Time: %1%2</source>
-        <translation> Время: %1 %2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="124"/>
+        <source>Invalid points....</source>
+        <translation>Неверные точки...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
-        <source>Time: %1, Speed: %2 %3</source>
-        <translation>Время: %1, скорость: %2 %3</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="125"/>
+        <source>The track '%1' has %2 invalid points out of %3 visible points. Do you want to hide invalid points now?</source>
+        <translation>Трек '%1' имеет %2 неверных точек из %3 видимых точек. Вы хотите скрыть неверные очки?</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
-        <source>Moving: %1, Speed: %2 %3</source>
-        <translation>В движении: %1, скорость: %2 %3</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>min.</source>
+        <translation>мин.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+        <source>max.</source>
+        <translation>макс.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="377"/>
+        <source>Length: %1%2</source>
+        <translation>Длина: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
+        <source>, %1%2%3, %4%5%6</source>
+        <translation>, %1%2 %3, %4%5%6</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="589"/>
+        <source>Ele.: %1%2</source>
+        <translation>Высота: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <source>, Speed: %1%2</source>
+        <translation>, Скорость: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="636"/>
         <source>Ascent: - (-)</source>
         <translation>Подъем: -(-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>Descent: - (-)</source>
         <translation>Спуск: -(-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="644"/>
         <source>Ascent: %1%2 (%3%)</source>
         <translation>Подъем: %1 %2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
-        <source> Descent: %1%2 (%3%)</source>
-        <translation> Спуск: %1 %2 (%3%)</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
+        <source>, Descent: %1%2 (%3%)</source>
+        <translation>, Спуск: %1 %2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
         <source>Distance: %1%2 (%3%)</source>
         <translation>Расстояние: %1 %2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <source>, Moving: %1%2 (%3%)</source>
+        <translation>, В движении: %1%2 (%3%)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
         <source>Ascent: -</source>
         <translation>Подъем: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
         <source>Descent: -</source>
         <translation>Спуск: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
         <source>Ascent: %1%2</source>
         <translation>Подъем: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
-        <source> Descent: %1%2</source>
-        <translation> Спуск: %1 %2</translation>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="696"/>
+        <source>, Descent: %1%2</source>
+        <translation>, Спуск: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="706"/>
         <source>Distance: %1%2</source>
         <translation>Расстояние: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="711"/>
+        <source>, Time: %1%2</source>
+        <translation>, Время: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1377"/>
         <source>Permanently removed points %1..%2</source>
         <translation>Удалены безвозвратно точки %1..%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1555"/>
         <source>Show points.</source>
         <translation>Показать точки.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2194"/>
         <source>Changed name</source>
         <translation>Изменено имя</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2200"/>
         <source>Changed comment</source>
         <translation>Изменен комментарий</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2206"/>
         <source>Changed description</source>
         <translation>Изменено описание</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed links</source>
         <translation>Изменены ссылки</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2223"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation>Изменена высота точки %1 на %2 %3</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2247"/>
         <source>Changed activity to '%1' for complete track.</source>
         <translation>Изменено мероприятие на '%1' для всего трека.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2286"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation>Изменено мероприятие на '%1' для интервала (%2..%3).</translation>
     </message>
@@ -1336,7 +1358,7 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation>Преобразованы подточки с маршрутных в точки трека</translation>
     </message>
     <message>
-        <location filename="../qlgt/converter.cpp" line="195"/>
+        <location filename="../qlgt/converter.cpp" line="196"/>
         <source>Copy flag information from QLandkarte GT track</source>
         <translation>Скопировать информацию о флагах с трека QLandkarte GT</translation>
     </message>
@@ -1359,70 +1381,85 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation>Не доступно</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="104"/>
         <source>_Clone</source>
         <translation>_клон</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
-        <source>Elevation: %1 %2</source>
-        <translation>Высота: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="277"/>
+        <source>Elevation: %1%2</source>
+        <translation>Высота: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
-        <source>Proximity: %1 %2</source>
-        <translation>Приближение: %1 %2</translation>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="288"/>
+        <source>Proximity: %1%2</source>
+        <translation>Радиус близости: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
         <source>Changed name</source>
         <translation>Изменено имя</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
         <source>Changed position</source>
         <translation>Изменена позиция</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
         <source>Changed elevation</source>
         <translation>Изменена высота</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="413"/>
+        <source>Removed proximity</source>
+        <translation>Удален радиус близости</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="417"/>
         <source>Changed proximity</source>
-        <translation>Изменена приближение</translation>
+        <translation>Изменен радиус близости</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="432"/>
         <source>Changed icon</source>
         <translation>Изменена пиктограмма</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="438"/>
         <source>Changed comment</source>
         <translation>Изменен комментарий</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="444"/>
         <source>Changed description</source>
         <translation>Изменено описание</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="450"/>
         <source>Changed links</source>
         <translation>Изменены ссылки</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="456"/>
         <source>Changed images</source>
         <translation>Изменены изображения</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="462"/>
         <source>Add image</source>
         <translation>Добавить изображение</translation>
     </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="877"/>
+        <source>Changed to proximity-radius</source>
+        <translation>Изменено на круг близости</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="882"/>
+        <source>Changed to nogo-area</source>
+        <translation>Изменено на запретную зону </translation>
+    </message>
 </context>
 <context>
     <name>CGisListDB</name>
@@ -1577,249 +1614,269 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CGisListWks</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="101"/>
+        <location filename="../gis/CGisListWks.cpp" line="106"/>
         <source>Edit..</source>
         <translation>Изменить..</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
         <source>Show on Map</source>
         <translation>Показать на карте</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="109"/>
         <source>Hide from Map</source>
         <translation>Скрыть с карты</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="109"/>
+        <location filename="../gis/CGisListWks.cpp" line="114"/>
         <source>Sort by Time</source>
         <translation>Сортировать по времени</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="110"/>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Sort by Name</source>
         <translation>Сортировать по именам</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="117"/>
+        <location filename="../gis/CGisListWks.cpp" line="122"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="119"/>
+        <location filename="../gis/CGisListWks.cpp" line="124"/>
         <source>Save as GPX 1.1 w/o ext...</source>
         <translation>Сохранить как GPX 1.1 без расширений...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="122"/>
+        <location filename="../gis/CGisListWks.cpp" line="127"/>
         <source>Send to Devices</source>
         <translation>Отправить в устройства</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Sync. with Database</source>
         <translation>Синхронизировать с базой данных</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="126"/>
+        <location filename="../gis/CGisListWks.cpp" line="131"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="140"/>
         <source>Update Project on Device</source>
         <translation>Обновить проект на устройстве</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="166"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="149"/>
+        <location filename="../gis/CGisListWks.cpp" line="154"/>
         <source>Edit...</source>
         <translation>Изменить...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="102"/>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="155"/>
         <source>Copy to...</source>
         <translation>Копировать в...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="113"/>
+        <location filename="../gis/CGisListWks.cpp" line="118"/>
         <source>Autom. Save</source>
         <translation>Сохранить автоматически</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="118"/>
+        <location filename="../gis/CGisListWks.cpp" line="123"/>
         <source>Save as...</source>
         <translation>Сохранить как...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Track Profile</source>
         <translation>Профиль трека</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="154"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Select Range</source>
         <translation>Выделить интервал</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="155"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Edit Track Points</source>
         <translation>Изменить точки трека</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="156"/>
+        <location filename="../gis/CGisListWks.cpp" line="161"/>
         <source>Reverse Track</source>
         <translation>Обратить трек</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="157"/>
+        <location filename="../gis/CGisListWks.cpp" line="162"/>
         <source>Combine Tracks</source>
         <translation>Соединить треки</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="158"/>
+        <location filename="../gis/CGisListWks.cpp" line="163"/>
         <source>Set Track Activity</source>
         <translation>Добавить мероприятие</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="159"/>
+        <location filename="../gis/CGisListWks.cpp" line="164"/>
         <source>Copy Track with Waypoints</source>
         <translation>Копировать трек с маршрутными точками</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="167"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Show Bubble</source>
         <translation>Показать пузырек</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="169"/>
+        <location filename="../gis/CGisListWks.cpp" line="175"/>
         <source>Move Waypoint</source>
         <translation>Переместить маршрутную точку</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="170"/>
+        <location filename="../gis/CGisListWks.cpp" line="176"/>
         <source>Proj. Waypoint...</source>
         <translation>Проекция маршрутной точки...</translation>
     </message>
     <message>
+        <location filename="../gis/CGisListWks.cpp" line="177"/>
+        <source>Change Radius</source>
+        <translation>Изменить радиус близости</translation>
+    </message>
+    <message>
         <location filename="../gis/CGisListWks.cpp" line="178"/>
+        <source>Toggle Nogo-Area</source>
+        <translation>Переключить запретную зону</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <source>Delete Radius</source>
+        <translation>Удалить радиус близости</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
         <source>Route Instructions</source>
         <translation>Маршрутные инструкции</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="180"/>
+        <location filename="../gis/CGisListWks.cpp" line="191"/>
         <source>Calculate Route</source>
         <translation>Вычислить маршрут</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="181"/>
+        <location filename="../gis/CGisListWks.cpp" line="192"/>
         <source>Reset Route</source>
         <translation>Сбросить маршрутизацию</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="193"/>
         <source>Edit Route</source>
         <translation>Изменить маршрут</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="183"/>
+        <location filename="../gis/CGisListWks.cpp" line="194"/>
         <source>Convert to Track</source>
         <translation>Преобразовать в трек</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="192"/>
+        <location filename="../gis/CGisListWks.cpp" line="204"/>
         <source>Edit Area Points</source>
         <translation>Изменить точки области</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="199"/>
+        <location filename="../gis/CGisListWks.cpp" line="212"/>
         <source>Create Route</source>
         <translation>Создать маршрут</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="200"/>
+        <location filename="../gis/CGisListWks.cpp" line="213"/>
         <source>Change Icon (sel. waypt. only)</source>
         <translation>Изменить пиктограмму (выбрать только маршрутные точки)</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="634"/>
+        <location filename="../gis/CGisListWks.cpp" line="646"/>
         <source>Drop items...</source>
         <translation>Удалить элементы...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="659"/>
-        <location filename="../gis/CGisListWks.cpp" line="1691"/>
-        <location filename="../gis/CGisListWks.cpp" line="1729"/>
+        <location filename="../gis/CGisListWks.cpp" line="671"/>
+        <location filename="../gis/CGisListWks.cpp" line="1771"/>
+        <location filename="../gis/CGisListWks.cpp" line="1809"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation><b>Обновить устройства</b><p>Обновить %1<br/>Подождите...</p></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="785"/>
+        <location filename="../gis/CGisListWks.cpp" line="797"/>
         <source>Saving workspace. Please wait.</source>
         <translation>Сохранить рабочую область. Подождите.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="831"/>
+        <location filename="../gis/CGisListWks.cpp" line="843"/>
         <source>Loading workspace. Please wait.</source>
         <translation>Загрузка рабочей области. Подождите.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>Close all projects...</source>
         <translation>Закрыть все проекты...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1187"/>
+        <location filename="../gis/CGisListWks.cpp" line="1230"/>
         <source>This will remove all projects from the workspace.</source>
         <translation>Это удалит все проекты с рабочей области.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Delete project...</source>
         <translation>Удалить проект...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1210"/>
+        <location filename="../gis/CGisListWks.cpp" line="1256"/>
         <source>Do you really want to delete %1?</source>
         <translation>Вы действительно хотите удалить %1?</translation>
     </message>
 </context>
 <context>
-    <name>CGisWidget</name>
+    <name>CGisWorkspace</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>Load project...</source>
         <translation>Загрузить проект...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="117"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="114"/>
         <source>The project "%1" is already in the workspace.</source>
         <translation>Проект "%1" уже находится в рабочей области.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="559"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="213"/>
+        <source><b>Item Selection: </b>Item selected from workspace list. Click on the map to switch back to normal mouse selection behavior.</source>
+        <translation><b>Выбор элементов: </b>Элемент выбран из списка рабочей области. Нажать на карту, чтобы вернуться к обычному поведению мышки.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWorkspace.cpp" line="626"/>
         <source>Copy items...</source>
-        <translation>Копировать элемент ...</translation>
+        <translation>Копировать элементы ...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="578"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="645"/>
         <source>Change waypoint symbols.</source>
-        <translation>Изменить символов путевых точек.</translation>
+        <translation>Изменить символы путевых точек.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Cut Track...</source>
         <translation>Вырезать трек...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="707"/>
+        <location filename="../gis/CGisWorkspace.cpp" line="813"/>
         <source>Do you want to delete the original track?</source>
         <translation>Желаете удалить изначальный трек?</translation>
     </message>
@@ -1848,7 +1905,7 @@ line %2, column %3:
     <message>
         <location filename="../gis/gpx/CGpxProject.cpp" line="133"/>
         <source>Not a GPX file: %1</source>
-        <translation>Нет файла GPX: %1</translation>
+        <translation>Это не файл GPX: %1</translation>
     </message>
     <message>
         <location filename="../gis/gpx/CGpxProject.cpp" line="268"/>
@@ -1948,99 +2005,298 @@ line %2, column %3:
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
+        <source>Air Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Темп. возд.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="68"/>
         <source>Air Temperature</source>
+        <comment>extLongName</comment>
         <translation>Температура воздуха</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
+        <source>Water Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Темп. воды</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="72"/>
         <source>Water Temperature</source>
+        <comment>extLongName</comment>
         <translation>Температура воды</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
         <source>Depth</source>
+        <comment>extShortName</comment>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="76"/>
+        <source>Depth</source>
+        <comment>extLongName</comment>
+        <translation>Глубина</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
+        <source>Heart R.</source>
+        <comment>extShortName</comment>
+        <translation>Пульс</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="80"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="92"/>
         <source>Heart Rate</source>
+        <comment>extLongName</comment>
         <translation>Пульс</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="81"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="93"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="112"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
+        <source>Cadence</source>
+        <comment>extShortName</comment>
+        <translation>Каденция</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="84"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="96"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="115"/>
         <source>Cadence</source>
+        <comment>extLongName</comment>
         <translation>Каденция</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
+        <source>Speed</source>
+        <comment>extShortName</comment>
+        <translation>Скорость</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="100"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="140"/>
         <source>Speed</source>
+        <comment>extLongName</comment>
         <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
+        <source>Accel.</source>
+        <comment>extShortName</comment>
+        <translation>Ускор.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="104"/>
         <source>Acceleration</source>
+        <comment>extLongName</comment>
         <translation>Ускорение</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
+        <source>Course</source>
+        <comment>extShortName</comment>
+        <translation>Курс</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="108"/>
         <source>Course</source>
+        <comment>extLongName</comment>
         <translation>Курс</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
+        <source>Temp.</source>
+        <comment>extShortName</comment>
+        <translation>Темп.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="119"/>
         <source>Temperature</source>
+        <comment>extLongName</comment>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
+        <source>Dist.</source>
+        <comment>extShortName</comment>
+        <translation>Расстояние</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="123"/>
         <source>Distance</source>
+        <comment>extLongName</comment>
         <translation>Расстояние</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Ele.</source>
+        <comment>extShortName</comment>
+        <translation>Высота</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="127"/>
+        <source>Elevation</source>
+        <comment>extLongName</comment>
+        <translation>Высота</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
+        <source>Energy</source>
+        <comment>extShortName</comment>
+        <translation>Энергия</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="131"/>
         <source>Energy</source>
+        <comment>extLongName</comment>
         <translation>Энергия</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Sea Lev. Pres.</source>
+        <comment>extShortName</comment>
+        <translation>Давление</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
         <source>Sea Level Pressure</source>
-        <translation>Давление на уровень моря</translation>
+        <comment>extLongName</comment>
+        <translation>Давление на уровне моря</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>v. Speed</source>
+        <comment>extShortName</comment>
+        <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
-        <source>Speed (vertical)</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="144"/>
+        <source>Vertical Speed</source>
+        <comment>extLongName</comment>
         <translation>Скорость (вертикальная)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
+        <source>Slope</source>
+        <comment>extShortName</comment>
+        <translation>Наклон</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="153"/>
         <source>Slope*</source>
         <translation>Наклон*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
-        <source>Speed*</source>
-        <translation>Скорость*</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="158"/>
+        <source>Speed over Distance*</source>
+        <comment>extLongName</comment>
+        <translation>Скорость(расстояние)*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
-        <source>Elevation</source>
-        <translation>Высота</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="163"/>
+        <source>Speed over Time*</source>
+        <comment>extLongName</comment>
+        <translation>Скорость(время)*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="168"/>
+        <source>Elevation*</source>
+        <comment>extLongName</comment>
+        <translation>Высота*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
         <source>Progress</source>
-        <translation>Выполнение</translation>
+        <comment>extShortName</comment>
+        <translation>Расстояние</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="173"/>
+        <source>Progress*</source>
+        <comment>extLongName</comment>
+        <translation>Расстояние*</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terr. Slope</source>
+        <comment>extShortName</comment>
+        <translation>Склон местн.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
-        <source>Terrain slope</source>
-        <translation>Склон местности</translation>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="178"/>
+        <source>Terrain Slope*</source>
+        <comment>extLongName</comment>
+        <translation>Склон местности*</translation>
+    </message>
+</context>
+<context>
+    <name>CLogProject</name>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="62"/>
+        <source>Failed to load file %1...</source>
+        <translation>Не удалось загрузить файл %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="84"/>
+        <source>Failed to open %1</source>
+        <translation>Не удалось открыть %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="95"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Не удалось читать %1
+строка %2, столбец %3:
+%4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="102"/>
+        <source>Not an Openambit log file: %1</source>
+        <translation>Это не файл Openambit LOG: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="113"/>
+        <source>Device: %1<br/></source>
+        <translation>Устройство: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="140"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation>Время восстановления: %1 h<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="145"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation>Пиковый эффект тренинга: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="150"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation>Энергия: %1 kCal<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="182"/>
+        <source>Use of local time...</source>
+        <translation>Использование местного времени...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="183"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation>Не найдено время UTC в файле %1. Используется локальное время компьютера. При необходимости вы можете настроить время, используя фильтр времени.</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CLogProject.cpp" line="245"/>
+        <source>This LOG file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation>Этот файл LOG не содержит данных о местоположении и не может отображаться в QMapShack: %1</translation>
     </message>
 </context>
 <context>
@@ -2054,53 +2310,54 @@ line %2, column %3:
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="813"/>
+        <location filename="../CMainWindow.cpp" line="859"/>
         <source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
         <translation>Использовать <b>Меню->Вид->Добавить окно карты</b> для добавления нового вида. Или <b>Меню->Файл->Загрузить вид карты</b> для восстановления сохраненного вида. Или нажмите <a href='newview'>здесь</a>.</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="941"/>
-        <source>Ele: %1%2</source>
+        <location filename="../CMainWindow.cpp" line="987"/>
+        <source>Ele.: %1%2</source>
         <translation>Высота: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="953"/>
+        <location filename="../CMainWindow.cpp" line="999"/>
         <source>Slope: %1%2</source>
+        <comment>terrain</comment>
         <translation>Склон: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="969"/>
+        <location filename="../CMainWindow.cpp" line="1015"/>
         <source>[Grid: %1]</source>
         <translation>[Координатная сетка: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1110"/>
+        <location filename="../CMainWindow.cpp" line="1156"/>
         <source>Load GIS Data...</source>
         <translation>Загрузить данные GIS...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
         <source>Select output file</source>
         <translation>Выбрать выходной файл</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1144"/>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1190"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>QMapShack View (*.view)</source>
         <translation>QMapShack вид (*.view)</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1170"/>
+        <location filename="../CMainWindow.cpp" line="1216"/>
         <source>Select file to load</source>
         <translation>Выбрать файл для загрузки</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1481"/>
+        <location filename="../CMainWindow.cpp" line="1532"/>
         <source>Fatal...</source>
         <translation>Неустранимая ошибка...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1482"/>
+        <location filename="../CMainWindow.cpp" line="1533"/>
         <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
         <translation>QMapShack обнаружил плохо установленную библиотеку Proj4. Таблицы перевода для проекций EPSG обычно находятся в /usr/share/pro отсутствуют. Пожалуйста, сообщите об этом администратору пакета чтобы поправить это.</translation>
     </message>
@@ -2114,7 +2371,7 @@ line %2, column %3:
 If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
         <translation>В данный момент, карт ещё нет. Использование QMapShack без карт совсем непривлекательно. Вы можете установить карты, нажав кнопку 'Помогите! Я хочу карты!' в окне 'Карты'. Или Вы можете нажать клавишу F1, чтобы открыть документацию в Интернете, которая объяснит как использовать QMapShack.
 
-Так не очень удобно, почему не поставлять сразу с картами? Поддержка готовых для загрузки и установки карт требует хорошего сервера. И это небесплатно. У проекта нет денег. Вдобавок карты и данные ЦМР зачастую распространяются под ограничительными лицензиями. Поэтому требуется разрешение правообладателя перед упаковкой его данных. Это не так просто как звучит, к тому же за некоторые данные требуется платить комиссионные. У проекта просто нет ресурсов для этого. И мы надеемся установка ка [...]
+Так не очень удобно, почему не поставлять сразу с картами? Поддержка готовых для загрузки и установки карт требует хорошего сервера. И это не бесплатно. У проекта нет денег. Вдобавок карты и данные ЦМР зачастую распространяются под ограничительными лицензиями. Поэтому требуется разрешение правообладателя перед упаковкой его данных. Это не так просто как звучит, к тому же за некоторые данные требуется платить комиссионные. У проекта просто нет ресурсов для этого. И мы надеемся установка к [...]
     </message>
 </context>
 <context>
@@ -3052,42 +3309,42 @@ Unknown structure.</source>
 <context>
     <name>CMouseNormal</name>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="39"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
         <source>Add POI as Waypoint</source>
         <translation>Добавить достопримечательность как маршрутную точку</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="40"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
         <source>Add Waypoint</source>
         <translation>Добавить маршрутную точку</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="41"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
         <source>Add Track</source>
         <translation>Добавить трек</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="42"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
         <source>Add Route</source>
         <translation>Добавить маршрут</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="44"/>
         <source>Add Area</source>
         <translation>Добавить область</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="45"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="46"/>
         <source>Select Items On Map</source>
         <translation>Выбрать элементы на карте</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
         <source>Copy position</source>
         <translation>Скопировать позицию</translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseNormal.cpp" line="48"/>
+        <location filename="../mouse/CMouseNormal.cpp" line="49"/>
         <source>Copy position (Grid)</source>
         <translation>Скопировать позицию (координатная сетка)</translation>
     </message>
@@ -3103,7 +3360,7 @@ Unknown structure.</source>
 <context>
     <name>CMouseRangeTrk</name>
     <message>
-        <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
+        <location filename="../mouse/CMouseRangeTrk.cpp" line="239"/>
         <source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
         <translation><b>Выбрать интервал</b><br/> Выберите первую точку трека с левой кнопкой мышки. А затем второй. Закончите выбор интервала с помощью щелчка правой кнопкой мышки. <br/></translation>
     </message>
@@ -3153,26 +3410,26 @@ Unknown structure.</source>
     <name>CPlot</name>
     <message>
         <location filename="../plot/CPlot.cpp" line="55"/>
-        <source>distance [%1]</source>
-        <translation>расстояние [%1]</translation>
+        <source>Distance [%1]</source>
+        <translation>Расстояние [%1]</translation>
     </message>
     <message>
         <location filename="../plot/CPlot.cpp" line="60"/>
-        <source>time</source>
-        <translation>время</translation>
+        <source>Time</source>
+        <translation>Время</translation>
     </message>
 </context>
 <context>
     <name>CPlotProfile</name>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="79"/>
-        <source>distance [%1]</source>
-        <translation>расстояние [%1]</translation>
+        <source>Distance [%1]</source>
+        <translation>Расстояние [%1]</translation>
     </message>
     <message>
         <location filename="../plot/CPlotProfile.cpp" line="80"/>
-        <source>alt. [%1]</source>
-        <translation>высота [%1]</translation>
+        <source>Ele. [%1]</source>
+        <translation>Высота: [%1]</translation>
     </message>
 </context>
 <context>
@@ -3224,12 +3481,12 @@ y: %4 м/пиксель</translation>
 <context>
     <name>CProgressDialog</name>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="46"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="48"/>
         <source>Elapsed time: %1</source>
         <translation>Истёкшее время: %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="132"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="134"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation>Истёкшее время: %1 сек.</translation>
     </message>
@@ -3277,6 +3534,29 @@ is not a valid coordinate system definition:
     </message>
 </context>
 <context>
+    <name>CQlbProject</name>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open...</source>
+        <translation>Не удалось открыть...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="55"/>
+        <source>Failed to open %1</source>
+        <translation>Не удалось открыть %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="138"/>
+        <source>Could not convert...</source>
+        <translation>Не удалось преобразовать...</translation>
+    </message>
+    <message>
+        <location filename="../gis/qlb/CQlbProject.cpp" line="139"/>
+        <source>The file contains overlays that can not be converted. This is because QMapShack does not support all overlay types of QLandkarte.</source>
+        <translation>Файл содержит наложения, которые невозможно преобразовать. Это связано с тем, что QMapShack не поддерживает все типы наложений QLandkarte.</translation>
+    </message>
+</context>
+<context>
     <name>CQlgtDb</name>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="308"/>
@@ -3462,114 +3742,120 @@ is not a valid coordinate system definition:
 <context>
     <name>CRouterBRouter</name>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
         <source>original</source>
         <translation>Оригинал</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
         <source>first alternative</source>
         <translation>Первая альтернатива</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
         <source>second alternative</source>
         <translation>Вторая альтернатива</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="53"/>
         <source>third alternative</source>
         <translation>Третья альтернатива</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="148"/>
         <source>BRouter (offline)</source>
         <translation>BRouter (без Интернета)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="155"/>
         <source>BRouter (online)</source>
         <translation>BRouter (требуется связь с Интернетом)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="185"/>
         <source>profile: %1, alternative: %2</source>
         <translation>Профиль: %1, альтернатива: %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="267"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="381"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="283"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="408"/>
+        <source>BRouter does not support more then 1 nogo-area in this version, consider to upgrade</source>
+        <translation>BRouter в данной версии не поддерживает более 1 запретной зоны, рассмотрите возможность обновления</translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="297"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="420"/>
         <source>response is empty</source>
         <translation>Ответ пуст</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="304"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="334"/>
         <source>Bad response from server: %1</source>
         <translation>Плохой ответ от сервера: %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="386"/>
         <source><b>BRouter</b><br/>Routing request sent to server. Please wait...</source>
         <translation><b>BRouter</b><br/>Запрос маршрутизации отправлен на сервер. Пожалуйста, подождите...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="246"/>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="355"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="270"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="389"/>
         <source>Calculate route with %1</source>
         <translation>Вычислить маршрут с %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="454"/>
         <source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
         <translation><b>BRouter</b><br/>Плохой ответ от сервера:<br/>%1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="444"/>
         <source><br/>Calculation time: %1s</source>
         <translation><br/>Время расчета: %1 сек.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="548"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="600"/>
         <source>running</source>
         <translation>Запущено</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="592"/>
         <source>starting</source>
         <translation>Идет запуск</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="515"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="554"/>
         <source>QMapShack communicates with BRouter via a network connection. Usually this is done on a special address that can't be reached from outside your device. However BRouter listens for connections on all available interfaces. If you are in your own private network with an active firewall, this is not much of a problem. If you are in a public network every open port is a risk as it can be used by someone else to compromise your system. We do not recommend to use the local  [...]
         <translation>QMapShack взаимодействует с BRouter через сетевое соединение. Обычно это делается по специальному адресу, который не может быть достигнут вне вашего устройства. Однако BRouter слушает соединения на всех доступных интерфейсах. Если вы находитесь в своей частной сети с активным брандмауэром, это не проблема. Если вы находитесь в общедоступной сети, каждый открытый порт представляет собой риск, так как он может быть использован кем-то другим для компрометации вашей сист [...]
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="581"/>
         <source>Warning...</source>
         <translation>Предупреждение...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="586"/>
         <source>I understand the risk. Don't tell me again.</source>
         <translation>Я понимаю риск. Больше не говорите.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="607"/>
         <source>stopped</source>
         <translation>Остановлено</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="618"/>
         <source>not installed</source>
         <translation>Не установлено</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
+        <location filename="../gis/rte/router/CRouterBRouter.cpp" line="629"/>
         <source>online</source>
         <translation>Онлайн</translation>
     </message>
@@ -4293,17 +4579,17 @@ is not a valid coordinate system definition:
         <translation>Создать базу данных Routino</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="58"/>
         <source>Select files...</source>
         <translation>Выбрать файлы...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="82"/>
         <source>Select target path...</source>
         <translation>Выбрать целевой путь...</translation>
     </message>
     <message>
-        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
+        <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="143"/>
         <source>!!! done !!!
 </source>
         <translation>Сделано!</translation>
@@ -4493,6 +4779,74 @@ line %2, column %3:
     </message>
 </context>
 <context>
+    <name>CSmlProject</name>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="63"/>
+        <source>Failed to load file %1...</source>
+        <translation>Не удалось загрузить файл %1...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="85"/>
+        <source>Failed to open %1</source>
+        <translation>Не удалось открыть %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="96"/>
+        <source>Failed to read: %1
+line %2, column %3:
+ %4</source>
+        <translation>Не удалось читать %1
+строка %2, столбец %3:
+%4</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="103"/>
+        <source>Not an sml file: %1</source>
+        <translation>Это не файл SML: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="129"/>
+        <source>Recovery time: %1 h<br/></source>
+        <translation>Время восстановления: %1 h<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="134"/>
+        <source>Peak Training Effect: %1<br/></source>
+        <translation>Пиковый эффект тренинга: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="139"/>
+        <source>Energy: %1 kCal<br/></source>
+        <translation>Энергия: %1 kCal<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="160"/>
+        <source>Device: %1<br/></source>
+        <translation>Устройство: %1<br/></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="148"/>
+        <source>Battery usage: %1 %/hour</source>
+        <translatorcomment>Изпользование батареи: %1 %/час</translatorcomment>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="195"/>
+        <source>Use of local time...</source>
+        <translation>Использование местного времени...</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="196"/>
+        <source>No UTC time has been found in file %1. Local computer time will be used. You can adjust time using a time filter if needed.</source>
+        <translation>Не найдено время UTC в файле %1. Используется локальное время компьютера. При необходимости вы можете настроить время, используя фильтр времени.</translation>
+    </message>
+    <message>
+        <location filename="../gis/suunto/CSmlProject.cpp" line="245"/>
+        <source>This SML file does not contain any position data and can not be displayed by QMapShack: %1</source>
+        <translation>Этот файл SML не содержит данных о местоположении и не может отображаться в QMapShack: %1</translation>
+    </message>
+</context>
+<context>
     <name>CTableTrk</name>
     <message>
         <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
@@ -4506,8 +4860,8 @@ line %2, column %3:
         <location filename="../gis/trk/CTableTrk.cpp" line="141"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="155"/>
         <location filename="../gis/trk/CTableTrk.cpp" line="157"/>
-        <source>%1 %2</source>
-        <translation>%1 %2</translation>
+        <source>%1%2</source>
+        <translation>%1%2</translation>
     </message>
 </context>
 <context>
@@ -5408,42 +5762,42 @@ If you want to keep just one half you can simply remove the points, or check thi
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="118"/>
+        <location filename="../dem/IDemList.ui" line="112"/>
         <source>To add files with elevation data use <b>File->Setup DEM Paths</b>.  Or click <a href='setup'><b>here</b></a></source>
         <translation>Чтобы добавить файлы с высотными данными использовать <b>Файл->Настройка пути к ЦМР</b>. Или нажать <a href='setup'><b>здесь</b></a></translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="131"/>
+        <location filename="../dem/IDemList.ui" line="125"/>
         <source>Use the context menu (right mouse button click on entry) to activate a file. Use drag-n-drop to move the activated file in the process order. </source>
         <translation>Использовать контекстное меню (нажать правой кнопкой мышки на элемент), чтобы активировать файл. Использовать перетаскивание мышкой, чтобы переместить активированный файл в порядке обработки.</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="156"/>
+        <location filename="../dem/IDemList.ui" line="150"/>
         <source>Activate</source>
         <translation>Активировать</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="165"/>
+        <location filename="../dem/IDemList.ui" line="159"/>
         <source>Move Up</source>
         <translation>Переместить вверх</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="168"/>
+        <location filename="../dem/IDemList.ui" line="162"/>
         <source>Hide DEM behind previous one</source>
         <translation>Скрыть ЦМР за предыдущей</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="177"/>
+        <location filename="../dem/IDemList.ui" line="171"/>
         <source>Move down</source>
         <translation>Переместить вниз</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="180"/>
+        <location filename="../dem/IDemList.ui" line="174"/>
         <source>Show DEM on top of next one</source>
         <translation>Показать ЦМР над следующей</translation>
     </message>
     <message>
-        <location filename="../dem/IDemList.ui" line="189"/>
+        <location filename="../dem/IDemList.ui" line="183"/>
         <source>Reload DEM</source>
         <translation>Перезагрузить ЦМР</translation>
     </message>
@@ -5942,7 +6296,7 @@ If you want to keep just one half you can simply remove the points, or check thi
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="123"/>
         <source>Proximity:</source>
-        <translation>Близость:</translation>
+        <translation>Радиус близости:</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
@@ -5986,7 +6340,7 @@ If you want to keep just one half you can simply remove the points, or check thi
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="292"/>
+        <location filename="../device/IDevice.cpp" line="314"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation>Существует другой проект с таким же именем. Если нажать кнопку 'ОК', он будет удален и заменен.</translation>
     </message>
@@ -6482,90 +6836,118 @@ If you want to keep just one half you can simply remove the points, or check thi
     </message>
 </context>
 <context>
+    <name>IGisDatabase</name>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="59"/>
+        <source>Name</source>
+        <translation>Имя</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="64"/>
+        <source>Age</source>
+        <translation>Срок</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisDatabase.ui" line="97"/>
+        <source>To add a database do a right click on the database list above.</source>
+        <translation>Для добавления базы данных сделайте щелчок правой кнопкой мышки на списке баз данных.</translation>
+    </message>
+</context>
+<context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="44"/>
+        <location filename="../gis/IGisItem.cpp" line="45"/>
         <source>[no name]</source>
         <translation>[нет имени]</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>The item is not part of the project in the database.</source>
         <translation>Элемент не является частью проекта в базе данных.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="317"/>
+        <location filename="../gis/IGisItem.cpp" line="318"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation>
 Это или новый элемент, или элемент был удален с базы данных кем-то другим.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="323"/>
+        <location filename="../gis/IGisItem.cpp" line="324"/>
         <source>The item is not in the database.</source>
         <translation>Элемент не в базе данных.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="329"/>
+        <location filename="../gis/IGisItem.cpp" line="330"/>
         <source>The item might need to be saved</source>
         <translation>Возможно нужно сохранить элемент</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="413"/>
+        <location filename="../gis/IGisItem.cpp" line="414"/>
         <source>Initial version.</source>
         <translation>Исходная версия.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="529"/>
+        <location filename="../gis/IGisItem.cpp" line="534"/>
+        <source>Never ask again.</source>
+        <translation>Больше не спрашивать.</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisItem.cpp" line="535"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation><h3>%1</h3> Вероятно, это элемент доступен только для чтения, потому что он не был создан внутри QMapShack. Обычно нет необходимости изменить импортированные данные. Но если для вас это приемлемо нажмите "Да".</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="530"/>
+        <location filename="../gis/IGisItem.cpp" line="536"/>
         <source>Read Only Mode...</source>
         <translation>Режим 'только чтения'...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="700"/>
-        <location filename="../gis/IGisItem.cpp" line="753"/>
+        <location filename="../gis/IGisItem.cpp" line="713"/>
+        <location filename="../gis/IGisItem.cpp" line="766"/>
         <source><h4>Description:</h4></source>
         <translation><h4>Описание:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="703"/>
-        <location filename="../gis/IGisItem.cpp" line="756"/>
+        <location filename="../gis/IGisItem.cpp" line="716"/>
+        <location filename="../gis/IGisItem.cpp" line="769"/>
         <source><p>--- no description ---</p></source>
         <translation><p>---нет описания---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="714"/>
+        <location filename="../gis/IGisItem.cpp" line="727"/>
         <source><h4>Comment:</h4></source>
         <translation><h4>Комментарий:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="717"/>
+        <location filename="../gis/IGisItem.cpp" line="730"/>
         <source><p>--- no comment ---</p></source>
         <translation><p>---нет комментария---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="728"/>
-        <location filename="../gis/IGisItem.cpp" line="767"/>
+        <location filename="../gis/IGisItem.cpp" line="741"/>
+        <location filename="../gis/IGisItem.cpp" line="780"/>
         <source><h4>Links:</h4></source>
         <translation><h4>Ссылки:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="731"/>
-        <location filename="../gis/IGisItem.cpp" line="770"/>
+        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="783"/>
         <source><p>--- no links ---</p></source>
         <translation><p>---нет ссылок---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Edit name...</source>
         <translation>Изменить имя...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="846"/>
+        <location filename="../gis/IGisItem.cpp" line="864"/>
         <source>Enter new %1 name.</source>
         <translation>Задать новое имя (%1).</translation>
     </message>
@@ -6573,119 +6955,108 @@ It is either a new item or it has been deleted in the database by someone else.<
 <context>
     <name>IGisProject</name>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source>Save project?</source>
         <translation>Сохранить проект?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="156"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="175"/>
         <source><h3>%1</h3>The project was changed. Save before closing it?</source>
         <translation><h3>%1</h3> Проект изменен. Сохранить его перед закрытием?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="356"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="375"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation>%1: коррелировать треки и маршрутные точки.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="366"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="385"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation><h3>%1</h3> Было слишком долго? Желаете ли вы пропускать корреляцию треков и маршрутных точек для этого проекта в будущем?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="367"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="386"/>
         <source>Canceled correlation...</source>
         <translation>Корреляция отменена ...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="412"/>
-        <location filename="../gis/prj/IGisProject.cpp" line="469"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="431"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="488"/>
         <source>Save "%1" to...</source>
         <translation>Сохранить "%1" в...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="554"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="573"/>
         <source><br/>
 Filename: %1</source>
         <translation><br/>
 Имя файла: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="559"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="578"/>
         <source>Waypoints: %1</source>
         <translation>Маршрутные точки: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="563"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="582"/>
         <source>Tracks: %1</source>
         <translation>Треки: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="567"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="586"/>
         <source>Routes: %1</source>
         <translation>Маршруты: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="571"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="590"/>
         <source>Areas: %1</source>
         <translation>Области: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="691"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="733"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation>Вы уверены что хотите удалить '%1' из проекта '%2'?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="692"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="734"/>
         <source>Delete...</source>
         <translation>Удалить...</translation>
     </message>
 </context>
 <context>
-    <name>IGisWidget</name>
+    <name>IGisWorkspace</name>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="14"/>
+        <location filename="../gis/IGisWorkspace.ui" line="14"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="43"/>
+        <location filename="../gis/IGisWorkspace.ui" line="43"/>
         <source>Opacity</source>
         <translation>Прозрачность</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="50"/>
+        <location filename="../gis/IGisWorkspace.ui" line="50"/>
         <source>Change the opacity of all GIS Items on the map.</source>
         <translation>Изменить прозрачность всех элементов ГИС на карте.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="66"/>
+        <location filename="../gis/IGisWorkspace.ui" line="66"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="116"/>
-        <location filename="../gis/IGisWidget.ui" line="146"/>
+        <location filename="../gis/IGisWorkspace.ui" line="116"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="151"/>
-        <source>Age</source>
-        <translation>Срок</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="185"/>
-        <source>To add a database do a right click on the database list above.</source>
-        <translation>Для добавления базы данных сделайте щелчок правой кнопкой мышки на списке баз данных.</translation>
-    </message>
-    <message>
-        <location filename="../gis/IGisWidget.ui" line="205"/>
+        <location filename="../gis/IGisWorkspace.ui" line="129"/>
         <source>Clear Filter</source>
         <translation>Очистить фильтр</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <location filename="../gis/IGisWorkspace.ui" line="138"/>
         <source>Setup Filter</source>
         <translation>Настройка фильтра</translation>
     </message>
@@ -6787,7 +7158,7 @@ Filename: %1</source>
 <context>
     <name>ILineOp</name>
     <message>
-        <location filename="../mouse/line/ILineOp.cpp" line="212"/>
+        <location filename="../mouse/line/ILineOp.cpp" line="279"/>
         <source>Routing</source>
         <translation>Маршрутизация</translation>
     </message>
@@ -6839,379 +7210,395 @@ Filename: %1</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="103"/>
+        <location filename="../IMainWindow.ui" line="104"/>
         <source>Window</source>
         <translation>Окно</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="113"/>
+        <location filename="../IMainWindow.ui" line="114"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="121"/>
-        <source>Project</source>
-        <translation>Проект</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="132"/>
+        <location filename="../IMainWindow.ui" line="133"/>
         <source>Tool</source>
         <translation>Инструмент</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="157"/>
+        <location filename="../IMainWindow.ui" line="152"/>
         <source>Maps</source>
         <translation>Карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="200"/>
+        <location filename="../IMainWindow.ui" line="189"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation>Цифровая модель рельефа (ЦМР)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="239"/>
-        <source>Data</source>
-        <translation>Данные</translation>
-    </message>
-    <message>
-        <location filename="../IMainWindow.ui" line="257"/>
-        <source>Route</source>
-        <translation>Маршрутизация</translation>
+        <location filename="../IMainWindow.ui" line="122"/>
+        <location filename="../IMainWindow.ui" line="222"/>
+        <source>Workspace</source>
+        <translation>Рабочая область</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="287"/>
+        <location filename="../IMainWindow.ui" line="231"/>
         <source>Toolbar</source>
         <translation>Панель инструментов</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="302"/>
-        <location filename="../IMainWindow.ui" line="305"/>
+        <location filename="../IMainWindow.ui" line="257"/>
+        <source>Routing</source>
+        <translation>Маршрутизация</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="276"/>
+        <location filename="../IMainWindow.ui" line="279"/>
         <source>Add Map View</source>
         <translation>Добавить окно карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="308"/>
+        <location filename="../IMainWindow.ui" line="282"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="323"/>
+        <location filename="../IMainWindow.ui" line="297"/>
         <source>Show Scale</source>
         <translation>Показать масштаб</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="335"/>
+        <location filename="../IMainWindow.ui" line="309"/>
         <source>Setup Map Font</source>
         <translation>Настройка шрифта карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="350"/>
+        <location filename="../IMainWindow.ui" line="324"/>
         <source>Show Grid</source>
         <translation>Показать координатную сетку</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="353"/>
+        <location filename="../IMainWindow.ui" line="327"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="365"/>
+        <location filename="../IMainWindow.ui" line="339"/>
         <source>Setup Grid</source>
         <translation>Настройка координатной сетки</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="368"/>
+        <location filename="../IMainWindow.ui" line="342"/>
         <source>Ctrl+Alt+G</source>
         <translation>Ctrl+Alt+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="383"/>
+        <location filename="../IMainWindow.ui" line="357"/>
         <source>Flip Mouse Wheel</source>
         <translation>Флип колесо мышки</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="395"/>
-        <location filename="../IMainWindow.ui" line="398"/>
+        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="372"/>
         <source>Setup Map Paths</source>
         <translation>Настройка пути к картам</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="413"/>
+        <location filename="../IMainWindow.ui" line="387"/>
         <source>POI Text</source>
         <translation>Текст для точек интереса</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="428"/>
+        <location filename="../IMainWindow.ui" line="402"/>
         <source>Night / Day</source>
         <translation>Ночь/день</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="443"/>
+        <location filename="../IMainWindow.ui" line="417"/>
         <source>Map Tool Tip</source>
         <translation>Подсказка карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="446"/>
+        <location filename="../IMainWindow.ui" line="420"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="458"/>
+        <location filename="../IMainWindow.ui" line="432"/>
         <source>Setup DEM Paths</source>
         <translation>Настройка пути к ЦМР</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="470"/>
+        <location filename="../IMainWindow.ui" line="444"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="482"/>
+        <location filename="../IMainWindow.ui" line="456"/>
         <source>Help</source>
         <translation>Справки</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="485"/>
+        <location filename="../IMainWindow.ui" line="459"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="497"/>
-        <location filename="../IMainWindow.ui" line="500"/>
+        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="474"/>
         <source>Setup Map View</source>
         <translation>Настройка вида карт</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="512"/>
+        <location filename="../IMainWindow.ui" line="486"/>
         <source>Load GIS Data</source>
         <translation>Загрузить данные ГИС</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="515"/>
+        <location filename="../IMainWindow.ui" line="489"/>
         <source>Load projects from file</source>
         <translation>Загрузить проекты с файла</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="518"/>
+        <location filename="../IMainWindow.ui" line="492"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="530"/>
+        <location filename="../IMainWindow.ui" line="504"/>
         <source>Save All GIS Data</source>
         <translation>Сохранить все данные ГИС</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="533"/>
+        <location filename="../IMainWindow.ui" line="507"/>
         <source>Save all projects in the workspace</source>
         <translation>Сохранить все проекты в рабочей области</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="536"/>
+        <location filename="../IMainWindow.ui" line="510"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="548"/>
+        <location filename="../IMainWindow.ui" line="522"/>
         <source>Setup Time Zone</source>
         <translation>Настройка часового пояса</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="560"/>
+        <location filename="../IMainWindow.ui" line="534"/>
         <source>Add empty project</source>
         <translation>Добавить пустой проект</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="575"/>
+        <location filename="../IMainWindow.ui" line="549"/>
         <source>Search Google</source>
         <translation>Поиск в Google</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="587"/>
+        <location filename="../IMainWindow.ui" line="561"/>
         <source>Close all projects</source>
         <translation>Закрыть все проекты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="590"/>
+        <location filename="../IMainWindow.ui" line="564"/>
         <source>F8</source>
         <translation>F8</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="602"/>
+        <location filename="../IMainWindow.ui" line="576"/>
         <source>Setup Units</source>
         <translation>Настройка единиц</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="614"/>
+        <location filename="../IMainWindow.ui" line="588"/>
         <source>Setup Workspace</source>
         <translation>Настройка рабочей области</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="617"/>
+        <location filename="../IMainWindow.ui" line="591"/>
         <source>Setup save on exit.</source>
         <translation>Настройка рабочей области.</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="629"/>
+        <location filename="../IMainWindow.ui" line="603"/>
         <source>Import Database from QLandkarte</source>
         <translation>Импортировать базу данных QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="632"/>
+        <location filename="../IMainWindow.ui" line="606"/>
         <source>Import QLandkarte GT database</source>
         <translation>Импортировать базу данных QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="644"/>
+        <location filename="../IMainWindow.ui" line="618"/>
         <source>VRT Builder</source>
         <translation>Создать файл VRT</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="647"/>
+        <location filename="../IMainWindow.ui" line="621"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation>Графический интерфейс к gdalbuildvrt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="659"/>
+        <location filename="../IMainWindow.ui" line="633"/>
         <source>Store Map View</source>
         <translation>Сохранить вид карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="662"/>
+        <location filename="../IMainWindow.ui" line="636"/>
         <source>Write current active map and DEM list including the properties to a file</source>
         <translation>Сохранить вид карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="674"/>
+        <location filename="../IMainWindow.ui" line="648"/>
         <source>Load Map View</source>
         <translation>Загрузить вид карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="677"/>
+        <location filename="../IMainWindow.ui" line="651"/>
         <source>Restore view with active map and DEM list including the properties from a file</source>
         <translatorcomment>Tooltip??</translatorcomment>
         <translation>Загрузить вид карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="692"/>
+        <location filename="../IMainWindow.ui" line="666"/>
         <source>Ext. Profile</source>
         <translation>Расширенный профиль</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="695"/>
+        <location filename="../IMainWindow.ui" line="669"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="707"/>
+        <location filename="../IMainWindow.ui" line="681"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="710"/>
+        <location filename="../IMainWindow.ui" line="684"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="722"/>
+        <location filename="../IMainWindow.ui" line="696"/>
         <source>Clone Map View</source>
         <translation>Клонировать вид карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="725"/>
+        <location filename="../IMainWindow.ui" line="699"/>
         <source>Ctrl+Shift+T</source>
         <translation>Ctrl+Shift+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="737"/>
+        <location filename="../IMainWindow.ui" line="711"/>
         <source>Create Routino Database</source>
         <translation>Создать базу данных Routino</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="749"/>
+        <location filename="../IMainWindow.ui" line="723"/>
         <source>Save(Print) Map Screenshot</source>
         <translation>Сохранить (Печатать) снимок экрана карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="752"/>
+        <location filename="../IMainWindow.ui" line="726"/>
         <source>Print a selected area of the map</source>
         <translation>Печатать выбранную область карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="755"/>
+        <location filename="../IMainWindow.ui" line="729"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="767"/>
+        <location filename="../IMainWindow.ui" line="741"/>
         <source>Setup Coord. Format</source>
         <translation>Настройка формата координат</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="770"/>
+        <location filename="../IMainWindow.ui" line="744"/>
         <source>Change the format coordinates are displayed</source>
         <translation>Изменить формат отображения координат</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="782"/>
+        <location filename="../IMainWindow.ui" line="756"/>
         <source>Setup Map Background</source>
         <translation>Настройка фона карт</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="794"/>
+        <location filename="../IMainWindow.ui" line="768"/>
         <source>Setup Waypoint Icons</source>
         <translation>Настройка пиктограмм для маршрутных точек</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="797"/>
+        <location filename="../IMainWindow.ui" line="771"/>
         <source>Setup path to custom icons</source>
         <translation>Настройка пути к пользовательским пиктограммам</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="806"/>
+        <location filename="../IMainWindow.ui" line="780"/>
         <source>Close Tab</source>
         <translation>Закрыть вкладку</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="809"/>
+        <location filename="../IMainWindow.ui" line="783"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="818"/>
+        <location filename="../IMainWindow.ui" line="792"/>
         <source>Quickstart Help</source>
         <translation>Помощь для быстрого старта</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="827"/>
+        <location filename="../IMainWindow.ui" line="801"/>
         <source>Setup Toolbar</source>
         <translation>Настройка панели инструментов</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="839"/>
+        <location filename="../IMainWindow.ui" line="813"/>
         <source>Toggle Docks</source>
         <translation>Переключить закрепленные окна</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="842"/>
+        <location filename="../IMainWindow.ui" line="816"/>
         <source>Toggle visibility of dockable windows</source>
         <translation>Переключить видимость закрепленных окон</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="845"/>
+        <location filename="../IMainWindow.ui" line="819"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="854"/>
+        <location filename="../IMainWindow.ui" line="828"/>
         <source>Full Screen</source>
         <translation>Во весь экран</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="857"/>
+        <location filename="../IMainWindow.ui" line="831"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="843"/>
+        <source>Min./Max. Track Values</source>
+        <translation>Мин./макс. значения трека</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="846"/>
+        <source>Show the minimum and maximum values of the track properties along the track in the map view.</source>
+        <translation>Показать минимальные и максимальные значения свойств трека в просмотре карт.</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="849"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="245"/>
+        <source>Database</source>
+        <translation>База данных</translation>
+    </message>
 </context>
 <context>
     <name>IMapList</name>
@@ -7444,22 +7831,31 @@ I don't want to read the documentation!</source>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
-        <source>1. Select one or multiple source files.
-2. Select a file name for the target VRT file.
-3. Press "Start" button.
+        <source><ol>
+<li>Select one or multiple source files.</li>
+<li>Select a file name for the target VRT file.</li>
+<li>Press "Start" button.</li>
+</ol>
 
 Tip:
-* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
-* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
-* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
-        <translation>1. Выбрать один или несколько исходных файлов.
-2. Выбрать имя файла для целевого файла VRT.
-3. Нажать кнопку "Начать"
+<ul>
+<li>If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.</li>
+<li>Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.</li>
+<li>The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</li>
+</ul></source>
+        <translation><ol>
+<li>Выберите один или несколько исходных файлов.</li>
+<li>Выберите имя файла для целевого файла VRT.</li>
+<li>Нажмите кнопку "Начать".</li>
+</ol>
 
 Намек:
-* Если у вас есть несколько файлов, поместите их в подпапку вашего пути к картам. Создайте файл VRT в вашем пути к картам.
-* Используйте дополнительные параметры, чтобы добавить значение "нет данных", если исходные файлы не имеют одного и файлы не образуют прямоугольную карту. Области без файла карты станут прозрачными.
-* Параметр "-a_srs" предназначен для назначения проекции/датума, когда в исходном файле этого нет. Это НЕ перепроектирует данные.</translation>
+<ul>
+<li>Если у вас несколько файлов, поместите их в подпапку вашей папки к карте. Создайте файл VRT в вашей папки к картам.</li>
+<li>Используйте дополнительные параметры, чтобы добавить значение для "нет данных", если исходные файлы не имеют этого и не образуют прямоугольную карту. Области без файла карты станут прозрачными.</li>
+<li>Параметр "-a_srs" предназначен для назначения проекции/датума, когда в исходном файле этого нет. Это НЕ перепроектирует данные.</li>
+</ul>
+</translation>
     </message>
     <message>
         <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
@@ -7496,62 +7892,62 @@ Tip:
         <translation><b>Новая линия</b><br/>Переместить мышку и использовать левую кнопку мышки, чтобы создать точки. Когда это сделано остановить с помощью правой кнопки мышки.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="289"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="300"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation><b>Удалить точку</b><br/>Переместить мышку близко к точке и нажать левую кнопку, чтобы удалить её.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="297"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="308"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation><b>Выбрать интервал точек</b><br/>Нажать левой кнопкой на первой точке, чтобы начать выбор. Нажать левой кнопкой на второй точке, чтобы завершить выбор и выбрать параметры. Использовать правую кнопку мышки для отмены.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="305"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="316"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Переместить точку</b><br/>Переместить мышку близко к точке и нажать левую кнопку. Точка будет прилипать к курсору, и вы можете переместить её. Использовать правую кнопку мышки для отмены.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="313"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Добавить точку</b><br/>Переместить мышку близко к сегменту линии и нажать левую кнопку, чтобы добавить точку. Точка будет прилипать к курсору, и вы можете переместить его. Отбросьте точку с помощью левой кнопки мышки. Использовать правую кнопку мышки для отмены.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="321"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation><b>Без маршрутизации</b><br/>Все точки будут соединены прямыми линиями.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="327"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="338"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation><b>Автоматическая маршрутизация</b><br/>Настройка маршрутизатора используется для вычисления маршрута между точками.<b>Замечание</b>Выбранный маршрутизатор должен быть способным вычислять маршруты налету. Оффлайновые маршрутизаторы обычно это могут, Интернет маршрутизаторы этого не могут.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="343"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation><b>Векторная маршрутизация</b><br/>Если возможно соединить точки линией с загруженной векторной карты.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="504"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="515"/>
         <source><b>%1 Metrics</b></source>
         <translation><b>%1. Метрика</b></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="507"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="518"/>
         <source>Distance:</source>
         <translation>Расстояние:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="509"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="520"/>
         <source>Ascent:</source>
         <translation>Подъем:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="511"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="522"/>
         <source>Descent:</source>
         <translation>Спуск:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.h" line="135"/>
+        <location filename="../mouse/line/IMouseEditLine.h" line="137"/>
         <source><br/><b>Move the map</b><br/>If you keep the left mouse button pressed and move the mouse, you will move the map.<br/><br/></source>
         <translation><br/><b>Переместить карту</b><br/>Если удержите нажатой левую кнопку мышки и переместите мышку, вы будете перемещать карту.<br/><br/></translation>
     </message>
@@ -7843,6 +8239,21 @@ or
         <source>Caution! BRouter is listening on all ports for connections.</source>
         <translation>Осторожно! BRouter прослушивает все порты для соединений.</translation>
     </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="217"/>
+        <source><p><a href="http://brouter.de/brouter/" target="_blank">BRouter</a> © <a href="https://github.com/abrensch/brouter/blob/master/LICENSE" target="_blank">ABrensch, Licence GPLv3</a></p></source>
+        <translation><p><a href="http://brouter.de/brouter/" target="_blank">BRouter</a> © <a href="https://github.com/abrensch/brouter/blob/master/LICENSE" target="_blank">ABrensch, лицензия GPLv3</a></p></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="227"/>
+        <source><p>Directions Courtesy of <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></source>
+        <translation><p>Любезно предоставлены <a href="http://brouter.de/brouter-web/" target="_blank">BRouter-web</a> </p></translation>
+    </message>
+    <message>
+        <location filename="../gis/rte/router/IRouterBRouter.ui" line="237"/>
+        <source><p>Routing data <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a> contributors</p></source>
+        <translation><p>Данные маршрутизации <a href="http://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a></p></translation>
+    </message>
 </context>
 <context>
     <name>IRouterBRouterInfo</name>
@@ -8132,7 +8543,7 @@ or
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/IRouterRoutino.ui" line="131"/>
+        <location filename="../gis/rte/router/IRouterRoutino.ui" line="118"/>
         <source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path. You can create your own routing data with <b>Tool->Create Routino Database</b>.</source>
         <translation>Для использования маршрутизации без доступа к сети вам необходимо определить пути к локальным данным маршрутизации. Использовать кнопку настройки чтобы зарегистрировать пути. Вы можете создать свои собственные данные для маршрутизации с помощью <b>Инструмент->Создать базу данных Routino</b>.</translation>
     </message>
@@ -8172,13 +8583,13 @@ or
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="22"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="25"/>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="63"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="39"/>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="42"/>
         <source>Select source files:</source>
         <translation>Выбрать исходные файлы:</translation>
     </message>
@@ -8202,6 +8613,25 @@ or
         <source>File Prefix</source>
         <translation>Префикс файла</translation>
     </message>
+    <message>
+        <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="133"/>
+        <source><p>To create a Routino routing database you need to download *pbf files from <a href='http://download.geofabrik.de/'>GeoFabrik</a>. The process of creating a Routino database is quite slow and the resulting files quite large. Therefore it's recommended not to download whole continents. Limit your download to those countries you really need. However as Routino can't route over several databases you have to include all countries that ar [...]
+
+<ol>
+<li>Select one or multiple source *.pbf files.</li>
+<li>Select a path for your Routino database.</li>
+<li>Select a prefix. The database will be listed by this prefix.</li>
+<li>Press "Start" button.</li>
+</ol></source>
+        <translation><p>Чтобы создать базу данных маршрутизации Routino, вам необходимо загрузить файлы *.pbf из <a href='http://download.geofabrik.de/'>GeoFabrik</a>. Процесс создания базы данных Routino довольно медленный, и результирующие файлы довольно большие. Поэтому рекомендуется не загружать целые континенты. Ограничьте загрузку теми странами, которые вам действительно нужны. Однако, поскольку Routino не может маршрутизировать через несколько баз данны [...]
+
+<ol>
+<li>Выберите один или несколько исходных файлов *.pbf.</li>
+<li>Выберите путь для вашей базы данных Routino.</li>
+<li>Выберите префикс. База данных будет указана с этим префиксом.</li>
+<li>Нажмите кнопку "Начать".</li>
+</ol></translation>
+    </message>
 </context>
 <context>
     <name>IScrOptEditLine</name>
@@ -8717,6 +9147,8 @@ or
         <location filename="../gis/wpt/IScrOptWpt.ui" line="101"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="118"/>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="132"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="153"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="170"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -8746,7 +9178,57 @@ or
         <translation>Клонировать маршрутную точку и переместить клон на данное расстояние под указанным углом.</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/IScrOptWpt.ui" line="176"/>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="150"/>
+        <source>edit radius of circular area</source>
+        <translation>Изменить радиус круга близости</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="167"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation>Переключить между кругом близости и запретной зоной</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="185"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation>Удалить круг близости маршрутной точки</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWpt.ui" line="232"/>
+        <source>TextLabel</source>
+        <translation>Метка текста</translation>
+    </message>
+</context>
+<context>
+    <name>IScrOptWptRadius</name>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="20"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="49"/>
+        <source>edit radius of circular area</source>
+        <translation>Изменить радиус круга близости</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="52"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="66"/>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="84"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="63"/>
+        <source>Switch between proximity and nogo-area</source>
+        <translation>Переключить между кругом близости и запретной зоной</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="81"/>
+        <source>Delete circle defined by waypoint</source>
+        <translation>Удалить круг близости маршрутной точки</translation>
+    </message>
+    <message>
+        <location filename="../gis/wpt/IScrOptWptRadius.ui" line="128"/>
         <source>TextLabel</source>
         <translation>Метка текста</translation>
     </message>
@@ -9584,6 +10066,11 @@ or
         <source>short format</source>
         <translation>сокращённом формате</translation>
     </message>
+    <message>
+        <location filename="../units/ITimeZoneSetup.ui" line="123"/>
+        <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
+        <translation><b>Примечание:</b> Изменение единиц для некоторых элементов графического пользовательского интерфейса вступит в силу только после перезапуска QMapShack.</translation>
+    </message>
 </context>
 <context>
     <name>IToolBarSetupDialog</name>
@@ -9641,18 +10128,18 @@ or
 <context>
     <name>IUnit</name>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="728"/>
+        <location filename="../units/IUnit.cpp" line="770"/>
         <source>Bad position format. Must be: "[N|S] ddd mm.sss [W|E] ddd mm.sss" or "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
         <translation>Неверный формат позиции. Должен быть: "[С|Ю] ddd mm.sss [З|В] ddd mm.sss" или "[С|Ю] ddd.ddd [З|В] ddd.ddd"</translation>
     </message>
     <message>
-        <location filename="../units/IUnit.cpp" line="734"/>
+        <location filename="../units/IUnit.cpp" line="776"/>
         <source>Position values out of bounds. </source>
         <translation>Значения позиции вне допустимого интервала.</translation>
     </message>
@@ -9665,22 +10152,42 @@ or
         <translation>Настройка единиц измерения...</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="24"/>
+        <location filename="../units/IUnitsSetup.ui" line="36"/>
+        <source>Length unit</source>
+        <translation>Единица длины</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="48"/>
         <source>Nautic</source>
         <translation>Морские</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="31"/>
+        <location filename="../units/IUnitsSetup.ui" line="61"/>
         <source>Imperial</source>
         <translation>Британские</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="38"/>
+        <location filename="../units/IUnitsSetup.ui" line="74"/>
         <source>Metric</source>
         <translation>Метрические</translation>
     </message>
     <message>
-        <location filename="../units/IUnitsSetup.ui" line="47"/>
+        <location filename="../units/IUnitsSetup.ui" line="80"/>
+        <source>Slope unit</source>
+        <translation>Единица спуска</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="92"/>
+        <source>Degrees (°)</source>
+        <translation>Градус (°)</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="105"/>
+        <source>Percent (%)</source>
+        <translation>Процент (%)</translation>
+    </message>
+    <message>
+        <location filename="../units/IUnitsSetup.ui" line="133"/>
         <source><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
         <translation><b>Примечание:</b> Изменение единиц для некоторых элементов графического пользовательского интерфейса вступят в силу только после перезапуска QMapShack.</translation>
     </message>
diff --git a/src/map/IMapList.ui b/src/map/IMapList.ui
index ff37be4..735f603 100644
--- a/src/map/IMapList.ui
+++ b/src/map/IMapList.ui
@@ -75,11 +75,11 @@
      </property>
      <item>
       <widget class="QLabel" name="labelIcon">
-       <property name="maximumSize">
-        <size>
-         <width>64</width>
-         <height>16777215</height>
-        </size>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
        <property name="text">
         <string/>
@@ -88,7 +88,7 @@
         <pixmap resource="../resources.qrc">:/icons/48x48/Help.png</pixmap>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignHCenter|Qt::AlignTop</set>
        </property>
       </widget>
      </item>
diff --git a/src/mouse/CMouseDummy.h b/src/mouse/CMouseDummy.h
index 9058a0a..2d55832 100644
--- a/src/mouse/CMouseDummy.h
+++ b/src/mouse/CMouseDummy.h
@@ -40,9 +40,6 @@ public:
     void mouseReleaseEvent(QMouseEvent *e) override
     {
     }
-    void wheelEvent(QWheelEvent * e) override
-    {
-    }
 };
 
 #endif //CMOUSEDUMMY_H
diff --git a/src/mouse/CMouseEditArea.cpp b/src/mouse/CMouseEditArea.cpp
index 459da2f..822e4f3 100644
--- a/src/mouse/CMouseEditArea.cpp
+++ b/src/mouse/CMouseEditArea.cpp
@@ -18,7 +18,7 @@
 
 #include "CMainWindow.h"
 #include "canvas/CCanvas.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/ovl/CGisItemOvlArea.h"
 #include "mouse/CMouseEditArea.h"
 
@@ -58,7 +58,7 @@ void CMouseEditArea::drawLine(const QPolygonF &l, const QColor color, int width,
 
 IGisLine * CMouseEditArea::getGisLine() const
 {
-    return dynamic_cast<CGisItemOvlArea*>(CGisWidget::self().getItemByKey(key));
+    return dynamic_cast<CGisItemOvlArea*>(CGisWorkspace::self().getItemByKey(key));
 }
 
 void CMouseEditArea::slotAbort()
@@ -85,7 +85,7 @@ void CMouseEditArea::slotCopyToNew()
     IGisProject * project = nullptr;
 
     QString name;
-    CGisItemOvlArea * area = dynamic_cast<CGisItemOvlArea*>(CGisWidget::self().getItemByKey(key));
+    CGisItemOvlArea * area = dynamic_cast<CGisItemOvlArea*>(CGisWorkspace::self().getItemByKey(key));
     if(area != nullptr)
     {
         name = area->getName();
diff --git a/src/mouse/CMouseEditRte.cpp b/src/mouse/CMouseEditRte.cpp
index f7eaa93..de502a6 100644
--- a/src/mouse/CMouseEditRte.cpp
+++ b/src/mouse/CMouseEditRte.cpp
@@ -18,7 +18,7 @@
 
 #include "CMainWindow.h"
 #include "canvas/CCanvas.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/rte/CGisItemRte.h"
 #include "mouse/CMouseEditRte.h"
 #include "mouse/line/CScrOptEditLine.h"
@@ -67,7 +67,7 @@ void CMouseEditRte::mousePressEvent(QMouseEvent * e)
 
 IGisLine * CMouseEditRte::getGisLine() const
 {
-    return dynamic_cast<CGisItemRte*>(CGisWidget::self().getItemByKey(key));
+    return dynamic_cast<CGisItemRte*>(CGisWorkspace::self().getItemByKey(key));
 }
 
 void CMouseEditRte::slotAbort()
@@ -96,7 +96,7 @@ void CMouseEditRte::slotCopyToNew()
     IGisProject * project = nullptr;
 
     QString name;
-    CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWidget::self().getItemByKey(key));
+    CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWorkspace::self().getItemByKey(key));
     if(rte != nullptr)
     {
         name = rte->getName();
diff --git a/src/mouse/CMouseEditTrk.cpp b/src/mouse/CMouseEditTrk.cpp
index 4d07f6b..746a643 100644
--- a/src/mouse/CMouseEditTrk.cpp
+++ b/src/mouse/CMouseEditTrk.cpp
@@ -18,7 +18,7 @@
 
 #include "CMainWindow.h"
 #include "canvas/CCanvas.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/trk/CGisItemTrk.h"
 #include "mouse/CMouseEditTrk.h"
 
@@ -62,7 +62,7 @@ void CMouseEditTrk::mousePressEvent(QMouseEvent * e)
 
 IGisLine * CMouseEditTrk::getGisLine() const
 {
-    return dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+    return dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
 }
 
 void CMouseEditTrk::slotAbort()
@@ -101,7 +101,7 @@ void CMouseEditTrk::slotCopyToNew()
     IGisProject * project = nullptr;
 
     QString name;
-    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
     if(trk != nullptr)
     {
         name = trk->getName();
diff --git a/src/mouse/CMouseMoveWpt.cpp b/src/mouse/CMouseMoveWpt.cpp
index 8648653..fc77c51 100644
--- a/src/mouse/CMouseMoveWpt.cpp
+++ b/src/mouse/CMouseMoveWpt.cpp
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -19,7 +20,7 @@
 #include "GeoMath.h"
 #include "canvas/CCanvas.h"
 #include "gis/CGisDraw.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/WptIcons.h"
 #include "gis/wpt/CGisItemWpt.h"
 #include "helpers/CDraw.h"
@@ -30,13 +31,17 @@
 #include <proj_api.h>
 
 CMouseMoveWpt::CMouseMoveWpt(CGisItemWpt &wpt, CGisDraw * gis, CCanvas *parent)
-    : IMouse(gis, parent)
+    : IMouse(gis, parent),
+    key(wpt.getKey()),
+    origPos(wpt.getPosition()*DEG_TO_RAD),
+    radius(wpt.getProximity()),
+    avoid(wpt.isNogoArea())
 {
     cursor  = QCursor(QPixmap(":/cursors/cursorMoveWpt.png"), 0, 0);
-    key     = wpt.getKey();
     icon    = getWptIconByName(wpt.getIconName(), focus);
-    origPos = wpt.getPosition() * DEG_TO_RAD;
-    newPos  = wpt.getPosition() * DEG_TO_RAD;
+    newPos  = origPos;
+    wpt.setHideArea(true);
+    canvas->triggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
 CMouseMoveWpt::~CMouseMoveWpt()
@@ -57,6 +62,9 @@ void CMouseMoveWpt::draw(QPainter& p, CCanvas::redraw_e, const QRect&)
     gis->convertRad2Px(p1);
     gis->convertRad2Px(p2);
 
+    qreal r = CGisItemWpt::calcRadius(newPos,p2,radius,gis);
+    CGisItemWpt::drawCircle(p,p2,r,avoid,false);
+
     QPointF p11 = p1 + QPoint(17 * qCos((a1 - 90) * DEG_TO_RAD), 17 * qSin((a1 - 90) * DEG_TO_RAD));
     QPointF p22 = p2 + QPoint(21 * qCos((a2 + 90) * DEG_TO_RAD), 21 * qSin((a2 + 90) * DEG_TO_RAD));
 
@@ -91,12 +99,18 @@ void CMouseMoveWpt::mousePressEvent(QMouseEvent * e)
     point  = e->pos();
     if(e->button() == Qt::RightButton)
     {
+        CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(CGisWorkspace::self().getItemByKey(key));
+        if(wpt != nullptr)
+        {
+            wpt->setHideArea(false);
+        }
         canvas->resetMouse();
-        canvas->update();
+        canvas->triggerCompleteUpdate(CCanvas::eRedrawGis);
     }
     else if(e->button() == Qt::LeftButton)
     {
         mapMove = true;
+        lastPoint = point;
     }
 }
 
@@ -132,10 +146,11 @@ void CMouseMoveWpt::mouseReleaseEvent(QMouseEvent *e)
 
         QPointF pos = e->pos();
         gis->convertPx2Rad(pos);
-        CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(CGisWidget::self().getItemByKey(key));
+        CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(CGisWorkspace::self().getItemByKey(key));
         if(wpt != nullptr)
         {
             wpt->setPosition(pos * RAD_TO_DEG);
+            wpt->setHideArea(false);
         }
         canvas->resetMouse();
         canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
@@ -150,3 +165,13 @@ void CMouseMoveWpt::wheelEvent(QWheelEvent*)
     canvas->update();
 }
 
+void CMouseMoveWpt::afterMouseLostEvent(QMouseEvent *e)
+{
+    if (e->type() == QEvent::MouseMove)
+    {
+        lastPoint = e->pos();
+    }
+    mapMove = e->buttons() & Qt::LeftButton;
+    mapDidMove = true;
+}
+
diff --git a/src/mouse/CMouseMoveWpt.h b/src/mouse/CMouseMoveWpt.h
index 238e20d..84af0d9 100644
--- a/src/mouse/CMouseMoveWpt.h
+++ b/src/mouse/CMouseMoveWpt.h
@@ -39,10 +39,14 @@ public:
     void mouseMoveEvent(QMouseEvent *e) override;
     void mouseReleaseEvent(QMouseEvent *e) override;
     void wheelEvent(QWheelEvent *e) override;
+    void afterMouseLostEvent(QMouseEvent *e) override;
 
 private:
-    IGisItem::key_t key;
-    QPointF origPos;
+    const IGisItem::key_t key;
+    const QPointF origPos;
+    const qreal radius;
+    const bool avoid;
+
     QPointF newPos;
     QPointF focus;
     QPixmap icon;
diff --git a/src/mouse/CMouseNormal.cpp b/src/mouse/CMouseNormal.cpp
index e10fd0f..3e74599 100644
--- a/src/mouse/CMouseNormal.cpp
+++ b/src/mouse/CMouseNormal.cpp
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -18,7 +19,7 @@
 
 #include "canvas/CCanvas.h"
 #include "gis/CGisDraw.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/prj/IGisProject.h"
 #include "gis/rte/CGisItemRte.h"
 #include "gis/trk/CGisItemTrk.h"
@@ -57,7 +58,7 @@ void CMouseNormal::stopTracking() const
     const IGisItem::key_t& key = CGisItemTrk::getKeyUserFocus();
     if(!key.item.isEmpty())
     {
-        CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+        CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
         if(trk != nullptr)
         {
             trk->setMouseFocusByPoint(NOPOINT, CGisItemTrk::eFocusMouseMove, "CMouseNormal");
@@ -112,7 +113,7 @@ void CMouseNormal::mouseMoveEvent(QMouseEvent * e)
         switch(stateItemSel)
         {
         case eStateIdle:
-            CGisWidget::self().mouseMove(point);
+            CGisWorkspace::self().mouseMove(point);
 
         //break; skip break intentionally
         case eStateHooverSingle:
@@ -121,7 +122,7 @@ void CMouseNormal::mouseMoveEvent(QMouseEvent * e)
             const IGisItem::key_t& keyTrk = CGisItemTrk::getKeyUserFocus();
             if(!keyTrk.item.isEmpty())
             {
-                CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(keyTrk));
+                CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(keyTrk));
                 if(trk != nullptr)
                 {
                     trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseMove, "CMouseNormal");
@@ -131,7 +132,7 @@ void CMouseNormal::mouseMoveEvent(QMouseEvent * e)
             const IGisItem::key_t& keyRte = CGisItemRte::getKeyUserFocus();
             if(!keyRte.item.isEmpty())
             {
-                CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWidget::self().getItemByKey(keyRte));
+                CGisItemRte * rte = dynamic_cast<CGisItemRte*>(CGisWorkspace::self().getItemByKey(keyRte));
                 if(rte != nullptr)
                 {
                     rte->setMouseFocusByPoint(point, CGisItemRte::eFocusMouseMove, "CMouseNormal");
@@ -160,17 +161,20 @@ void CMouseNormal::mouseReleaseEvent(QMouseEvent *e)
         {
             switch(stateItemSel)
             {
+            case eStateIdle:
+            {
+                CGisWorkspace::self().slotWksItemSelectionReset();
+                break;
+            }
+
             case eStateHooverSingle:
             {
                 stateItemSel = eStateIdle;
 
-                IGisItem * item = CGisWidget::self().getItemByKey(screenUnclutter->getItemKey());
+                IGisItem * item = CGisWorkspace::self().getItemByKey(screenUnclutter->getItemKey());
                 if(nullptr != item)
                 {
-                    item->treeWidget()->collapseAll();
-                    item->treeWidget()->setCurrentItem(item);
-                    item->treeWidget()->scrollToItem(item, QAbstractItemView::PositionAtCenter);
-
+                    scrollToItem(item);
                     if(setScreenOption(point, item))
                     {
                         stateItemSel = eStateShowItemOptions;
@@ -193,15 +197,12 @@ void CMouseNormal::mouseReleaseEvent(QMouseEvent *e)
                 const CScrOptUnclutter::item_t * scrOpt = screenUnclutter->selectItem(point);
                 if(scrOpt != nullptr)
                 {
-                    IGisItem * item = CGisWidget::self().getItemByKey(scrOpt->key);
+                    IGisItem * item = CGisWorkspace::self().getItemByKey(scrOpt->key);
                     screenUnclutter->clear(); // CAUTION!! this will delete the object scrOpt is pointing to.
                     scrOpt = nullptr;
                     if(item)
                     {
-                        item->treeWidget()->collapseAll();
-                        item->treeWidget()->setCurrentItem(item);
-                        item->treeWidget()->scrollToItem(item, QAbstractItemView::PositionAtCenter);
-
+                        scrollToItem(item);
                         if(setScreenOption(screenUnclutter->getOrigin(), item))
                         {
                             stateItemSel = eStateShowItemOptions;
@@ -210,12 +211,14 @@ void CMouseNormal::mouseReleaseEvent(QMouseEvent *e)
                     }
                 }
                 resetState();
+                CGisWorkspace::self().slotWksItemSelectionReset();
                 break;
             }
 
             case eStateShowItemOptions:
             {
                 resetState();
+                CGisWorkspace::self().slotWksItemSelectionReset();
                 break;
             }
             }
@@ -232,10 +235,10 @@ void CMouseNormal::mouseDoubleClickEvent(QMouseEvent *e)
     if(stateItemSel == eStateIdle)
     {
         const IGisItem::key_t& keyTrk = CGisItemTrk::getKeyUserFocus();
-        CGisWidget::self().focusTrkByKey(false, keyTrk);
+        CGisWorkspace::self().focusTrkByKey(false, keyTrk);
 
         const IGisItem::key_t& keyRte = CGisItemRte::getKeyUserFocus();
-        CGisWidget::self().focusRteByKey(false, keyRte);
+        CGisWorkspace::self().focusRteByKey(false, keyRte);
     }
 }
 
@@ -249,6 +252,19 @@ void CMouseNormal::keyPressEvent(QKeyEvent * e)
     resetState();
 }
 
+void CMouseNormal::afterMouseLostEvent(QMouseEvent *e)
+{
+    resetState();
+
+    if (e->type() == QEvent::MouseMove)
+    {
+        lastPos    = e->pos();
+        firstPos   = lastPos;
+    }
+    mapMove = e->buttons() & Qt::LeftButton;
+    mapDidMove = true;
+}
+
 void CMouseNormal::resetState()
 {
     screenUnclutter->clear();
@@ -259,6 +275,19 @@ void CMouseNormal::resetState()
     stateItemSel = eStateIdle;
 }
 
+void CMouseNormal::scrollToItem(IGisItem * item)
+{
+    QTreeWidget * treeWidget = item->treeWidget();
+    // block signals as this is an internal
+    // change and no user interaction with
+    // the tree widget
+    treeWidget->blockSignals(true);
+    treeWidget->collapseAll();
+    treeWidget->setCurrentItem(item);
+    treeWidget->scrollToItem(item, QAbstractItemView::PositionAtCenter);
+    treeWidget->blockSignals(false);
+}
+
 bool CMouseNormal::setScreenOption(const QPoint& pt, IGisItem * item)
 {
     CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(item);
@@ -302,7 +331,7 @@ void CMouseNormal::draw(QPainter& p, CCanvas::redraw_e needsRedraw, const QRect
             This might be a bit odd but there are two reasons:
 
             1) Multiple update events are combined by the event loop. Thus multiple mouse move
-               events are reduced a single paint event. As getItemsByPos() is quite cycle
+               events are reduced to a single paint event. As getItemsByPos() is quite cycle
                intense this seems like a good idea.
 
             2) The list of items passed back by getItemsByPos() must not be stored. That is why
@@ -313,7 +342,7 @@ void CMouseNormal::draw(QPainter& p, CCanvas::redraw_e needsRedraw, const QRect
         screenUnclutter->clear();
 
         QList<IGisItem*> items;
-        CGisWidget::self().getItemsByPos(point, items);
+        CGisWorkspace::self().getItemsByPos(point, items);
 
         if(items.empty() || items.size() > 8)
         {
@@ -364,7 +393,7 @@ void CMouseNormal::slotAddPoi() const
     gis->convertPx2Rad(pt);
     pt *= RAD_TO_DEG;
 
-    CGisWidget::self().addWptByPos(pt, curPOI.name, curPOI.desc);
+    CGisWorkspace::self().addWptByPos(pt, curPOI.name, curPOI.desc);
     canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
@@ -374,7 +403,7 @@ void CMouseNormal::slotAddWpt() const
     gis->convertPx2Rad(pt);
     pt *= RAD_TO_DEG;
 
-    CGisWidget::self().addWptByPos(pt);
+    CGisWorkspace::self().addWptByPos(pt);
     canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
diff --git a/src/mouse/CMouseNormal.h b/src/mouse/CMouseNormal.h
index eda68bf..3fabb5a 100644
--- a/src/mouse/CMouseNormal.h
+++ b/src/mouse/CMouseNormal.h
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -46,6 +47,7 @@ public:
     void mouseDoubleClickEvent(QMouseEvent *e) override;
     void wheelEvent(QWheelEvent * e) override;
     void keyPressEvent(QKeyEvent * e) override;
+    void afterMouseLostEvent(QMouseEvent *e) override;
 
 private slots:
     void slotAddPoi()           const;
@@ -59,7 +61,7 @@ private slots:
 
 private:
     bool setScreenOption(const QPoint& pt, IGisItem * item);
-
+    void scrollToItem(IGisItem * item);
 protected:
     void stopTracking() const;
     void resetState();
diff --git a/src/mouse/CMouseRadiusWpt.cpp b/src/mouse/CMouseRadiusWpt.cpp
new file mode 100644
index 0000000..75a044f
--- /dev/null
+++ b/src/mouse/CMouseRadiusWpt.cpp
@@ -0,0 +1,144 @@
+/**********************************************************************************************
+    Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
+
+    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 Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "GeoMath.h"
+#include "canvas/CCanvas.h"
+#include "gis/CGisDraw.h"
+#include "gis/CGisWorkspace.h"
+#include "gis/WptIcons.h"
+#include "gis/wpt/CGisItemWpt.h"
+#include "helpers/CDraw.h"
+#include "mouse/CMouseRadiusWpt.h"
+#include "units/IUnit.h"
+
+#include <QtWidgets>
+#include <proj_api.h>
+
+
+#include <QtWidgets>
+
+CMouseRadiusWpt::CMouseRadiusWpt(CGisItemWpt &wpt, CGisDraw * gis, CCanvas * parent)
+    : IMouse(gis, parent),
+    key(wpt.getKey()),
+    wptPosition(wpt.getPosition() * DEG_TO_RAD),
+    avoid(wpt.isNogoArea()),
+    start(true)
+{
+    QPointF pos = GPS_Math_Wpt_Projection(wptPosition,wpt.getProximity(),90 * DEG_TO_RAD);
+    gis->convertRad2Px(pos);
+    point = QPoint(pos.rx(),pos.ry());
+    cursor  = QCursor(QPixmap(":/cursors/cursorRadiusWpt.png"), 0, 0);
+    wpt.setHideArea(true);
+    canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
+}
+
+CMouseRadiusWpt::~CMouseRadiusWpt()
+{
+}
+
+void CMouseRadiusWpt::draw(QPainter& p, CCanvas::redraw_e, const QRect&)
+{
+    QPointF pos = point;
+    gis->convertPx2Rad(pos);
+    dist = GPS_Math_Distance(pos.rx(),pos.ry(),wptPosition.x(),wptPosition.y());
+    QPointF screenPos = wptPosition;
+    gis->convertRad2Px(screenPos);
+    qreal radius = CGisItemWpt::calcRadius(wptPosition,screenPos,dist,gis);
+
+    CGisItemWpt::drawCircle(p,screenPos,radius,avoid,start);
+}
+
+void CMouseRadiusWpt::mousePressEvent(QMouseEvent * e)
+{
+    point  = e->pos();
+    if(e->button() == Qt::RightButton)
+    {
+        QMutexLocker lock(&IGisItem::mutexItems);
+
+        CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(CGisWorkspace::self().getItemByKey(key));
+        if(wpt != nullptr)
+        {
+            wpt->setHideArea(false);
+        }
+        canvas->resetMouse();
+        canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
+    }
+    else if(e->button() == Qt::LeftButton)
+    {
+        mapMove = true;
+        lastPoint = point;
+    }
+    start = false;
+}
+
+void CMouseRadiusWpt::mouseMoveEvent(QMouseEvent * e)
+{
+    point  = e->pos();
+
+    if(mapMove)
+    {
+        if(point != lastPoint)
+        {
+            QPoint delta = point - lastPoint;
+            canvas->moveMap(delta);
+            mapDidMove = true;
+        }
+    }
+
+    lastPoint = point;
+    canvas->update();
+    start = false;
+}
+
+void CMouseRadiusWpt::mouseReleaseEvent(QMouseEvent *e)
+{
+    point = e->pos();
+    if(!mapDidMove && e->button()==Qt::LeftButton)
+    {
+        QMutexLocker lock(&IGisItem::mutexItems);
+
+        CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(CGisWorkspace::self().getItemByKey(key));
+        if(wpt != nullptr)
+        {
+            wpt->setProximity(dist);
+            wpt->setHideArea(false);
+        }
+        canvas->resetMouse();
+        canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
+    }
+
+    mapMove     = false;
+    mapDidMove    = false;
+    start = false;
+}
+
+void CMouseRadiusWpt::wheelEvent(QWheelEvent*)
+{
+    canvas->update();
+}
+
+void CMouseRadiusWpt::afterMouseLostEvent(QMouseEvent *e)
+{
+    if (e->type() == QEvent::MouseMove)
+    {
+        lastPoint = e->pos();
+    }
+    mapMove = e->buttons() & Qt::LeftButton;
+    mapDidMove = true;
+}
diff --git a/src/mouse/CMouseMoveWpt.h b/src/mouse/CMouseRadiusWpt.h
similarity index 74%
copy from src/mouse/CMouseMoveWpt.h
copy to src/mouse/CMouseRadiusWpt.h
index 238e20d..3cfa57e 100644
--- a/src/mouse/CMouseMoveWpt.h
+++ b/src/mouse/CMouseRadiusWpt.h
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -16,36 +17,36 @@
 
 **********************************************************************************************/
 
-#ifndef CMOUSEMOVEWPT_H
-#define CMOUSEMOVEWPT_H
+#ifndef CMOUSERADIUSWPT_H
+#define CMOUSERADIUSWPT_H
 
 #include "gis/IGisItem.h"
 #include "mouse/IMouse.h"
 
-#include <QPixmap>
-
-class CCanvas;
 class CGisItemWpt;
 class CGisDraw;
+class CCanvas;
 
-class CMouseMoveWpt : public IMouse
+class CMouseRadiusWpt : public IMouse
 {
+    Q_OBJECT
 public:
-    CMouseMoveWpt(CGisItemWpt& wpt, CGisDraw * gis, CCanvas * parent);
-    virtual ~CMouseMoveWpt();
+    CMouseRadiusWpt(CGisItemWpt& wpt, CGisDraw * gis, CCanvas * parent);
+    virtual ~CMouseRadiusWpt();
 
     void draw(QPainter& p,  CCanvas::redraw_e needsRedraw, const QRect &rect) override;
     void mousePressEvent(QMouseEvent *e) override;
     void mouseMoveEvent(QMouseEvent *e) override;
     void mouseReleaseEvent(QMouseEvent *e) override;
     void wheelEvent(QWheelEvent *e) override;
+    void afterMouseLostEvent(QMouseEvent *e) override;
 
 private:
-    IGisItem::key_t key;
-    QPointF origPos;
-    QPointF newPos;
-    QPointF focus;
-    QPixmap icon;
+    const IGisItem::key_t key;
+    const QPointF wptPosition;
+    const bool avoid;
+    bool start;
+    qreal dist;
 
     bool mapMove    = false;
     bool mapDidMove   = false;
@@ -53,5 +54,5 @@ private:
     QPoint lastPoint;
 };
 
-#endif //CMOUSEMOVEWPT_H
+#endif //CMOUSERADIUSWPT_H
 
diff --git a/src/mouse/CMouseRangeTrk.cpp b/src/mouse/CMouseRangeTrk.cpp
index 8332aa9..285c6a1 100644
--- a/src/mouse/CMouseRangeTrk.cpp
+++ b/src/mouse/CMouseRangeTrk.cpp
@@ -18,7 +18,7 @@
 
 #include "canvas/CCanvas.h"
 #include "gis/CGisDraw.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/trk/CGisItemTrk.h"
 #include "mouse/CMouseRangeTrk.h"
 #include "mouse/CScrOptRangeTrk.h"
@@ -42,7 +42,7 @@ CMouseRangeTrk::~CMouseRangeTrk()
 {
     canvas->reportStatus(key.item, "");
 
-    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
     if(trk)
     {
         trk->setMode(CGisItemTrk::eModeNormal, "CMouseRangeTrk");
@@ -54,7 +54,7 @@ CMouseRangeTrk::~CMouseRangeTrk()
 
 void CMouseRangeTrk::draw(QPainter& p,  CCanvas::redraw_e, const QRect &)
 {
-    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
     if(trk)
     {
         trk->drawRange(p);
@@ -110,7 +110,7 @@ void CMouseRangeTrk::mouseMoveEvent(QMouseEvent * e)
         {
         case eStateIdle:
         {
-            CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+            CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
             if(trk != nullptr)
             {
                 anchor = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseMove, "CMouseRangeTrk");
@@ -121,7 +121,7 @@ void CMouseRangeTrk::mouseMoveEvent(QMouseEvent * e)
 
         case eStateSelectRange:
         {
-            CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+            CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
             if(trk != nullptr)
             {
                 anchor = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseMove, "CMouseRangeTrk");
@@ -147,7 +147,7 @@ void CMouseRangeTrk::mouseReleaseEvent(QMouseEvent *e)
             {
             case eStateIdle:
             {
-                CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+                CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
                 if(trk != nullptr && anchor != NOPOINTF)
                 {
                     anchor = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseClick, "CMouseRangeTrk");
@@ -160,7 +160,7 @@ void CMouseRangeTrk::mouseReleaseEvent(QMouseEvent *e)
 
             case eStateSelectRange:
             {
-                CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+                CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
                 if(trk != nullptr && anchor != NOPOINTF)
                 {
                     QPointF pt = trk->setMouseFocusByPoint(point, CGisItemTrk::eFocusMouseClick, "CMouseRangeTrk");
@@ -205,9 +205,24 @@ void CMouseRangeTrk::keyPressEvent(QKeyEvent * e)
     }
 }
 
+void CMouseRangeTrk::afterMouseLostEvent(QMouseEvent *e)
+{
+    if(state == eStateRangeSelected)
+    {
+        resetState();
+    }
+
+    if (e->type() == QEvent::MouseMove)
+    {
+        firstPoint = e->pos();
+    }
+    mapMove = e->buttons() & Qt::LeftButton;
+    mapDidMove = true;
+}
+
 void CMouseRangeTrk::resetState()
 {
-    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
     if(trk != nullptr)
     {
         trk->setMouseFocusByPoint(NOPOINT, CGisItemTrk::eFocusMouseMove, "CMouseRangeTrk");
@@ -229,7 +244,7 @@ void CMouseRangeTrk::slotHidePoints()
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
-    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
     if(trk != nullptr)
     {
         trk->hideSelectedPoints();
@@ -243,7 +258,7 @@ void CMouseRangeTrk::slotShowPoints()
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
-    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
     if(trk != nullptr)
     {
         trk->showSelectedPoints();
@@ -257,7 +272,7 @@ void CMouseRangeTrk::slotActivity(quint32 flags)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
-    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
     if(nullptr != trk)
     {
         trk->setActivityRange(flags);
@@ -272,7 +287,7 @@ void CMouseRangeTrk::slotCopy()
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
-    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
+    CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWorkspace::self().getItemByKey(key));
     if(trk != nullptr)
     {
         trk->copySelectedPoints();
diff --git a/src/mouse/CMouseRangeTrk.h b/src/mouse/CMouseRangeTrk.h
index 85ff78c..61455fd 100644
--- a/src/mouse/CMouseRangeTrk.h
+++ b/src/mouse/CMouseRangeTrk.h
@@ -41,6 +41,7 @@ public:
     void mouseReleaseEvent(QMouseEvent *e) override;
     void wheelEvent(QWheelEvent *e) override;
     void keyPressEvent(QKeyEvent *e) override;
+    void afterMouseLostEvent(QMouseEvent *e) override;
 
 private slots:
     void slotHidePoints();
diff --git a/src/mouse/CMouseSelect.cpp b/src/mouse/CMouseSelect.cpp
index 334365d..84b4bd3 100644
--- a/src/mouse/CMouseSelect.cpp
+++ b/src/mouse/CMouseSelect.cpp
@@ -17,7 +17,7 @@
 **********************************************************************************************/
 
 #include "gis/CGisDraw.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "helpers/CWptIconDialog.h"
 #include "mouse/CMouseSelect.h"
 #include "mouse/CScrOptSelect.h"
@@ -58,7 +58,7 @@ void CMouseSelect::findItems(QList<IGisItem*>& items)
     {
         if(!itemKeys.isEmpty())
         {
-            CGisWidget::self().getItemsByKeys(itemKeys, items);
+            CGisWorkspace::self().getItemsByKeys(itemKeys, items);
         }
     }
     else
@@ -67,7 +67,7 @@ void CMouseSelect::findItems(QList<IGisItem*>& items)
 
         QRectF area;
         rectRad2Px(rectSelection, area);
-        CGisWidget::self().getItemsByArea(area, modeSelection, items);
+        CGisWorkspace::self().getItemsByArea(area, modeSelection, items);
 
         cntWpt = 0;
         cntTrk = 0;
@@ -152,31 +152,31 @@ void CMouseSelect::draw(QPainter& p, CCanvas::redraw_e needsRedraw, const QRect
 
 void CMouseSelect::slotCopy() const
 {
-    CGisWidget::self().copyItemsByKey(itemKeys);
+    CGisWorkspace::self().copyItemsByKey(itemKeys);
     canvas->resetMouse();
 }
 
 void CMouseSelect::slotDelete() const
 {
-    CGisWidget::self().delItemsByKey(itemKeys);
+    CGisWorkspace::self().delItemsByKey(itemKeys);
     canvas->resetMouse();
 }
 
 void CMouseSelect::slotRoute() const
 {
-    CGisWidget::self().makeRteFromWpt(itemKeys);
+    CGisWorkspace::self().makeRteFromWpt(itemKeys);
     canvas->resetMouse();
 }
 
 void CMouseSelect::slotCombineTrk() const
 {
-    CGisWidget::self().combineTrkByKey(itemKeys, itemKeys);
+    CGisWorkspace::self().combineTrkByKey(itemKeys, itemKeys);
     canvas->resetMouse();
 }
 
 void CMouseSelect::slotActivityTrk() const
 {
-    CGisWidget::self().activityTrkByKey(itemKeys);
+    CGisWorkspace::self().activityTrkByKey(itemKeys);
     canvas->resetMouse();
 }
 
@@ -189,6 +189,6 @@ void CMouseSelect::slotSymWpt() const
         return;
     }
 
-    CGisWidget::self().changeWptSymByKey(itemKeys, tb.objectName());
+    CGisWorkspace::self().changeWptSymByKey(itemKeys, tb.objectName());
     canvas->resetMouse();
 }
diff --git a/src/mouse/CMouseWptBubble.cpp b/src/mouse/CMouseWptBubble.cpp
index c9690ec..0813eb8 100644
--- a/src/mouse/CMouseWptBubble.cpp
+++ b/src/mouse/CMouseWptBubble.cpp
@@ -17,7 +17,7 @@
 **********************************************************************************************/
 
 #include "canvas/CCanvas.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/wpt/CGisItemWpt.h"
 #include "mouse/CMouseWptBubble.h"
 
@@ -44,7 +44,7 @@ void CMouseWptBubble::mousePressEvent(QMouseEvent * e)
 
     QPointF pos = e->pos();
 
-    CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(CGisWidget::self().getItemByKey(key));
+    CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(CGisWorkspace::self().getItemByKey(key));
     if(wpt)
     {
         wpt->mousePress(pos);
@@ -61,7 +61,7 @@ void CMouseWptBubble::mouseMoveEvent(QMouseEvent * e)
 
     QPointF pos = e->pos();
 
-    CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(CGisWidget::self().getItemByKey(key));
+    CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(CGisWorkspace::self().getItemByKey(key));
     if(wpt)
     {
         wpt->mouseMove(pos);
@@ -78,7 +78,7 @@ void CMouseWptBubble::mouseReleaseEvent(QMouseEvent *e)
 
     QPointF pos = e->pos();
 
-    CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(CGisWidget::self().getItemByKey(key));
+    CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(CGisWorkspace::self().getItemByKey(key));
     if(wpt)
     {
         wpt->mouseRelease(pos);
@@ -88,7 +88,3 @@ void CMouseWptBubble::mouseReleaseEvent(QMouseEvent *e)
         canvas->resetMouse();
     }
 }
-
-void CMouseWptBubble::wheelEvent(QWheelEvent*)
-{
-}
diff --git a/src/mouse/CMouseWptBubble.h b/src/mouse/CMouseWptBubble.h
index f3aa7b1..be60074 100644
--- a/src/mouse/CMouseWptBubble.h
+++ b/src/mouse/CMouseWptBubble.h
@@ -37,7 +37,6 @@ public:
     void mousePressEvent(QMouseEvent *e) override;
     void mouseMoveEvent(QMouseEvent *e) override;
     void mouseReleaseEvent(QMouseEvent *e) override;
-    void wheelEvent(QWheelEvent *e) override;
 
 private:
     const IGisItem::key_t& key;
diff --git a/src/mouse/IMouse.h b/src/mouse/IMouse.h
index 11790ea..2a7e167 100644
--- a/src/mouse/IMouse.h
+++ b/src/mouse/IMouse.h
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -26,6 +27,7 @@
 #include <QPointer>
 
 class QMouseEvent;
+class QPinchGesture;
 class QWheelEvent;
 class QTimer;
 class CGisDraw;
@@ -44,10 +46,18 @@ public:
     virtual void mouseDoubleClickEvent(QMouseEvent *e)
     {
     }
-    virtual void wheelEvent(QWheelEvent *e) = 0;
+    virtual void wheelEvent(QWheelEvent *e)
+    {
+    }
     virtual void keyPressEvent(QKeyEvent *e)
     {
     }
+    virtual void pinchGestureEvent(QPinchGesture *e)
+    {
+    }
+    virtual void afterMouseLostEvent(QMouseEvent *e)
+    {
+    }
 
     /// the current mouse cursor
     /**
@@ -66,6 +76,9 @@ public:
 
     virtual void setMouseTracking(bool enabled);
 
+    const static int longButtonPressTimeout = 400;
+    const static int minimalMouseMovingDistance = 4;
+
 protected:
     /// the functions mouse icon
     QCursor cursor;
diff --git a/src/mouse/IMouseSelect.cpp b/src/mouse/IMouseSelect.cpp
index b6f1e0d..c34f347 100644
--- a/src/mouse/IMouseSelect.cpp
+++ b/src/mouse/IMouseSelect.cpp
@@ -299,8 +299,3 @@ void IMouseSelect::mouseReleaseEvent(QMouseEvent *e)
 
     canvas->update();
 }
-
-void IMouseSelect::wheelEvent(QWheelEvent * e)
-{
-}
-
diff --git a/src/mouse/IMouseSelect.h b/src/mouse/IMouseSelect.h
index cd34eca..a5bf9c9 100644
--- a/src/mouse/IMouseSelect.h
+++ b/src/mouse/IMouseSelect.h
@@ -36,8 +36,6 @@ public:
     void mousePressEvent(QMouseEvent * e) override;
     void mouseMoveEvent(QMouseEvent * e) override;
     void mouseReleaseEvent(QMouseEvent *e) override;
-    void wheelEvent(QWheelEvent * e) override;
-
 
 protected:
     void rectRad2Px(const QRectF& rectSrc, QRectF& rectTar) const;
diff --git a/src/mouse/IScrOpt.cpp b/src/mouse/IScrOpt.cpp
index 440cbdc..1477c69 100644
--- a/src/mouse/IScrOpt.cpp
+++ b/src/mouse/IScrOpt.cpp
@@ -16,6 +16,7 @@
 
 **********************************************************************************************/
 
+#include "gis/CGisWorkspace.h"
 #include "helpers/CDraw.h"
 #include "mouse/IMouse.h"
 #include "mouse/IScrOpt.h"
@@ -36,6 +37,7 @@ IScrOpt::~IScrOpt()
     {
         CCanvas::setOverrideCursor(*mouse,"IScrOpt::~IScrOpt");
     }
+    CGisWorkspace::self().slotWksItemSelectionReset();
 }
 
 void IScrOpt::mouseMoveEvent(QMouseEvent * e)
diff --git a/src/mouse/line/CLineOpAddPoint.cpp b/src/mouse/line/CLineOpAddPoint.cpp
index d8f8a07..2b4ac34 100644
--- a/src/mouse/line/CLineOpAddPoint.cpp
+++ b/src/mouse/line/CLineOpAddPoint.cpp
@@ -42,6 +42,9 @@ void CLineOpAddPoint::append()
     points.insert(idxFocus, IGisLine::point_t(points.last()));
     addPoint = true;
     isPoint  = true;
+    // make sure that when starting the line-edit on-the-fly-routing will
+    // not trigger before the mouse has been moved a bit away from last point of line
+    startMouseMove(points.last().pixel);
 }
 
 void CLineOpAddPoint::mouseReleaseEventEx(QMouseEvent * e)
diff --git a/src/mouse/line/CLineOpDeletePoint.cpp b/src/mouse/line/CLineOpDeletePoint.cpp
index f33115f..a272121 100644
--- a/src/mouse/line/CLineOpDeletePoint.cpp
+++ b/src/mouse/line/CLineOpDeletePoint.cpp
@@ -41,7 +41,7 @@ void CLineOpDeletePoint::mouseMoveEventEx(QMouseEvent * e)
 
 void CLineOpDeletePoint::mouseReleaseEventEx(QMouseEvent *e)
 {
-    if(mapDidNotMove() && idxFocus != NOIDX)
+    if(idxFocus != NOIDX)
     {
         if(idxFocus > 0)
         {
diff --git a/src/mouse/line/ILineOp.cpp b/src/mouse/line/ILineOp.cpp
index 97f68a2..2441dbf 100644
--- a/src/mouse/line/ILineOp.cpp
+++ b/src/mouse/line/ILineOp.cpp
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014-2015 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess at t-online.de
 
     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
@@ -119,11 +120,16 @@ void ILineOp::mousePressEvent(QMouseEvent * e)
     if(e->button() == Qt::LeftButton)
     {
         lastPos    = e->pos();
-        firstPos   = lastPos;
         mapMove    = true;
-        mapDidMove = false;
     }
 
+    // make sure that on-the-fly-routing will
+    // not trigger before the mouse has been moved a bit
+    startMouseMove(e->pos());
+    // make sure a click is actually shorter than longButtonPressTimeout
+    buttonPressTime.start();
+    ignoreClick = false;
+
     showRoutingErrorMessage(QString());
 }
 
@@ -131,28 +137,89 @@ void ILineOp::mouseMoveEvent(QMouseEvent * e)
 {
     const QPoint& pos = e->pos();
 
-    if(mapMove && ((pos - firstPos).manhattanLength() >= 4))
+    // do not take the mouse as moving unless it has been moved
+    // by significant distance away from starting point.
+    // this helps doing clicks with the finger on a touchscreen
+    // and suppresses routing triggered by very small movements.
+    if (!mouseDidMove && (pos - firstPos).manhattanLength() >= IMouse::minimalMouseMovingDistance)
     {
-        QPoint delta = pos - lastPos;
-        canvas->moveMap(delta);
-        mapDidMove  = true;
+        mouseDidMove = true;
     }
 
-    updateLeadLines(idxFocus);
-    mouseMoveEventEx(e);
+    if (mouseDidMove)
+    {
+        if(mapMove)
+        {
+            QPoint delta = pos - lastPos;
+            canvas->moveMap(delta);
+        }
+        else
+        {
+            updateLeadLines(idxFocus);
+            mouseMoveEventEx(e);
+        }
+    }
 
     lastPos = pos;
 }
 
 void ILineOp::mouseReleaseEvent(QMouseEvent *e)
 {
-    if(!mapDidMove)
+    // suppress map-movement, long-clicks and button-release after zooming or display of CProgressDialog
+    if(!(mouseDidMove && mapMove) && !ignoreClick && (buttonPressTime.elapsed() < IMouse::longButtonPressTimeout))
     {
         mouseReleaseEventEx(e);
     }
 
     mapMove     = false;
-    mapDidMove  = false;
+    mouseDidMove  = false;
+}
+
+void ILineOp::wheelEvent(QWheelEvent *e)
+{
+    // suppress little mouse-movements that are likely to happen when scrolling the mousewheel.
+    startMouseMove(e->pos());
+    if (e->buttons() != Qt::NoButton)
+    {
+        // no shortclick by releasing button right after scrolling the wheel
+        ignoreClick = true;
+    }
+}
+
+void ILineOp::pinchGestureEvent(QPinchGesture *e)
+{
+    // consider finger being down (equivalent to button pressed) during pinch
+    mapMove = true;
+    // no shortclick by lifting the finger right after a pinch
+    ignoreClick = true;
+    // no on-the-fly-routing during pinch
+    timerRouting->stop();
+}
+
+void ILineOp::afterMouseLostEvent(QMouseEvent *e)
+{
+    // pinch or modal dialog interrupt tracking of mouse. As result the mouse
+    // is at an arbitrary position.
+    if (e->type() == QEvent::MouseMove)
+    {
+        // suppress jump of map when touching screen right afterwards
+        lastPos    = e->pos();
+        // consider the move starting at this position
+        startMouseMove(e->pos());
+    }
+    mapMove = e->buttons() & Qt::LeftButton;
+}
+
+void ILineOp::startMouseMove(const QPointF& pos)
+{
+    // the mouse is not considered as moving
+    // as long it has not been moved away from firstPos
+    // by at least a few pixels.
+    firstPos = pos.toPoint();
+    mouseDidMove = false;
+    // as long the mouse is not taken as moving
+    // to not trigger on-the-fly-routing
+    timerRouting->stop();
 }
 
 void ILineOp::updateLeadLines(qint32 idx)
@@ -233,7 +300,7 @@ void ILineOp::tryRouting(IGisLine::point_t& pt1, IGisLine::point_t& pt2) const
     {
         showRoutingErrorMessage(msg);
     }
-    // that is a workaround for canvas loosing mousetracking caused by modal CProgressDialog:
+    // that is a workaround for canvas loosing mousetracking caused by CProgressDialog being modal:
     canvas->setMouseTracking(true);
 }
 
@@ -255,7 +322,6 @@ void ILineOp::finalizeOperation(qint32 idx)
         {
             tryRouting(points[idx], points[idx + 1]);
         }
-
         CCanvas::restoreOverrideCursor("ILineOp::finalizeOperation");
     }
     else if(parentHandler->useVectorRouting())
@@ -281,6 +347,9 @@ void ILineOp::finalizeOperation(qint32 idx)
         }
     }
 
+    // need to move the mouse away by some pixels to trigger next routing event
+    startMouseMove(points[idx].pixel);
+
     parentHandler->updateStatus();
 }
 
diff --git a/src/mouse/line/ILineOp.h b/src/mouse/line/ILineOp.h
index 7ebd629..58976ab 100644
--- a/src/mouse/line/ILineOp.h
+++ b/src/mouse/line/ILineOp.h
@@ -27,6 +27,7 @@
 #include <QRect>
 
 class QMouseEvent;
+class QPinchGesture;
 class CCanvas;
 class QPainter;
 class IMouseEditLine;
@@ -46,14 +47,15 @@ public:
     virtual void mouseMoveEventEx(QMouseEvent * e) = 0;
     virtual void mouseReleaseEventEx(QMouseEvent *e) = 0;
 
-    virtual void wheelEvent(QWheelEvent*)
-    {
-    }
+    virtual void wheelEvent(QWheelEvent*);
 
     virtual void keyPressEvent(QKeyEvent*)
     {
     }
 
+    virtual void pinchGestureEvent(QPinchGesture *e);
+    virtual void afterMouseLostEvent(QMouseEvent *e);
+
     virtual void drawFg(QPainter& p) = 0;
     virtual void drawBg(QPainter& p);
 
@@ -93,10 +95,7 @@ protected:
     void drawLeadLine(const QPolygonF& line, QPainter& p) const;
     void updateLeadLines(qint32 idx);
 
-    bool mapDidNotMove()
-    {
-        return !mapDidMove;
-    }
+    void startMouseMove(const QPointF &pos);
 
     IMouseEditLine * parentHandler;
     SGisLine& points;
@@ -131,9 +130,11 @@ private:
     void tryRouting(IGisLine::point_t& pt1, IGisLine::point_t& pt2) const;
 
     QTimer * timerRouting;
+    QTime buttonPressTime;
 
+    bool ignoreClick = false;
     bool mapMove = false;
-    bool mapDidMove = false;
+    bool mouseDidMove = false;
 };
 
 #endif //ILINEOP_H
diff --git a/src/mouse/line/IMouseEditLine.cpp b/src/mouse/line/IMouseEditLine.cpp
index 8b4d976..e50a097 100644
--- a/src/mouse/line/IMouseEditLine.cpp
+++ b/src/mouse/line/IMouseEditLine.cpp
@@ -283,6 +283,17 @@ void IMouseEditLine::keyPressEvent(QKeyEvent * e)
     lineOp->keyPressEvent(e);
 }
 
+void IMouseEditLine::pinchGestureEvent(QPinchGesture *e)
+{
+    lineOp->pinchGestureEvent(e);
+}
+
+void IMouseEditLine::afterMouseLostEvent(QMouseEvent *e)
+{
+    point = e->pos();
+    lineOp->afterMouseLostEvent(e);
+}
+
 
 void IMouseEditLine::slotDeletePoint()
 {
diff --git a/src/mouse/line/IMouseEditLine.h b/src/mouse/line/IMouseEditLine.h
index a36f7c3..ce10d64 100644
--- a/src/mouse/line/IMouseEditLine.h
+++ b/src/mouse/line/IMouseEditLine.h
@@ -64,6 +64,8 @@ public:
     void mouseReleaseEvent(QMouseEvent *e) override;
     void wheelEvent(QWheelEvent *e) override;
     void keyPressEvent(QKeyEvent *e) override;
+    void pinchGestureEvent(QPinchGesture *e) override;
+    void afterMouseLostEvent(QMouseEvent *e) override;
 
     void abortStep();
 
diff --git a/src/plot/CPlot.cpp b/src/plot/CPlot.cpp
index 9636204..6969245 100644
--- a/src/plot/CPlot.cpp
+++ b/src/plot/CPlot.cpp
@@ -52,12 +52,12 @@ void CPlot::setup(const CPropertyTrk::property_t& p)
         QString unit;
         IUnit::self().meter2unit(trk->getTotalDistance(), scale, unit);
         setXTicScale(scale);
-        setXLabel(tr("distance [%1]").arg(unit));
+        setXLabel(tr("Distance [%1]").arg(unit));
     }
     else if(p.axisType == CPropertyTrk::property_t::eAxisTime)
     {
         data->setXAxisType(CPlotData::eAxisTime);
-        setXLabel(tr("time"));
+        setXLabel(tr("Time"));
     }
 
     setYLabel(p.yLabel);
diff --git a/src/plot/CPlotProfile.cpp b/src/plot/CPlotProfile.cpp
index 4c6102c..81b32bc 100644
--- a/src/plot/CPlotProfile.cpp
+++ b/src/plot/CPlotProfile.cpp
@@ -76,8 +76,8 @@ void CPlotProfile::updateData()
     }
     else
     {
-        setXLabel(tr("distance [%1]").arg(unit));
-        setYLabel(tr("alt. [%1]").arg(IUnit::self().baseunit));
+        setXLabel(tr("Distance [%1]").arg(unit));
+        setYLabel(tr("Ele. [%1]").arg(IUnit::self().baseunit));
     }
 
     QPolygonF lineEle;
diff --git a/src/plot/IPlot.cpp b/src/plot/IPlot.cpp
index 8734ee1..7f97249 100644
--- a/src/plot/IPlot.cpp
+++ b/src/plot/IPlot.cpp
@@ -21,7 +21,7 @@
 #include "plot/IPlot.h"
 
 #include "CMainWindow.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/trk/CActivityTrk.h"
 #include "gis/wpt/CGisItemWpt.h"
 #include "helpers/CDraw.h"
@@ -532,7 +532,7 @@ void IPlot::wheelEvent(QWheelEvent * e)
 
     if(doVerticalZoom)
     {
-        data->y().zoom(in, e->pos().y() - bottom);
+        data->y().zoom(in, bottom - e->pos().y());
         setSizes();
         data->y().setScale(rectGraphArea.height());
     }
@@ -1387,7 +1387,7 @@ void IPlot::slotAddWpt()
         return;
     }
 
-    CGisWidget::self().addWptByPos({trkpt->lon, trkpt->lat});
+    CGisWorkspace::self().addWptByPos({trkpt->lon, trkpt->lat});
     CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
@@ -1404,7 +1404,7 @@ void IPlot::slotCutTrk()
        plot and needs to destroy it. This would be impossible if we are still in this method
        because the API call did not return yet.
      */
-    CGisWidget::self().postEventForWks(new CEvtA2WCutTrk(trk->getKey()));
+    CGisWorkspace::self().postEventForWks(new CEvtA2WCutTrk(trk->getKey()));
 }
 
 void IPlot::setMouseRangeFocus(const CTrackData::trkpt_t * ptRange1, const CTrackData::trkpt_t *ptRange2)
diff --git a/src/print/CPrintDialog.cpp b/src/print/CPrintDialog.cpp
index dd68c2e..df49a04 100644
--- a/src/print/CPrintDialog.cpp
+++ b/src/print/CPrintDialog.cpp
@@ -19,7 +19,7 @@
 #include "CMainWindow.h"
 #include "GeoMath.h"
 #include "canvas/CCanvas.h"
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/rte/CGisItemRte.h"
 #include "gis/trk/CGisItemTrk.h"
 #include "helpers/CDraw.h"
diff --git a/src/qlgt/converter.cpp b/src/qlgt/converter.cpp
index 4eb648e..3527f63 100644
--- a/src/qlgt/converter.cpp
+++ b/src/qlgt/converter.cpp
@@ -46,8 +46,8 @@ CDBProject::CDBProject(CQlgtFolder& folder)
     }
 }
 
-CGisItemWpt::CGisItemWpt(const CQlgtWpt& wpt1)
-    : IGisItem(nullptr, eTypeWpt, NOIDX)
+CGisItemWpt::CGisItemWpt(const CQlgtWpt& wpt1, IGisProject * project)
+    : IGisItem(project, eTypeWpt, NOIDX)
 {
     qreal direction;
     QDateTime time = QDateTime::fromTime_t(wpt1.timestamp,QTimeZone("UTC"));
@@ -127,14 +127,15 @@ CGisItemWpt::CGisItemWpt(const CQlgtWpt& wpt1)
 
         images << image;
     }
+    boundingRect = QRectF(QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD,QPointF(wpt.lon,wpt.lat)*DEG_TO_RAD);
     setIcon();
     genKey();
     setupHistory();
 }
 
 
-CGisItemTrk::CGisItemTrk(const CQlgtTrack &trk1)
-    : IGisItem(nullptr, eTypeTrk, NOIDX)
+CGisItemTrk::CGisItemTrk(const CQlgtTrack &trk1, IGisProject * project)
+    : IGisItem(project, eTypeTrk, NOIDX)
     , activities(this)
 {
     trk.name        = trk1.name;
@@ -209,8 +210,8 @@ CGisItemTrk::CGisItemTrk(const CQlgtTrack &trk1)
     }
 }
 
-CGisItemTrk::CGisItemTrk(const IQlgtOverlay& ovl)
-    : IGisItem(0, eTypeTrk, NOIDX)
+CGisItemTrk::CGisItemTrk(const IQlgtOverlay& ovl, IGisProject * project)
+    : IGisItem(project, eTypeTrk, NOIDX)
     , activities(this)
 {
     trk.name    = ovl.name;
@@ -243,8 +244,8 @@ CGisItemTrk::CGisItemTrk(const IQlgtOverlay& ovl)
 
 
 
-CGisItemOvlArea::CGisItemOvlArea(const IQlgtOverlay& ovl)
-    : IGisItem(0, eTypeOvl, NOIDX)
+CGisItemOvlArea::CGisItemOvlArea(const IQlgtOverlay& ovl, IGisProject * project)
+    : IGisItem(project, eTypeOvl, NOIDX)
 {
     area.name       = ovl.name;
     area.cmt        = ovl.comment;
@@ -271,8 +272,8 @@ CGisItemOvlArea::CGisItemOvlArea(const IQlgtOverlay& ovl)
 }
 
 
-CGisItemRte::CGisItemRte(const CQlgtRoute& rte1)
-    : IGisItem(0, eTypeRte, NOIDX)
+CGisItemRte::CGisItemRte(const CQlgtRoute& rte1, IGisProject * project)
+    : IGisItem(project, eTypeRte, NOIDX)
 {
     rte.name        = rte1.name;
     rte.cmt         = rte1.comment;
diff --git a/src/resources.qrc b/src/resources.qrc
index 808a9db..a58370e 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -1,459 +1,505 @@
 <RCC>
     <qresource prefix="/">
-        <file>icons/8x8/bullet_black.png</file>
-        <file>icons/8x8/bullet_blue.png</file>
-        <file>icons/8x8/bullet_brown.png</file>
-        <file>icons/8x8/bullet_cyan.png</file>
-        <file>icons/8x8/bullet_dark_blue.png</file>
-        <file>icons/8x8/bullet_dark_cyan.png</file>
-        <file>icons/8x8/bullet_dark_gray.png</file>
-        <file>icons/8x8/bullet_dark_green.png</file>
-        <file>icons/8x8/bullet_dark_magenta.png</file>
-        <file>icons/8x8/bullet_dark_red.png</file>
-        <file>icons/8x8/bullet_dark_yellow.png</file>
-        <file>icons/8x8/bullet_gray.png</file>
-        <file>icons/8x8/bullet_green.png</file>
-        <file>icons/8x8/bullet_magenta.png</file>
-        <file>icons/8x8/bullet_orange.png</file>
-        <file>icons/8x8/bullet_red.png</file>
-        <file>icons/8x8/bullet_white.png</file>
-        <file>icons/8x8/bullet_yellow.png</file>
-        <file>icons/16x16/ActNone.png</file>
-        <file>icons/16x16/ActFoot.png</file>
-        <file>icons/16x16/ActCycle.png</file>
+        <file>animation/loader.gif</file>
+        <file>animation/loader2.gif</file>
+        
+        <file>cursors/cursorArrow.png</file>
+        <file>cursors/cursorDelete.png</file>
+        <file>cursors/cursorMove.png</file>
+        <file>cursors/cursorMoveArea.png</file>
+        <file>cursors/cursorMoveLine.png</file>
+        <file>cursors/cursorMoveMap.png</file>
+        <file>cursors/cursorMoveWpt.png</file>
+        <file>cursors/cursorPointAdd.png</file>
+        <file>cursors/cursorPointDel.png</file>
+        <file>cursors/cursorPointMove.png</file>
+        <file>cursors/cursorPrint.png</file>
+        <file>cursors/cursorRadiusWpt.png</file>
+        <file>cursors/cursorSave.png</file>
+        <file>cursors/cursorSelectArea.png</file>
+        <file>cursors/cursorSelectRange.png</file>
+        <file>cursors/wptHighlightBlue.png</file>
+        <file>cursors/wptHighlightRed.png</file>
+        
+        <file>icons/16x16/ActAero.png</file>
         <file>icons/16x16/ActBike.png</file>
-        <file>icons/16x16/ActCar.png</file>
         <file>icons/16x16/ActCable.png</file>
+        <file>icons/16x16/ActCar.png</file>
+        <file>icons/16x16/ActCycle.png</file>
+        <file>icons/16x16/ActFoot.png</file>
+        <file>icons/16x16/ActNone.png</file>
         <file>icons/16x16/ActShip.png</file>
-        <file>icons/16x16/ActSwim.png</file>
-        <file>icons/16x16/ActAero.png</file>
         <file>icons/16x16/ActSki.png</file>
+        <file>icons/16x16/ActSwim.png</file>
         <file>icons/16x16/ActTrain.png</file>
         <file>icons/16x16/EditDetails.png</file>
+        
+        <file>icons/32x32/2NavProject.png</file>
+        <file>icons/32x32/A.png</file>
+        <file>icons/32x32/ActAero.png</file>
+        <file>icons/32x32/ActBike.png</file>
+        <file>icons/32x32/ActCable.png</file>
+        <file>icons/32x32/ActCar.png</file>
+        <file>icons/32x32/ActCycle.png</file>
+        <file>icons/32x32/ActFoot.png</file>
+        <file>icons/32x32/ActNone.png</file>
+        <file>icons/32x32/ActShip.png</file>
+        <file>icons/32x32/ActSki.png</file>
+        <file>icons/32x32/ActSwim.png</file>
+        <file>icons/32x32/ActTrain.png</file>
+        <file>icons/32x32/Activity.png</file>
         <file>icons/32x32/Add.png</file>
+        <file>icons/32x32/AddArea.png</file>
+        <file>icons/32x32/AddImage.png</file>
         <file>icons/32x32/AddMapWorkspace.png</file>
-        <file>icons/32x32/CloneMapWorkspace.png</file>
+        <file>icons/32x32/AddProject.png</file>
+        <file>icons/32x32/AddRte.png</file>
+        <file>icons/32x32/AddTrk.png</file>
+        <file>icons/32x32/AddWpt.png</file>
+        <file>icons/32x32/Apply.png</file>
+        <file>icons/32x32/Area.png</file>
+        <file>icons/32x32/AreaMove.png</file>
+        <file>icons/32x32/AreaOn.png</file>
+        <file>icons/32x32/ArrowDef.png</file>
+        <file>icons/32x32/ArrowUser.png</file>
+        <file>icons/32x32/AutoSave.png</file>
+        <file>icons/32x32/Bubble.png</file>
+        <file>icons/32x32/CSrcATemp.png</file>
+        <file>icons/32x32/CSrcAccel.png</file>
+        <file>icons/32x32/CSrcCAD.png</file>
+        <file>icons/32x32/CSrcCourse.png</file>
+        <file>icons/32x32/CSrcDepth.png</file>
+        <file>icons/32x32/CSrcDistance.png</file>
+        <file>icons/32x32/CSrcElevation.png</file>
+        <file>icons/32x32/CSrcEnergy.png</file>
+        <file>icons/32x32/CSrcHR.png</file>
+        <file>icons/32x32/CSrcSeaLevelPressure.png</file>
+        <file>icons/32x32/CSrcSlope.png</file>
+        <file>icons/32x32/CSrcSolid.png</file>
+        <file>icons/32x32/CSrcSpeed.png</file>
+        <file>icons/32x32/CSrcUnknown.png</file>
+        <file>icons/32x32/CSrcVertSpeed.png</file>
+        <file>icons/32x32/CSrcWTemp.png</file>
         <file>icons/32x32/Cancel.png</file>
         <file>icons/32x32/Check.png</file>
+        <file>icons/32x32/CloneMapWorkspace.png</file>
+        <file>icons/32x32/Close.png</file>
+        <file>icons/32x32/Combine.png</file>
+        <file>icons/32x32/Copy.png</file>
+        <file>icons/32x32/CopyTrkWithWpt.png</file>
+        <file>icons/32x32/Cut.png</file>
+        <file>icons/32x32/CutHistoryAfter.png</file>
+        <file>icons/32x32/CutHistoryBefore.png</file>
+        <file>icons/32x32/CutMode1.png</file>
+        <file>icons/32x32/CutMode2.png</file>
+        <file>icons/32x32/DBProject.png</file>
+        <file>icons/32x32/Database.png</file>
+        <file>icons/32x32/DatabaseConvert.png</file>
+        <file>icons/32x32/DatabaseSetup.png</file>
+        <file>icons/32x32/DatabaseSync.png</file>
+        <file>icons/32x32/DelImage.png</file>
         <file>icons/32x32/DeleteMultiple.png</file>
         <file>icons/32x32/DeleteOne.png</file>
+        <file>icons/32x32/Device.png</file>
         <file>icons/32x32/Down.png</file>
-        <file>icons/32x32/FolderMap.png</file>
+        <file>icons/32x32/EditDetails.png</file>
+        <file>icons/32x32/EditText.png</file>
+        <file>icons/32x32/Empty.png</file>
+        <file>icons/32x32/Error.png</file>
+        <file>icons/32x32/Filter.png</file>
+        <file>icons/32x32/FilterModifyExtension.png</file>
+        <file>icons/32x32/FilterSubPt2Pt.png</file>
+        <file>icons/32x32/FitProject.png</file>
         <file>icons/32x32/FolderDEM.png</file>
+        <file>icons/32x32/FolderMap.png</file>
         <file>icons/32x32/Font.png</file>
         <file>icons/32x32/FromMap.png</file>
-        <file>icons/32x32/FilterModifyExtension.png</file>
-        <file>icons/32x32/FilterSubPt2Pt.png</file>
+        <file>icons/32x32/FullScreen.png</file>
+        <file>icons/32x32/GpxProject.png</file>
         <file>icons/32x32/Grid.png</file>
         <file>icons/32x32/GridSetup.png</file>
         <file>icons/32x32/GridWizzard.png</file>
         <file>icons/32x32/Help.png</file>
+        <file>icons/32x32/Image.png</file>
         <file>icons/32x32/Info.png</file>
-        <file>icons/32x32/Error.png</file>
+        <file>icons/32x32/Left.png</file>
+        <file>icons/32x32/Limit.png</file>
+        <file>icons/32x32/LimitSys.png</file>
+        <file>icons/32x32/LimitUsr.png</file>
+        <file>icons/32x32/LineMove.png</file>
+        <file>icons/32x32/LineWidthDef.png</file>
+        <file>icons/32x32/LineWidthUser.png</file>
+        <file>icons/32x32/Link.png</file>
+        <file>icons/32x32/LoadGIS.png</file>
+        <file>icons/32x32/LoadView.png</file>
+        <file>icons/32x32/Lock.png</file>
+        <file>icons/32x32/LogProject.png</file>
         <file>icons/32x32/Map.png</file>
-        <file>icons/32x32/QMapShack.png</file>
+        <file>icons/32x32/MimeDemVRT.png</file>
+        <file>icons/32x32/MimeGEMF.png</file>
         <file>icons/32x32/MimeIMG.png</file>
         <file>icons/32x32/MimeJNX.png</file>
         <file>icons/32x32/MimeMAP.png</file>
         <file>icons/32x32/MimeRMAP.png</file>
+        <file>icons/32x32/MimeTMS.png</file>
         <file>icons/32x32/MimeVRT.png</file>
         <file>icons/32x32/MimeWMTS.png</file>
-        <file>icons/32x32/MimeTMS.png</file>
-        <file>icons/32x32/MimeDemVRT.png</file>
-        <file>icons/32x32/MimeGEMF.png</file>
         <file>icons/32x32/MouseWheel.png</file>
+        <file>icons/32x32/Move.png</file>
+        <file>icons/32x32/MoveArrow.png</file>
+        <file>icons/32x32/MySQL.png</file>
+        <file>icons/32x32/MySQLNoConn.png</file>
         <file>icons/32x32/NightDay.png</file>
+        <file>icons/32x32/NoGo.png</file>
+        <file>icons/32x32/O.png</file>
         <file>icons/32x32/Off.png</file>
+        <file>icons/32x32/Opacity.png</file>
         <file>icons/32x32/POIText.png</file>
+        <file>icons/32x32/Paste.png</file>
+        <file>icons/32x32/PasteNormal.png</file>
+        <file>icons/32x32/PastePlain.png</file>
+        <file>icons/32x32/PathBlue.png</file>
+        <file>icons/32x32/PathGreen.png</file>
+        <file>icons/32x32/PathOrange.png</file>
+        <file>icons/32x32/Pattern.png</file>
+        <file>icons/32x32/PointAdd.png</file>
+        <file>icons/32x32/PointDel.png</file>
+        <file>icons/32x32/PointHide.png</file>
+        <file>icons/32x32/PointMove.png</file>
+        <file>icons/32x32/PointShow.png</file>
+        <file>icons/32x32/Print.png</file>
+        <file>icons/32x32/PrintSave.png</file>
+        <file>icons/32x32/ProfileToWindow.png</file>
+        <file>icons/32x32/Progress.png</file>
+        <file>icons/32x32/QMapShack.png</file>
+        <file>icons/32x32/QlbProject.png</file>
+        <file>icons/32x32/QmsProject.png</file>
+        <file>icons/32x32/Redo.png</file>
+        <file>icons/32x32/RegularScreen.png</file>
+        <file>icons/32x32/ReloadImage.png</file>
         <file>icons/32x32/Reset.png</file>
+        <file>icons/32x32/Reverse.png</file>
         <file>icons/32x32/Right.png</file>
-        <file>icons/32x32/Left.png</file>
+        <file>icons/32x32/Route.png</file>
+        <file>icons/32x32/RouteOn.png</file>
+        <file>icons/32x32/RouteSetup.png</file>
+        <file>icons/32x32/RteInstr.png</file>
+        <file>icons/32x32/SQLite.png</file>
+        <file>icons/32x32/SQLiteNoConn.png</file>
+        <file>icons/32x32/Save.png</file>
+        <file>icons/32x32/SaveAllGIS.png</file>
+        <file>icons/32x32/SaveGIS.png</file>
+        <file>icons/32x32/SaveGISAs.png</file>
+        <file>icons/32x32/SaveGISAsGpx11.png</file>
+        <file>icons/32x32/SaveView.png</file>
         <file>icons/32x32/Scale.png</file>
+        <file>icons/32x32/SearchDatabase.png</file>
+        <file>icons/32x32/SearchGoogle.png</file>
+        <file>icons/32x32/SelectArea.png</file>
         <file>icons/32x32/SelectColor.png</file>
-        <file>icons/32x32/ToBottom.png</file>
-        <file>icons/32x32/ToTop.png</file>
-        <file>icons/32x32/ToolTip.png</file>
-        <file>icons/32x32/Up.png</file>
-        <file>icons/32x32/SetupMapWorkspace.png</file>
+        <file>icons/32x32/SelectExactArea.png</file>
+        <file>icons/32x32/SelectIntersectArea.png</file>
+        <file>icons/32x32/SelectRange.png</file>
+        <file>icons/32x32/SetEle.png</file>
         <file>icons/32x32/SetupCoordFormat.png</file>
-        <file>icons/32x32/SaveGIS.png</file>
-        <file>icons/32x32/SaveGISAs.png</file>
-        <file>icons/32x32/SaveAllGIS.png</file>
-        <file>icons/32x32/LoadGIS.png</file>
-        <file>icons/32x32/GpxProject.png</file>
-        <file>icons/32x32/TcxProject.png</file>
-        <file>icons/32x32/QmsProject.png</file>
-        <file>icons/32x32/SlfProject.png</file>
-        <file>icons/32x32/DBProject.png</file>
-        <file>icons/32x32/Route.png</file>
-        <file>icons/32x32/RouteSetup.png</file>
-        <file>icons/32x32/Close.png</file>
+        <file>icons/32x32/SetupMapWorkspace.png</file>
+        <file>icons/32x32/SetupWptSym.png</file>
         <file>icons/32x32/ShowAll.png</file>
         <file>icons/32x32/ShowNone.png</file>
-        <file>icons/32x32/Track.png</file>
-        <file>icons/32x32/EditDetails.png</file>
-        <file>icons/32x32/EditText.png</file>
-        <file>icons/32x32/TimeZoneSetup.png</file>
-        <file>icons/32x32/UnitSetup.png</file>
-        <file>icons/32x32/Undo.png</file>
-        <file>icons/32x32/Redo.png</file>
-        <file>icons/32x32/Cut.png</file>
-        <file>icons/32x32/CutMode1.png</file>
-        <file>icons/32x32/CutMode2.png</file>
-        <file>icons/32x32/CutHistoryAfter.png</file>
-        <file>icons/32x32/CutHistoryBefore.png</file>
-        <file>icons/32x32/Copy.png</file>
-        <file>icons/32x32/Move.png</file>
-        <file>icons/32x32/Paste.png</file>
-        <file>icons/32x32/PastePlain.png</file>
-        <file>icons/32x32/PasteNormal.png</file>
-        <file>icons/32x32/TextLeft.png</file>
-        <file>icons/32x32/TextRight.png</file>
+        <file>icons/32x32/SizeArrow.png</file>
+        <file>icons/32x32/SlfProject.png</file>
+        <file>icons/32x32/SmlProject.png</file>
+        <file>icons/32x32/SortName.png</file>
+        <file>icons/32x32/Start.png</file>
+        <file>icons/32x32/Tainted.png</file>
+        <file>icons/32x32/TcxProject.png</file>
+        <file>icons/32x32/Template.png</file>
+        <file>icons/32x32/TextBold.png</file>
         <file>icons/32x32/TextCenter.png</file>
+        <file>icons/32x32/TextItalic.png</file>
         <file>icons/32x32/TextJustified.png</file>
-        <file>icons/32x32/TextBold.png</file>
+        <file>icons/32x32/TextLeft.png</file>
+        <file>icons/32x32/TextRight.png</file>
         <file>icons/32x32/TextUnderlined.png</file>
-        <file>icons/32x32/TextItalic.png</file>
-        <file>icons/32x32/Lock.png</file>
-        <file>icons/32x32/UnLock.png</file>
-        <file>icons/32x32/WptMove.png</file>
-        <file>icons/32x32/WptProj.png</file>
-        <file>icons/32x32/WptProx.png</file>
-        <file>icons/32x32/TrkCut.png</file>
-        <file>icons/32x32/TrkProfile.png</file>
-        <file>icons/32x32/Tainted.png</file>
-        <file>icons/32x32/AddWpt.png</file>
-        <file>icons/32x32/AddTrk.png</file>
-        <file>icons/32x32/AddRte.png</file>
-        <file>icons/32x32/AddArea.png</file>
-        <file>icons/32x32/AddProject.png</file>
-        <file>icons/32x32/LineMove.png</file>
-        <file>icons/32x32/PointMove.png</file>
-        <file>icons/32x32/PointHide.png</file>
-        <file>icons/32x32/PointShow.png</file>
-        <file>icons/32x32/PointAdd.png</file>
-        <file>icons/32x32/PointDel.png</file>
-        <file>icons/32x32/AreaMove.png</file>
-        <file>icons/32x32/SelectRange.png</file>
-        <file>icons/32x32/SelectArea.png</file>
-        <file>icons/32x32/SelectExactArea.png</file>
-        <file>icons/32x32/SelectIntersectArea.png</file>
-        <file>icons/32x32/Area.png</file>
-        <file>icons/32x32/Reverse.png</file>
-        <file>icons/32x32/Combine.png</file>
-        <file>icons/32x32/SearchGoogle.png</file>
-        <file>icons/32x32/Start.png</file>
-        <file>icons/32x32/SetEle.png</file>
-        <file>icons/32x32/Pattern.png</file>
-        <file>icons/32x32/Opacity.png</file>
-        <file>icons/32x32/DatabaseSetup.png</file>
-        <file>icons/32x32/DatabaseConvert.png</file>
-        <file>icons/32x32/DatabaseSync.png</file>
-        <file>icons/32x32/PathBlue.png</file>
-        <file>icons/32x32/PathOrange.png</file>
-        <file>icons/32x32/PathGreen.png</file>
-        <file>icons/32x32/Link.png</file>
-        <file>icons/32x32/Database.png</file>
-        <file>icons/32x32/SQLite.png</file>
-        <file>icons/32x32/SQLiteNoConn.png</file>
-        <file>icons/32x32/MySQL.png</file>
-        <file>icons/32x32/MySQLNoConn.png</file>
-        <file>icons/32x32/Empty.png</file>
-        <file>icons/32x32/Apply.png</file>
         <file>icons/32x32/Time.png</file>
-        <file>icons/32x32/Print.png</file>
-        <file>icons/32x32/AddImage.png</file>
-        <file>icons/32x32/DelImage.png</file>
-        <file>icons/32x32/ReloadImage.png</file>
-        <file>icons/32x32/Image.png</file>
-        <file>icons/32x32/Device.png</file>
-        <file>icons/32x32/2NavProject.png</file>
-        <file>icons/32x32/VrtBuilder.png</file>
-        <file>icons/32x32/SaveView.png</file>
-        <file>icons/32x32/LoadView.png</file>
-        <file>icons/32x32/Save.png</file>
-        <file>icons/32x32/ProfileToWindow.png</file>
-        <file>icons/32x32/NoGo.png</file>
-        <file>icons/32x32/Bubble.png</file>
-        <file>icons/32x32/MoveArrow.png</file>
-        <file>icons/32x32/SizeArrow.png</file>
-        <file>icons/32x32/A.png</file>
-        <file>icons/32x32/V.png</file>
-        <file>icons/32x32/O.png</file>
-        <file>icons/32x32/RteInstr.png</file>
-        <file>icons/32x32/Zoom.png</file>
-        <file>icons/32x32/PrintSave.png</file>
-        <file>icons/32x32/ActNone.png</file>
-        <file>icons/32x32/ActFoot.png</file>
-        <file>icons/32x32/ActCycle.png</file>
-        <file>icons/32x32/ActBike.png</file>
-        <file>icons/32x32/ActCar.png</file>
-        <file>icons/32x32/ActCable.png</file>
-        <file>icons/32x32/ActShip.png</file>
-        <file>icons/32x32/ActSwim.png</file>
-        <file>icons/32x32/ActAero.png</file>
-        <file>icons/32x32/ActSki.png</file>
-        <file>icons/32x32/ActTrain.png</file>
-        <file>icons/32x32/Activity.png</file>
-        <file>icons/32x32/CSrcSolid.png</file>
-        <file>icons/32x32/CSrcHR.png</file>
-        <file>icons/32x32/CSrcCAD.png</file>
-        <file>icons/32x32/CSrcATemp.png</file>
-        <file>icons/32x32/CSrcWTemp.png</file>
-        <file>icons/32x32/CSrcDepth.png</file>
-        <file>icons/32x32/CSrcSlope.png</file>
-        <file>icons/32x32/CSrcSpeed.png</file>
-        <file>icons/32x32/CSrcElevation.png</file>
-        <file>icons/32x32/CSrcUnknown.png</file>
-        <file>icons/32x32/CSrcAccel.png</file>
-        <file>icons/32x32/CSrcCourse.png</file>
-        <file>icons/32x32/CSrcDistance.png</file>
-        <file>icons/32x32/CSrcEnergy.png</file>
-        <file>icons/32x32/CSrcSeaLevelPressure.png</file>
-        <file>icons/32x32/CSrcVertSpeed.png</file>
-        <file>icons/32x32/Progress.png</file>
-        <file>icons/32x32/FitProject.png</file>
-        <file>icons/32x32/LineWidthUser.png</file>
-        <file>icons/32x32/LineWidthDef.png</file>
-        <file>icons/32x32/ArrowUser.png</file>
-        <file>icons/32x32/ArrowDef.png</file>
-        <file>icons/32x32/Limit.png</file>
-        <file>icons/32x32/LimitSys.png</file>
-        <file>icons/32x32/LimitUsr.png</file>
-        <file>icons/32x32/SetupWptSym.png</file>
-        <file>icons/32x32/WaypointOn.png</file>
-        <file>icons/32x32/TrackOn.png</file>
-        <file>icons/32x32/RouteOn.png</file>
-        <file>icons/32x32/AreaOn.png</file>
-        <file>icons/32x32/SearchDatabase.png</file>
-        <file>icons/32x32/SortName.png</file>
-        <file>icons/32x32/SaveGISAsGpx11.png</file>
-        <file>icons/32x32/CopyTrkWithWpt.png</file>
-        <file>icons/32x32/ToolBarSetup.png</file>
+        <file>icons/32x32/TimeZoneSetup.png</file>
+        <file>icons/32x32/ToBottom.png</file>
+        <file>icons/32x32/ToTop.png</file>
+        <file>icons/32x32/ToggleDatabase.png</file>
         <file>icons/32x32/ToggleDem.png</file>
+        <file>icons/32x32/ToggleDocks.png</file>
         <file>icons/32x32/ToggleGis.png</file>
         <file>icons/32x32/ToggleMaps.png</file>
         <file>icons/32x32/ToggleRouter.png</file>
-        <file>icons/32x32/ToggleDocks.png</file>
         <file>icons/32x32/ToolBar.png</file>
-        <file>icons/32x32/FullScreen.png</file>
-        <file>icons/32x32/RegularScreen.png</file>
-        <file>icons/32x32/Template.png</file>
-        <file>icons/32x32/AutoSave.png</file>
-        <file>icons/48x48/Add.png</file>
-        <file>icons/48x48/AddMapWorkspace.png</file>
-        <file>icons/48x48/CloneMapWorkspace.png</file>
-        <file>icons/48x48/Cancel.png</file>
-        <file>icons/48x48/Check.png</file>
-        <file>icons/48x48/DeleteMultiple.png</file>
-        <file>icons/48x48/DeleteOne.png</file>
-        <file>icons/48x48/Down.png</file>
-        <file>icons/48x48/FolderMap.png</file>
-        <file>icons/48x48/FolderDEM.png</file>
-        <file>icons/48x48/Font.png</file>
-        <file>icons/48x48/FromMap.png</file>
-        <file>icons/48x48/FilterModifyExtension.png</file>
-        <file>icons/48x48/FilterSubPt2Pt.png</file>
-        <file>icons/48x48/Grid.png</file>
-        <file>icons/48x48/GridSetup.png</file>
-        <file>icons/48x48/GridWizzard.png</file>
-        <file>icons/48x48/Help.png</file>
-        <file>icons/48x48/Info.png</file>
-        <file>icons/48x48/Error.png</file>
-        <file>icons/48x48/Map.png</file>
-        <file>icons/48x48/QMapShack.png</file>
-        <file>icons/48x48/MimeIMG.png</file>
-        <file>icons/48x48/MimeJNX.png</file>
-        <file>icons/48x48/MimeMAP.png</file>
-        <file>icons/48x48/MimeRMAP.png</file>
-        <file>icons/48x48/MimeVRT.png</file>
-        <file>icons/48x48/MimeWMTS.png</file>
-        <file>icons/48x48/MimeTMS.png</file>
-        <file>icons/48x48/MimeDemVRT.png</file>
-        <file>icons/48x48/MimeGEMF.png</file>
-        <file>icons/48x48/MouseWheel.png</file>
-        <file>icons/48x48/NightDay.png</file>
-        <file>icons/48x48/Off.png</file>
-        <file>icons/48x48/POIText.png</file>
-        <file>icons/48x48/Reset.png</file>
-        <file>icons/48x48/Right.png</file>
-        <file>icons/48x48/Left.png</file>
-        <file>icons/48x48/Scale.png</file>
-        <file>icons/48x48/SelectColor.png</file>
-        <file>icons/48x48/ToBottom.png</file>
-        <file>icons/48x48/ToTop.png</file>
-        <file>icons/48x48/ToolTip.png</file>
-        <file>icons/48x48/Up.png</file>
-        <file>icons/48x48/SetupMapWorkspace.png</file>
-        <file>icons/48x48/SetupCoordFormat.png</file>
-        <file>icons/48x48/SaveGIS.png</file>
-        <file>icons/48x48/SaveGISAs.png</file>
-        <file>icons/48x48/SaveAllGIS.png</file>
-        <file>icons/48x48/LoadGIS.png</file>
-        <file>icons/48x48/GpxProject.png</file>
-        <file>icons/48x48/TcxProject.png</file>
-        <file>icons/48x48/QmsProject.png</file>
-        <file>icons/48x48/SlfProject.png</file>
-        <file>icons/48x48/DBProject.png</file>
-        <file>icons/48x48/Route.png</file>
-        <file>icons/48x48/RouteSetup.png</file>
-        <file>icons/48x48/Close.png</file>
-        <file>icons/48x48/ShowAll.png</file>
-        <file>icons/48x48/ShowNone.png</file>
-        <file>icons/48x48/Track.png</file>
-        <file>icons/48x48/EditDetails.png</file>
-        <file>icons/48x48/EditText.png</file>
-        <file>icons/48x48/TimeZoneSetup.png</file>
-        <file>icons/48x48/UnitSetup.png</file>
-        <file>icons/48x48/Undo.png</file>
-        <file>icons/48x48/Redo.png</file>
-        <file>icons/48x48/Cut.png</file>
-        <file>icons/48x48/CutMode1.png</file>
-        <file>icons/48x48/CutMode2.png</file>
-        <file>icons/48x48/CutHistoryAfter.png</file>
-        <file>icons/48x48/CutHistoryBefore.png</file>
-        <file>icons/48x48/Copy.png</file>
-        <file>icons/48x48/Move.png</file>
-        <file>icons/48x48/Paste.png</file>
-        <file>icons/48x48/PastePlain.png</file>
-        <file>icons/48x48/PasteNormal.png</file>
-        <file>icons/48x48/TextLeft.png</file>
-        <file>icons/48x48/TextRight.png</file>
-        <file>icons/48x48/TextCenter.png</file>
-        <file>icons/48x48/TextJustified.png</file>
-        <file>icons/48x48/TextBold.png</file>
-        <file>icons/48x48/TextUnderlined.png</file>
-        <file>icons/48x48/TextItalic.png</file>
-        <file>icons/48x48/Lock.png</file>
-        <file>icons/48x48/UnLock.png</file>
-        <file>icons/48x48/WptMove.png</file>
-        <file>icons/48x48/WptProj.png</file>
-        <file>icons/48x48/WptProx.png</file>
-        <file>icons/48x48/TrkCut.png</file>
-        <file>icons/48x48/TrkProfile.png</file>
-        <file>icons/48x48/Tainted.png</file>
-        <file>icons/48x48/AddWpt.png</file>
-        <file>icons/48x48/AddTrk.png</file>
-        <file>icons/48x48/AddRte.png</file>
-        <file>icons/48x48/AddArea.png</file>
-        <file>icons/48x48/AddProject.png</file>
-        <file>icons/48x48/LineMove.png</file>
-        <file>icons/48x48/PointMove.png</file>
-        <file>icons/48x48/PointHide.png</file>
-        <file>icons/48x48/PointShow.png</file>
-        <file>icons/48x48/PointAdd.png</file>
-        <file>icons/48x48/PointDel.png</file>
-        <file>icons/48x48/AreaMove.png</file>
-        <file>icons/48x48/SelectRange.png</file>
-        <file>icons/48x48/SelectArea.png</file>
-        <file>icons/48x48/SelectExactArea.png</file>
-        <file>icons/48x48/SelectIntersectArea.png</file>
-        <file>icons/48x48/Area.png</file>
-        <file>icons/48x48/Reverse.png</file>
-        <file>icons/48x48/Combine.png</file>
-        <file>icons/48x48/SearchGoogle.png</file>
-        <file>icons/48x48/Start.png</file>
-        <file>icons/48x48/SetEle.png</file>
-        <file>icons/48x48/Pattern.png</file>
-        <file>icons/48x48/Opacity.png</file>
-        <file>icons/48x48/DatabaseSetup.png</file>
-        <file>icons/48x48/DatabaseConvert.png</file>
-        <file>icons/48x48/DatabaseSync.png</file>
-        <file>icons/48x48/PathBlue.png</file>
-        <file>icons/48x48/PathOrange.png</file>
-        <file>icons/48x48/PathGreen.png</file>
-        <file>icons/48x48/Link.png</file>
-        <file>icons/48x48/Database.png</file>
-        <file>icons/48x48/SQLite.png</file>
-        <file>icons/48x48/SQLiteNoConn.png</file>
-        <file>icons/48x48/MySQL.png</file>
-        <file>icons/48x48/MySQLNoConn.png</file>
-        <file>icons/48x48/Empty.png</file>
-        <file>icons/48x48/Apply.png</file>
-        <file>icons/48x48/Time.png</file>
-        <file>icons/48x48/Print.png</file>
-        <file>icons/48x48/AddImage.png</file>
-        <file>icons/48x48/DelImage.png</file>
-        <file>icons/48x48/ReloadImage.png</file>
-        <file>icons/48x48/Image.png</file>
-        <file>icons/48x48/Device.png</file>
+        <file>icons/32x32/ToolBarSetup.png</file>
+        <file>icons/32x32/ToolTip.png</file>
+        <file>icons/32x32/Track.png</file>
+        <file>icons/32x32/TrackMinMax.png</file>
+        <file>icons/32x32/TrackOn.png</file>
+        <file>icons/32x32/TrkCut.png</file>
+        <file>icons/32x32/TrkProfile.png</file>
+        <file>icons/32x32/UnLock.png</file>
+        <file>icons/32x32/Undo.png</file>
+        <file>icons/32x32/UnitSetup.png</file>
+        <file>icons/32x32/Up.png</file>
+        <file>icons/32x32/V.png</file>
+        <file>icons/32x32/VrtBuilder.png</file>
+        <file>icons/32x32/WaypointOn.png</file>
+        <file>icons/32x32/WptAvoid.png</file>
+        <file>icons/32x32/WptDelProx.png</file>
+        <file>icons/32x32/WptEditProx.png</file>
+        <file>icons/32x32/WptMove.png</file>
+        <file>icons/32x32/WptProj.png</file>
+        <file>icons/32x32/WptProx.png</file>
+        <file>icons/32x32/Zoom.png</file>
+        
         <file>icons/48x48/2NavProject.png</file>
-        <file>icons/48x48/VrtBuilder.png</file>
-        <file>icons/48x48/SaveView.png</file>
-        <file>icons/48x48/LoadView.png</file>
-        <file>icons/48x48/Save.png</file>
-        <file>icons/48x48/ProfileToWindow.png</file>
-        <file>icons/48x48/NoGo.png</file>
-        <file>icons/48x48/Bubble.png</file>
-        <file>icons/48x48/MoveArrow.png</file>
-        <file>icons/48x48/SizeArrow.png</file>
         <file>icons/48x48/A.png</file>
-        <file>icons/48x48/V.png</file>
-        <file>icons/48x48/O.png</file>
-        <file>icons/48x48/RteInstr.png</file>
-        <file>icons/48x48/Zoom.png</file>
-        <file>icons/48x48/PrintSave.png</file>
-        <file>icons/48x48/ActNone.png</file>
-        <file>icons/48x48/ActFoot.png</file>
-        <file>icons/48x48/ActCycle.png</file>
+        <file>icons/48x48/ActAero.png</file>
         <file>icons/48x48/ActBike.png</file>
-        <file>icons/48x48/ActCar.png</file>
         <file>icons/48x48/ActCable.png</file>
+        <file>icons/48x48/ActCar.png</file>
+        <file>icons/48x48/ActCycle.png</file>
+        <file>icons/48x48/ActFoot.png</file>
+        <file>icons/48x48/ActNone.png</file>
         <file>icons/48x48/ActShip.png</file>
-        <file>icons/48x48/ActSwim.png</file>
-        <file>icons/48x48/ActAero.png</file>
         <file>icons/48x48/ActSki.png</file>
+        <file>icons/48x48/ActSwim.png</file>
         <file>icons/48x48/ActTrain.png</file>
         <file>icons/48x48/Activity.png</file>
-        <file>icons/48x48/CSrcSolid.png</file>
-        <file>icons/48x48/CSrcHR.png</file>
-        <file>icons/48x48/CSrcCAD.png</file>
+        <file>icons/48x48/Add.png</file>
+        <file>icons/48x48/AddArea.png</file>
+        <file>icons/48x48/AddImage.png</file>
+        <file>icons/48x48/AddMapWorkspace.png</file>
+        <file>icons/48x48/AddProject.png</file>
+        <file>icons/48x48/AddRte.png</file>
+        <file>icons/48x48/AddTrk.png</file>
+        <file>icons/48x48/AddWpt.png</file>
+        <file>icons/48x48/Apply.png</file>
+        <file>icons/48x48/Area.png</file>
+        <file>icons/48x48/AreaMove.png</file>
+        <file>icons/48x48/AreaOn.png</file>
+        <file>icons/48x48/ArrowDef.png</file>
+        <file>icons/48x48/ArrowUser.png</file>
+        <file>icons/48x48/AutoSave.png</file>
+        <file>icons/48x48/Bubble.png</file>
         <file>icons/48x48/CSrcATemp.png</file>
-        <file>icons/48x48/CSrcWTemp.png</file>
-        <file>icons/48x48/CSrcDepth.png</file>
-        <file>icons/48x48/CSrcSlope.png</file>
-        <file>icons/48x48/CSrcSpeed.png</file>
-        <file>icons/48x48/CSrcElevation.png</file>
-        <file>icons/48x48/CSrcUnknown.png</file>
         <file>icons/48x48/CSrcAccel.png</file>
+        <file>icons/48x48/CSrcCAD.png</file>
         <file>icons/48x48/CSrcCourse.png</file>
+        <file>icons/48x48/CSrcDepth.png</file>
         <file>icons/48x48/CSrcDistance.png</file>
+        <file>icons/48x48/CSrcElevation.png</file>
         <file>icons/48x48/CSrcEnergy.png</file>
+        <file>icons/48x48/CSrcHR.png</file>
         <file>icons/48x48/CSrcSeaLevelPressure.png</file>
+        <file>icons/48x48/CSrcSlope.png</file>
+        <file>icons/48x48/CSrcSolid.png</file>
+        <file>icons/48x48/CSrcSpeed.png</file>
+        <file>icons/48x48/CSrcUnknown.png</file>
         <file>icons/48x48/CSrcVertSpeed.png</file>
-        <file>icons/48x48/Progress.png</file>
+        <file>icons/48x48/CSrcWTemp.png</file>
+        <file>icons/48x48/Cancel.png</file>
+        <file>icons/48x48/Check.png</file>
+        <file>icons/48x48/CloneMapWorkspace.png</file>
+        <file>icons/48x48/Close.png</file>
+        <file>icons/48x48/Combine.png</file>
+        <file>icons/48x48/Copy.png</file>
+        <file>icons/48x48/CopyTrkWithWpt.png</file>
+        <file>icons/48x48/Cut.png</file>
+        <file>icons/48x48/CutHistoryAfter.png</file>
+        <file>icons/48x48/CutHistoryBefore.png</file>
+        <file>icons/48x48/CutMode1.png</file>
+        <file>icons/48x48/CutMode2.png</file>
+        <file>icons/48x48/DBProject.png</file>
+        <file>icons/48x48/Database.png</file>
+        <file>icons/48x48/DatabaseConvert.png</file>
+        <file>icons/48x48/DatabaseSetup.png</file>
+        <file>icons/48x48/DatabaseSync.png</file>
+        <file>icons/48x48/DelImage.png</file>
+        <file>icons/48x48/DeleteMultiple.png</file>
+        <file>icons/48x48/DeleteOne.png</file>
+        <file>icons/48x48/Device.png</file>
+        <file>icons/48x48/Down.png</file>
+        <file>icons/48x48/EditDetails.png</file>
+        <file>icons/48x48/EditText.png</file>
+        <file>icons/48x48/Empty.png</file>
+        <file>icons/48x48/Error.png</file>
+        <file>icons/48x48/Filter.png</file>
+        <file>icons/48x48/FilterModifyExtension.png</file>
+        <file>icons/48x48/FilterSubPt2Pt.png</file>
         <file>icons/48x48/FitProject.png</file>
-        <file>icons/48x48/LineWidthUser.png</file>
-        <file>icons/48x48/LineWidthDef.png</file>
-        <file>icons/48x48/ArrowUser.png</file>
-        <file>icons/48x48/ArrowDef.png</file>
+        <file>icons/48x48/FolderDEM.png</file>
+        <file>icons/48x48/FolderMap.png</file>
+        <file>icons/48x48/Font.png</file>
+        <file>icons/48x48/FromMap.png</file>
+        <file>icons/48x48/FullScreen.png</file>
+        <file>icons/48x48/GpxProject.png</file>
+        <file>icons/48x48/Grid.png</file>
+        <file>icons/48x48/GridSetup.png</file>
+        <file>icons/48x48/GridWizzard.png</file>
+        <file>icons/48x48/Help.png</file>
+        <file>icons/48x48/Image.png</file>
+        <file>icons/48x48/Info.png</file>
+        <file>icons/48x48/Left.png</file>
         <file>icons/48x48/Limit.png</file>
         <file>icons/48x48/LimitSys.png</file>
         <file>icons/48x48/LimitUsr.png</file>
-        <file>icons/48x48/SetupWptSym.png</file>
-        <file>icons/48x48/WaypointOn.png</file>
-        <file>icons/48x48/TrackOn.png</file>
+        <file>icons/48x48/LineMove.png</file>
+        <file>icons/48x48/LineWidthDef.png</file>
+        <file>icons/48x48/LineWidthUser.png</file>
+        <file>icons/48x48/Link.png</file>
+        <file>icons/48x48/LoadGIS.png</file>
+        <file>icons/48x48/LoadView.png</file>
+        <file>icons/48x48/Lock.png</file>
+        <file>icons/48x48/LogProject.png</file>
+        <file>icons/48x48/Map.png</file>
+        <file>icons/48x48/MimeDemVRT.png</file>
+        <file>icons/48x48/MimeGEMF.png</file>
+        <file>icons/48x48/MimeIMG.png</file>
+        <file>icons/48x48/MimeJNX.png</file>
+        <file>icons/48x48/MimeMAP.png</file>
+        <file>icons/48x48/MimeRMAP.png</file>
+        <file>icons/48x48/MimeTMS.png</file>
+        <file>icons/48x48/MimeVRT.png</file>
+        <file>icons/48x48/MimeWMTS.png</file>
+        <file>icons/48x48/MouseWheel.png</file>
+        <file>icons/48x48/Move.png</file>
+        <file>icons/48x48/MoveArrow.png</file>
+        <file>icons/48x48/MySQL.png</file>
+        <file>icons/48x48/MySQLNoConn.png</file>
+        <file>icons/48x48/NightDay.png</file>
+        <file>icons/48x48/NoGo.png</file>
+        <file>icons/48x48/O.png</file>
+        <file>icons/48x48/Off.png</file>
+        <file>icons/48x48/Opacity.png</file>
+        <file>icons/48x48/POIText.png</file>
+        <file>icons/48x48/Paste.png</file>
+        <file>icons/48x48/PasteNormal.png</file>
+        <file>icons/48x48/PastePlain.png</file>
+        <file>icons/48x48/PathBlue.png</file>
+        <file>icons/48x48/PathGreen.png</file>
+        <file>icons/48x48/PathOrange.png</file>
+        <file>icons/48x48/Pattern.png</file>
+        <file>icons/48x48/PointAdd.png</file>
+        <file>icons/48x48/PointDel.png</file>
+        <file>icons/48x48/PointHide.png</file>
+        <file>icons/48x48/PointMove.png</file>
+        <file>icons/48x48/PointShow.png</file>
+        <file>icons/48x48/Print.png</file>
+        <file>icons/48x48/PrintSave.png</file>
+        <file>icons/48x48/ProfileToWindow.png</file>
+        <file>icons/48x48/Progress.png</file>
+        <file>icons/48x48/QMapShack.png</file>
+        <file>icons/48x48/QlbProject.png</file>
+        <file>icons/48x48/QmsProject.png</file>
+        <file>icons/48x48/Redo.png</file>
+        <file>icons/48x48/RegularScreen.png</file>
+        <file>icons/48x48/ReloadImage.png</file>
+        <file>icons/48x48/Reset.png</file>
+        <file>icons/48x48/Reverse.png</file>
+        <file>icons/48x48/Right.png</file>
+        <file>icons/48x48/Route.png</file>
         <file>icons/48x48/RouteOn.png</file>
-        <file>icons/48x48/AreaOn.png</file>
+        <file>icons/48x48/RouteSetup.png</file>
+        <file>icons/48x48/RteInstr.png</file>
+        <file>icons/48x48/SQLite.png</file>
+        <file>icons/48x48/SQLiteNoConn.png</file>
+        <file>icons/48x48/Save.png</file>
+        <file>icons/48x48/SaveAllGIS.png</file>
+        <file>icons/48x48/SaveGIS.png</file>
+        <file>icons/48x48/SaveGISAs.png</file>
+        <file>icons/48x48/SaveGISAsGpx11.png</file>
+        <file>icons/48x48/SaveView.png</file>
+        <file>icons/48x48/Scale.png</file>
         <file>icons/48x48/SearchDatabase.png</file>
+        <file>icons/48x48/SearchGoogle.png</file>
+        <file>icons/48x48/SelectArea.png</file>
+        <file>icons/48x48/SelectColor.png</file>
+        <file>icons/48x48/SelectExactArea.png</file>
+        <file>icons/48x48/SelectIntersectArea.png</file>
+        <file>icons/48x48/SelectRange.png</file>
+        <file>icons/48x48/SetEle.png</file>
+        <file>icons/48x48/SetupCoordFormat.png</file>
+        <file>icons/48x48/SetupMapWorkspace.png</file>
+        <file>icons/48x48/SetupWptSym.png</file>
+        <file>icons/48x48/ShowAll.png</file>
+        <file>icons/48x48/ShowNone.png</file>
+        <file>icons/48x48/SizeArrow.png</file>
+        <file>icons/48x48/SlfProject.png</file>
+        <file>icons/48x48/SmlProject.png</file>
         <file>icons/48x48/SortName.png</file>
-        <file>icons/48x48/SaveGISAsGpx11.png</file>
-        <file>icons/48x48/CopyTrkWithWpt.png</file>
+        <file>icons/48x48/Start.png</file>
+        <file>icons/48x48/Tainted.png</file>
+        <file>icons/48x48/TcxProject.png</file>
+        <file>icons/48x48/Template.png</file>
+        <file>icons/48x48/TextBold.png</file>
+        <file>icons/48x48/TextCenter.png</file>
+        <file>icons/48x48/TextItalic.png</file>
+        <file>icons/48x48/TextJustified.png</file>
+        <file>icons/48x48/TextLeft.png</file>
+        <file>icons/48x48/TextRight.png</file>
+        <file>icons/48x48/TextUnderlined.png</file>
+        <file>icons/48x48/Time.png</file>
+        <file>icons/48x48/TimeZoneSetup.png</file>
+        <file>icons/48x48/ToBottom.png</file>
+        <file>icons/48x48/ToTop.png</file>
+        <file>icons/48x48/ToggleDatabase.png</file>
         <file>icons/48x48/ToggleDem.png</file>
         <file>icons/48x48/ToggleDocks.png</file>
         <file>icons/48x48/ToggleGis.png</file>
         <file>icons/48x48/ToggleMaps.png</file>
         <file>icons/48x48/ToggleRouter.png</file>
-        <file>icons/48x48/ToolBarSetup.png</file>
         <file>icons/48x48/ToolBar.png</file>
-        <file>icons/48x48/FullScreen.png</file>
-        <file>icons/48x48/RegularScreen.png</file>
-        <file>icons/48x48/Template.png</file>
-        <file>icons/48x48/AutoSave.png</file>
+        <file>icons/48x48/ToolBarSetup.png</file>
+        <file>icons/48x48/ToolTip.png</file>
+        <file>icons/48x48/Track.png</file>
+        <file>icons/48x48/TrackMinMax.png</file>
+        <file>icons/48x48/TrackOn.png</file>
+        <file>icons/48x48/TrkCut.png</file>
+        <file>icons/48x48/TrkProfile.png</file>
+        <file>icons/48x48/UnLock.png</file>
+        <file>icons/48x48/Undo.png</file>
+        <file>icons/48x48/UnitSetup.png</file>
+        <file>icons/48x48/Up.png</file>
+        <file>icons/48x48/V.png</file>
+        <file>icons/48x48/VrtBuilder.png</file>
+        <file>icons/48x48/WaypointOn.png</file>
+        <file>icons/48x48/WptAvoid.png</file>
+        <file>icons/48x48/WptEditProx.png</file>
+        <file>icons/48x48/WptMove.png</file>
+        <file>icons/48x48/WptProj.png</file>
+        <file>icons/48x48/WptProx.png</file>
+        <file>icons/48x48/WptDelProx.png</file>
+        <file>icons/48x48/Zoom.png</file>
+        
+        <file>icons/8x8/bullet_black.png</file>
+        <file>icons/8x8/bullet_blue.png</file>
+        <file>icons/8x8/bullet_brown.png</file>
+        <file>icons/8x8/bullet_cyan.png</file>
+        <file>icons/8x8/bullet_dark_blue.png</file>
+        <file>icons/8x8/bullet_dark_cyan.png</file>
+        <file>icons/8x8/bullet_dark_gray.png</file>
+        <file>icons/8x8/bullet_dark_green.png</file>
+        <file>icons/8x8/bullet_dark_magenta.png</file>
+        <file>icons/8x8/bullet_dark_red.png</file>
+        <file>icons/8x8/bullet_dark_yellow.png</file>
+        <file>icons/8x8/bullet_gray.png</file>
+        <file>icons/8x8/bullet_green.png</file>
+        <file>icons/8x8/bullet_magenta.png</file>
+        <file>icons/8x8/bullet_orange.png</file>
+        <file>icons/8x8/bullet_red.png</file>
+        <file>icons/8x8/bullet_white.png</file>
+        <file>icons/8x8/bullet_yellow.png</file>
+        
+        <file>icons/cache/32x32/DistIcon.png</file>
+        <file>icons/cache/32x32/OCMLogo.png</file>
+        <file>icons/cache/32x32/OCMLogoSmall.png</file>
+        <file>icons/cache/32x32/SearchIcon.png</file>
         <file>icons/cache/32x32/bluepin.png</file>
         <file>icons/cache/32x32/cito.png</file>
         <file>icons/cache/32x32/corrected.png</file>
-        <file>icons/cache/32x32/DistIcon.png</file>
         <file>icons/cache/32x32/dnf.png</file>
         <file>icons/cache/32x32/down_icon.png</file>
         <file>icons/cache/32x32/earth.png</file>
@@ -469,15 +515,12 @@
         <file>icons/cache/32x32/minicon.png</file>
         <file>icons/cache/32x32/multi.png</file>
         <file>icons/cache/32x32/needs_maintenance.png</file>
-        <file>icons/cache/32x32/OCMLogo.png</file>
-        <file>icons/cache/32x32/OCMLogoSmall.png</file>
         <file>icons/cache/32x32/other.png</file>
         <file>icons/cache/32x32/parking.png</file>
         <file>icons/cache/32x32/pushpin.png</file>
         <file>icons/cache/32x32/restore.png</file>
-        <file>icons/cache/32x32/SearchIcon.png</file>
-        <file>icons/cache/32x32/star_empty.png</file>
         <file>icons/cache/32x32/star.png</file>
+        <file>icons/cache/32x32/star_empty.png</file>
         <file>icons/cache/32x32/traditional.png</file>
         <file>icons/cache/32x32/trailhead.png</file>
         <file>icons/cache/32x32/treasure.png</file>
@@ -488,79 +531,65 @@
         <file>icons/cache/32x32/webcam.png</file>
         <file>icons/cache/32x32/wherigo.png</file>
         <file>icons/cache/32x32/write_note.png</file>
-        <file>icons/waypoints/32x32/Default.png</file>
-        <file>icons/waypoints/32x32/PinRed.png</file>
-        <file>icons/waypoints/32x32/PinGreen.png</file>
-        <file>icons/waypoints/32x32/PinBlue.png</file>
-        <file>icons/waypoints/32x32/FlagRed.png</file>
-        <file>icons/waypoints/32x32/FlagGreen.png</file>
-        <file>icons/waypoints/32x32/FlagBlue.png</file>
-        <file>icons/waypoints/32x32/BoxRed.png</file>
-        <file>icons/waypoints/32x32/BoxGreen.png</file>
+        
+        <file>icons/waypoints/32x32/1stCategory.png</file>
+        <file>icons/waypoints/32x32/2ndCategory.png</file>
+        <file>icons/waypoints/32x32/3rdCategory.png</file>
+        <file>icons/waypoints/32x32/4thCategory.png</file>
         <file>icons/waypoints/32x32/BoxBlue.png</file>
-        <file>icons/waypoints/32x32/DiamondRed.png</file>
-        <file>icons/waypoints/32x32/DiamondGreen.png</file>
-        <file>icons/waypoints/32x32/DiamondBlue.png</file>
-        <file>icons/waypoints/32x32/Residence.png</file>
-        <file>icons/waypoints/32x32/Waypoint.png</file>
+        <file>icons/waypoints/32x32/BoxGreen.png</file>
+        <file>icons/waypoints/32x32/BoxRed.png</file>
         <file>icons/waypoints/32x32/CityCapitol.png</file>
         <file>icons/waypoints/32x32/CityLarge.png</file>
         <file>icons/waypoints/32x32/CityMedium.png</file>
         <file>icons/waypoints/32x32/CitySmall.png</file>
-        <file>icons/waypoints/32x32/1stCategory.png</file>
-        <file>icons/waypoints/32x32/2ndCategory.png</file>
-        <file>icons/waypoints/32x32/3rdCategory.png</file>
-        <file>icons/waypoints/32x32/4thCategory.png</file>
         <file>icons/waypoints/32x32/Danger.png</file>
+        <file>icons/waypoints/32x32/Default.png</file>
+        <file>icons/waypoints/32x32/DiamondBlue.png</file>
+        <file>icons/waypoints/32x32/DiamondGreen.png</file>
+        <file>icons/waypoints/32x32/DiamondRed.png</file>
+        <file>icons/waypoints/32x32/End.png</file>
         <file>icons/waypoints/32x32/FirstAid.png</file>
+        <file>icons/waypoints/32x32/FlagBlue.png</file>
+        <file>icons/waypoints/32x32/FlagGreen.png</file>
+        <file>icons/waypoints/32x32/FlagRed.png</file>
         <file>icons/waypoints/32x32/Food.png</file>
         <file>icons/waypoints/32x32/Generic.png</file>
         <file>icons/waypoints/32x32/HorsCategory.png</file>
         <file>icons/waypoints/32x32/Left.png</file>
-        <file>icons/waypoints/32x32/Right.png</file>
-        <file>icons/waypoints/32x32/Sprint.png</file>
-        <file>icons/waypoints/32x32/Straight.png</file>
-        <file>icons/waypoints/32x32/Summit.png</file>
-        <file>icons/waypoints/32x32/Valley.png</file>
-        <file>icons/waypoints/32x32/Water.png</file>       
         <file>icons/waypoints/32x32/LeftFork.png</file>
-        <file>icons/waypoints/32x32/RightFork.png</file>
         <file>icons/waypoints/32x32/MiddleFork.png</file>
-        <file>icons/waypoints/32x32/SlightLeft.png</file>
+        <file>icons/waypoints/32x32/PinBlue.png</file>
+        <file>icons/waypoints/32x32/PinGreen.png</file>
+        <file>icons/waypoints/32x32/PinRed.png</file>
+        <file>icons/waypoints/32x32/Residence.png</file>
+        <file>icons/waypoints/32x32/Right.png</file>
+        <file>icons/waypoints/32x32/RightFork.png</file>
         <file>icons/waypoints/32x32/SharpLeft.png</file>
-        <file>icons/waypoints/32x32/SlightRight.png</file>
         <file>icons/waypoints/32x32/SharpRight.png</file>
-        <file>icons/waypoints/32x32/UTurn.png</file>
+        <file>icons/waypoints/32x32/SlightLeft.png</file>
+        <file>icons/waypoints/32x32/SlightRight.png</file>
+        <file>icons/waypoints/32x32/Sprint.png</file>
         <file>icons/waypoints/32x32/Start.png</file>
-        <file>icons/waypoints/32x32/End.png</file>
-        <file>cursors/cursorArrow.png</file>
-        <file>cursors/cursorMove.png</file>
-        <file>cursors/cursorPointMove.png</file>
-        <file>cursors/cursorMoveMap.png</file>
-        <file>cursors/cursorMoveWpt.png</file>
-        <file>cursors/cursorMoveLine.png</file>
-        <file>cursors/cursorMoveArea.png</file>
-        <file>cursors/cursorDelete.png</file>
-        <file>cursors/cursorSelectRange.png</file>
-        <file>cursors/cursorSelectArea.png</file>
-        <file>cursors/cursorPointAdd.png</file>
-        <file>cursors/cursorPointDel.png</file>
-        <file>cursors/cursorPrint.png</file>
-        <file>cursors/cursorSave.png</file>
-        <file>cursors/wptHighlightRed.png</file>
-        <file>cursors/wptHighlightBlue.png</file>
-        <file>animation/loader.gif</file>
-        <file>animation/loader2.gif</file>
-        <file>pics/timezones.png</file>
-        <file>pics/splash.png</file>
-        <file>pics/compass.png</file>
-        <file>pics/about.png</file>
-        <file>pics/noMap256x256.png</file>
-        <file>map/WorldTopo.wmts</file>
-        <file>map/WorldSat.wmts</file>
-        <file>map/OpenStreetMap.tms</file>
+        <file>icons/waypoints/32x32/Straight.png</file>
+        <file>icons/waypoints/32x32/Summit.png</file>
+        <file>icons/waypoints/32x32/UTurn.png</file>
+        <file>icons/waypoints/32x32/Valley.png</file>
+        <file>icons/waypoints/32x32/Water.png</file>
+        <file>icons/waypoints/32x32/Waypoint.png</file>
+        
         <file>map/OSM_Topo.tms</file>
         <file>map/OpenCycleMap.tms</file>
+        <file>map/OpenStreetMap.tms</file>
+        <file>map/WorldSat.wmts</file>
+        <file>map/WorldTopo.wmts</file>
+        
+        <file>pics/about.png</file>
+        <file>pics/compass.png</file>
+        <file>pics/noMap256x256.png</file>
+        <file>pics/splash.png</file>
+        <file>pics/timezones.png</file>
+        
         <file>templates/Hiking_Tour_Summary.ui</file>
     </qresource>
 </RCC>
diff --git a/src/tool/CRoutinoDatabaseBuilder.cpp b/src/tool/CRoutinoDatabaseBuilder.cpp
index b7e1b3a..4800f7e 100644
--- a/src/tool/CRoutinoDatabaseBuilder.cpp
+++ b/src/tool/CRoutinoDatabaseBuilder.cpp
@@ -36,6 +36,7 @@ CRoutinoDatabaseBuilder::CRoutinoDatabaseBuilder(QWidget * parent)
     connect(toolTargetPath,   &QToolButton::clicked,   this, &CRoutinoDatabaseBuilder::slotSelectTargetPath);
     connect(pushStart,        &QPushButton::clicked,   this, &CRoutinoDatabaseBuilder::slotStart);
     connect(lineTargetPrefix, &QLineEdit::textChanged, this, &CRoutinoDatabaseBuilder::enabelStartButton);
+    connect(labelHelp,        &QLabel::linkActivated,  this, &CRoutinoDatabaseBuilder::slotLinkActivated);
 
     pushStart->setDisabled(true);
 
@@ -183,3 +184,8 @@ void CRoutinoDatabaseBuilder::finished(int exitCode, QProcess::ExitStatus status
         cmd.start("planetsplitter", args);
     }
 }
+
+void CRoutinoDatabaseBuilder::slotLinkActivated(const QUrl& url)
+{
+    QDesktopServices::openUrl(url);
+}
diff --git a/src/tool/CRoutinoDatabaseBuilder.h b/src/tool/CRoutinoDatabaseBuilder.h
index eacff5e..114e41d 100644
--- a/src/tool/CRoutinoDatabaseBuilder.h
+++ b/src/tool/CRoutinoDatabaseBuilder.h
@@ -37,6 +37,7 @@ private slots:
     void slotStart();
 
     void enabelStartButton();
+    void slotLinkActivated(const QUrl& url);
 
 private:
     void finished(int exitCode, QProcess::ExitStatus status) override;
diff --git a/src/tool/IMapVrtBuilder.ui b/src/tool/IMapVrtBuilder.ui
index 305bcc8..8cb80bb 100644
--- a/src/tool/IMapVrtBuilder.ui
+++ b/src/tool/IMapVrtBuilder.ui
@@ -199,14 +199,18 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>1. Select one or multiple source files.
-2. Select a file name for the target VRT file.
-3. Press "Start" button.
+        <string><ol>
+<li>Select one or multiple source files.</li>
+<li>Select a file name for the target VRT file.</li>
+<li>Press "Start" button.</li>
+</ol>
 
 Tip:
-* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
-* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
-* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</string>
+<ul>
+<li>If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.</li>
+<li>Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.</li>
+<li>The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</li>
+</ul></string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
diff --git a/src/tool/IRoutinoDatabaseBuilder.ui b/src/tool/IRoutinoDatabaseBuilder.ui
index fd3e552..5f0306c 100644
--- a/src/tool/IRoutinoDatabaseBuilder.ui
+++ b/src/tool/IRoutinoDatabaseBuilder.ui
@@ -7,13 +7,16 @@
     <x>0</x>
     <y>0</y>
     <width>988</width>
-    <height>712</height>
+    <height>451</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0">
+    <widget class="QListWidget" name="listWidget"/>
+   </item>
    <item row="0" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
@@ -42,20 +45,17 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <widget class="QListWidget" name="listWidget"/>
-   </item>
    <item row="1" column="1">
     <widget class="QTextBrowser" name="textBrowser"/>
    </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
     <widget class="QPushButton" name="pushStart">
      <property name="text">
       <string>Start</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item row="3" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
       <widget class="QToolButton" name="toolTargetPath">
@@ -106,6 +106,49 @@
      </item>
     </layout>
    </item>
+   <item row="2" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="../resources.qrc">:/icons/48x48/Help.png</pixmap>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelHelp">
+       <property name="text">
+        <string><p>To create a Routino routing database you need to download *pbf files from <a href='http://download.geofabrik.de/'>GeoFabrik</a>. The process of creating a Routino database is quite slow and the resulting files quite large. Therefore it's recommended not to download whole continents. Limit your download to those countries you really need. However as Routino can't route over several databases you have to include all countries that are touched by a cross [...]
+
+<ol>
+<li>Select one or multiple source *.pbf files.</li>
+<li>Select a path for your Routino database.</li>
+<li>Select a prefix. The database will be listed by this prefix.</li>
+<li>Press "Start" button.</li>
+</ol></string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
   <zorder>textBrowser</zorder>
   <zorder>pushStart</zorder>
diff --git a/src/units/CUnitsSetup.cpp b/src/units/CUnitsSetup.cpp
index 8d083f6..afb6bdb 100644
--- a/src/units/CUnitsSetup.cpp
+++ b/src/units/CUnitsSetup.cpp
@@ -39,6 +39,17 @@ CUnitsSetup::CUnitsSetup(QWidget *parent)
         radioNautic->setChecked(true);
         break;
     }
+
+    switch(IUnit::getSlopeMode())
+    {
+    case IUnit::eSlopeDegrees:
+        radioDegrees->setChecked(true);
+        break;
+
+    case IUnit::eSlopePercent:
+        radioPercent->setChecked(true);
+        break;
+    }
 }
 
 void CUnitsSetup::accept()
@@ -55,5 +66,14 @@ void CUnitsSetup::accept()
     {
         IUnit::setUnitType(IUnit::eTypeNautic, &CMainWindow::self());
     }
+
+    if(radioDegrees->isChecked())
+    {
+        IUnit::setSlopeMode(IUnit::eSlopeDegrees);
+    }
+    else if(radioPercent->isChecked())
+    {
+        IUnit::setSlopeMode(IUnit::eSlopePercent);
+    }
     QDialog::accept();
 }
diff --git a/src/units/ITimeZoneSetup.ui b/src/units/ITimeZoneSetup.ui
index 2313e88..23bf5b8 100644
--- a/src/units/ITimeZoneSetup.ui
+++ b/src/units/ITimeZoneSetup.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>398</width>
-    <height>106</height>
+    <height>176</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -112,6 +112,25 @@
     </layout>
    </item>
    <item>
+    <widget class="QLabel" name="label_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
diff --git a/src/units/IUnit.cpp b/src/units/IUnit.cpp
index 61de648..795e08f 100644
--- a/src/units/IUnit.cpp
+++ b/src/units/IUnit.cpp
@@ -34,6 +34,8 @@ IUnit::coord_format_e IUnit::coordFormat = IUnit::eCoordFormat1;
 QByteArray IUnit::timeZone = "UTC";
 bool IUnit::useShortFormat = false;
 
+IUnit::slope_mode_e IUnit::slopeMode = IUnit::eSlopeDegrees;
+
 const char * IUnit::tblTimezone[] =
 {
     "Africa/Abidjan",
@@ -440,13 +442,41 @@ IUnit::IUnit(const type_e &type, const QString& baseunit, const qreal basefactor
     , speedfactor(speedfactor)
 {
     //there can be only one...
-    if(nullptr != m_self)
+    delete m_self;
+    m_self = this;
+}
+
+void IUnit::slope2string(qreal slope, QString &val, QString &unit)
+{
+    switch(slopeMode)
     {
-        delete m_self;
+    case eSlopeDegrees:
+        val.sprintf("%.1f", slope);
+        unit = "°";
+        break;
+
+    case eSlopePercent:
+        val.sprintf("%.0f", qTan(qDegreesToRadians(slope))*100.0);
+        unit = "%";
+        break;
     }
-    m_self = this;
 }
 
+void IUnit::slope2unit(qreal slope, qreal &val, QString &unit)
+{
+    switch(slopeMode)
+    {
+    case eSlopeDegrees:
+        val = slope;
+        unit = "°";
+        break;
+
+    case eSlopePercent:
+        val = qTan(qDegreesToRadians(slope))*100.0;
+        unit = "%";
+        break;
+    }
+}
 
 void IUnit::setUnitType(type_e t, QObject * parent)
 {
@@ -509,6 +539,7 @@ QDateTime IUnit::parseTimestamp(const QString &timetext, int& tzoffset)
     int i;
 
     tzoffset = 0;
+    bool applyTzOffset = false;
 
     QString format = "yyyy-MM-dd'T'hh:mm:ss";
 
@@ -529,7 +560,9 @@ QDateTime IUnit::parseTimestamp(const QString &timetext, int& tzoffset)
     if (timetext.indexOf("Z") != NOIDX)
     {
         format += "'Z'";
+        applyTzOffset = true;
     }
+
     else if ((i = tzRE.indexIn(timetext)) != NOIDX)
     {
         // trailing timezone offset [-+]HH:MM present
@@ -555,10 +588,19 @@ QDateTime IUnit::parseTimestamp(const QString &timetext, int& tzoffset)
             tzoffset = 60 * offsetHours + offsetMinutes;
         }
         tzoffset *= 60;          // seconds
+        applyTzOffset = true;
     }
 
     QDateTime datetime = QDateTime::fromString(timetext, format);
-    datetime.setOffsetFromUtc(tzoffset);
+
+    if (applyTzOffset)
+    {
+        datetime.setOffsetFromUtc(tzoffset);
+    }
+    else
+    {   // if timetext has no 'Z' and no [-+]HH:MM then this is local time then simply switch to UTC without applying any offset
+        datetime = datetime.toUTC();
+    }
 
     return datetime;
 }
diff --git a/src/units/IUnit.h b/src/units/IUnit.h
index a6b0967..9b4a876 100644
--- a/src/units/IUnit.h
+++ b/src/units/IUnit.h
@@ -61,6 +61,18 @@ public:
     /// instantiate the correct unit object
     static void setUnitType(type_e t, QObject * parent);
 
+    enum slope_mode_e {eSlopePercent, eSlopeDegrees};
+    static void setSlopeMode(slope_mode_e mode)
+    {
+        slopeMode = mode;
+    }
+    static enum slope_mode_e getSlopeMode()
+    {
+        return slopeMode;
+    }
+    static void slope2string(qreal slope, QString& val, QString& unit);
+    static void slope2unit(qreal slope, qreal& val, QString& unit);
+
     /// parse a string for a timestamp
     static bool parseTimestamp(const QString &time, QDateTime &datetime);
 
@@ -133,6 +145,8 @@ public:
 protected:
     IUnit(const type_e& type, const QString& baseunit, const qreal basefactor, const QString& speedunit, const qreal speedfactor, QObject *parent);
 
+    static slope_mode_e slopeMode;
+
     static QDateTime parseTimestamp(const QString &timetext, int& tzoffset);
 
     static tz_mode_e timeZoneMode;
diff --git a/src/units/IUnitsSetup.ui b/src/units/IUnitsSetup.ui
index 6ce8fc9..e5fa9f6 100644
--- a/src/units/IUnitsSetup.ui
+++ b/src/units/IUnitsSetup.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>281</width>
-    <height>147</height>
+    <width>269</width>
+    <height>229</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,46 +15,98 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QRadioButton" name="radioNautic">
-         <property name="text">
-          <string>Nautic</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QRadioButton" name="radioImperial">
-         <property name="text">
-          <string>Imperial</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QRadioButton" name="radioMetric">
-         <property name="text">
-          <string>Metric</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QLabel" name="label">
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>1</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <property name="documentMode">
+      <bool>false</bool>
+     </property>
+     <property name="tabBarAutoHide">
+      <bool>false</bool>
+     </property>
+     <widget class="QWidget" name="tabLength">
+      <attribute name="title">
+       <string>Length unit</string>
+      </attribute>
+      <widget class="QRadioButton" name="radioNautic">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>0</y>
+         <width>343</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Nautic</string>
+       </property>
+      </widget>
+      <widget class="QRadioButton" name="radioImperial">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>20</y>
+         <width>343</width>
+         <height>20</height>
+        </rect>
+       </property>
        <property name="text">
-        <string><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</string>
+        <string>Imperial</string>
        </property>
-       <property name="alignment">
-        <set>Qt::AlignJustify|Qt::AlignTop</set>
+      </widget>
+      <widget class="QRadioButton" name="radioMetric">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>40</y>
+         <width>343</width>
+         <height>20</height>
+        </rect>
        </property>
-       <property name="wordWrap">
-        <bool>true</bool>
+       <property name="text">
+        <string>Metric</string>
        </property>
       </widget>
-     </item>
-    </layout>
+     </widget>
+     <widget class="QWidget" name="tabSlope">
+      <attribute name="title">
+       <string>Slope unit</string>
+      </attribute>
+      <widget class="QRadioButton" name="radioDegrees">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>10</y>
+         <width>343</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Degrees (°)</string>
+       </property>
+      </widget>
+      <widget class="QRadioButton" name="radioPercent">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>30</y>
+         <width>343</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Percent (%)</string>
+       </property>
+      </widget>
+     </widget>
+    </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
@@ -70,6 +122,25 @@
     </spacer>
    </item>
    <item>
+    <widget class="QLabel" name="label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string><b>Note:</b> For some GUI elements changing the units will not take effect until you restart QMapShack.</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
diff --git a/src/widgets/CHistoryListWidget.cpp b/src/widgets/CHistoryListWidget.cpp
index 3d2c9ce..62ad217 100644
--- a/src/widgets/CHistoryListWidget.cpp
+++ b/src/widgets/CHistoryListWidget.cpp
@@ -16,7 +16,7 @@
 
 **********************************************************************************************/
 
-#include "gis/CGisWidget.h"
+#include "gis/CGisWorkspace.h"
 #include "gis/prj/IGisProject.h"
 #include "widgets/CHistoryListWidget.h"
 
@@ -85,7 +85,7 @@ void CHistoryListWidget::setupHistory(IGisItem& gisItem)
 
 void CHistoryListWidget::slotSelectionChanged()
 {
-    IGisItem * item = CGisWidget::self().getItemByKey(key);
+    IGisItem * item = CGisWorkspace::self().getItemByKey(key);
     if(nullptr == item)
     {
         return;
@@ -119,7 +119,7 @@ void CHistoryListWidget::slotCutHistoryAfter()
         return;
     }
 
-    IGisItem * item = CGisWidget::self().getItemByKey(key);
+    IGisItem * item = CGisWorkspace::self().getItemByKey(key);
     if(nullptr == item)
     {
         return;
@@ -146,7 +146,7 @@ void CHistoryListWidget::slotCutHistoryBefore()
         return;
     }
 
-    IGisItem * item = CGisWidget::self().getItemByKey(key);
+    IGisItem * item = CGisWorkspace::self().getItemByKey(key);
     if (nullptr == item)
     {
         return;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git



More information about the Pkg-grass-devel mailing list