diff -Nru qmapshack-1.8.1/changelog.txt qmapshack-1.9.0/changelog.txt
--- qmapshack-1.8.1/changelog.txt	2017-05-14 10:33:50.000000000 +0000
+++ qmapshack-1.9.0/changelog.txt	2017-07-24 15:46:11.000000000 +0000
@@ -1,3 +1,16 @@
+V 1.9.0
+Add: Garmin Maps: Allow external TYP files
+Add: Filter items on workspace by string
+Add: GPX: Support for Cluetrust extensions
+Add: Trk: Add filter to add terrain slope as extension
+Fix: Issue with time zone in fit files (Zulu instead of local time zone)
+Fix: GeoCaches: Fix regex to find attached images
+[Issue #84]  Have a floating toolbar with common tools
+[Issue #232] Zoom on touchscreen using two fingers is very jumpy
+[Issue #226] Display slope under cursor in status bar
+[Issue #230] New layout of edit toolbar and POI highlighting
+[Issue #229] Failure to add point to track
+
 V 1.8.1
 Fix: Various glitches introduced by the new FIT format
 Fix: Visual tile artefacts in the DEM layer
diff -Nru qmapshack-1.8.1/CMakeLists.txt qmapshack-1.9.0/CMakeLists.txt
--- qmapshack-1.8.1/CMakeLists.txt	2017-05-14 10:14:03.000000000 +0000
+++ qmapshack-1.9.0/CMakeLists.txt	2017-07-24 15:46:11.000000000 +0000
@@ -30,8 +30,8 @@
 set(APPLICATION_NAME qmapshack)
 
 set(APPLICATION_VERSION_MAJOR "1")
-set(APPLICATION_VERSION_MINOR "8")
-set(APPLICATION_VERSION_PATCH "1")
+set(APPLICATION_VERSION_MINOR "9")
+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 -Nru qmapshack-1.8.1/CMakeLists.txt.user qmapshack-1.9.0/CMakeLists.txt.user
--- qmapshack-1.8.1/CMakeLists.txt.user	2017-05-13 18:12:37.000000000 +0000
+++ qmapshack-1.9.0/CMakeLists.txt.user	2017-07-23 14:04:11.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.1, 2017-05-13T20:12:37. -->
+<!-- Written by QtCreator 4.2.1, 2017-07-23T16:04:11. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -68,7 +68,7 @@
    <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_CXX_COMPILER:FILEPATH=/usr/bin/g++-5</value>
+     <value type="QString">CMAKE_BUILD_TYPE:STRING=RelWithDebInfo</value>
      <value type="QString">UPDATE_TRANSLATIONS:BOOL=OFF</value>
     </valuelist>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/oeichler/Code/cpp/build_QMapShack</value>
@@ -228,7 +228,7 @@
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/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</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qttest (deaktiviert)</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.qttest</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
diff -Nru qmapshack-1.8.1/debian/changelog qmapshack-1.9.0/debian/changelog
--- qmapshack-1.8.1/debian/changelog	2017-07-15 14:03:45.000000000 +0000
+++ qmapshack-1.9.0/debian/changelog	2017-07-24 16:11:29.000000000 +0000
@@ -1,14 +1,9 @@
-qmapshack (1.8.1-1build2) artful; urgency=medium
+qmapshack (1.9.0-1) unstable; urgency=medium
 
-  * No-change rebuild against latest alglib
+  * New upstream release.
+  * Update gbp.conf to use common configuration.
 
- -- Jeremy Bicha <jbicha@ubuntu.com>  Sat, 15 Jul 2017 10:03:45 -0400
-
-qmapshack (1.8.1-1build1) artful; urgency=medium
-
-  * Rebuild against new gdal ABI.
-
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 13 Jul 2017 13:33:45 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 24 Jul 2017 18:11:29 +0200
 
 qmapshack (1.8.1-1) unstable; urgency=medium
 
diff -Nru qmapshack-1.8.1/debian/gbp.conf qmapshack-1.9.0/debian/gbp.conf
--- qmapshack-1.8.1/debian/gbp.conf	2016-12-24 10:43:04.000000000 +0000
+++ qmapshack-1.9.0/debian/gbp.conf	2017-07-02 14:23:25.000000000 +0000
@@ -1,3 +1,16 @@
 [DEFAULT]
+
+# The default name for the upstream branch is "upstream".
+# Change it if the name is different (for instance, "master").
+upstream-branch = upstream
+
+# The default name for the Debian branch is "master".
+# Change it if the name is different (for instance, "debian/unstable").
+debian-branch = master
+
+# git-import-orig uses the following names for the upstream tags.
+# Change the value if you are not using git-import-orig
+upstream-tag = upstream/%(version)s
+
+# Always use pristine-tar.
 pristine-tar = True
-compression = gz
diff -Nru qmapshack-1.8.1/src/canvas/CCanvas.cpp qmapshack-1.9.0/src/canvas/CCanvas.cpp
--- qmapshack-1.8.1/src/canvas/CCanvas.cpp	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/canvas/CCanvas.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -156,6 +156,15 @@
     QApplication::changeOverrideCursor(cursor);
 }
 
+void CCanvas::triggerCompleteUpdate(CCanvas::redraw_e flags)
+{
+    CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
+    if(canvas)
+    {
+        canvas->slotTriggerCompleteUpdate(flags);
+    }
+}
+
 void CCanvas::saveConfig(QSettings& cfg)
 {
     map->saveConfig(cfg);
@@ -397,7 +406,8 @@
     QPointF pos = e->pos();
     map->convertPx2Rad(pos);
     qreal ele = dem->getElevationAt(pos);
-    emit sigMousePosition(pos * RAD_TO_DEG, ele);
+    qreal slope = dem->getSlopeAt(pos);
+    emit sigMousePosition(pos * RAD_TO_DEG, ele, slope);
 
     mouse->mouseMoveEvent(e);
     QWidget::mouseMoveEvent(e);
@@ -773,6 +783,16 @@
     return dem->getElevationAt(pos, ele);
 }
 
+qreal CCanvas::getSlopeAt(const QPointF& pos) const
+{
+    return dem->getSlopeAt(pos);
+}
+
+void CCanvas::getSlopeAt(const QPolygonF& pos, QPolygonF& slope) const
+{
+    return dem->getSlopeAt(pos, slope);
+}
+
 void CCanvas::getElevationAt(SGisLine& line) const
 {
     return dem->getElevationAt(line);
@@ -944,20 +964,33 @@
 {
     if (QPinchGesture *pinch = dynamic_cast<QPinchGesture *>(e->gesture(Qt::PinchGesture)))
     {
-        if (pinch->totalChangeFlags() & QPinchGesture::ScaleFactorChanged)
+        if (pinch->changeFlags() & QPinchGesture::CenterPointChanged)
         {
-            QPointF pos = pinch->centerPoint();
-            QPointF pt1 = pos;
-
-            map->convertPx2Rad(pt1);
-            setZoom(pinch->lastScaleFactor() < pinch->scaleFactor(), needsRedraw);
-            map->convertRad2Px(pt1);
-
-            map->convertRad2Px(posFocus);
-            posFocus -= (pos - pt1);
-            map->convertPx2Rad(posFocus);
-
-            update();
+            const QPointF & move = pinch->centerPoint() - pinch->lastCenterPoint();
+            if (!move.isNull())
+            {
+                moveMap(move);
+            }
+        }
+        if (pinch->changeFlags() & QPinchGesture::ScaleFactorChanged)
+        {
+            qreal pscale = pinch->totalScaleFactor();
+            if (pscale < 0.8f || pscale > 1.25f)
+            {
+                const QPointF & center = pinch->centerPoint();
+                const QPointF & pos = mapFromGlobal(QPoint(center.x(),center.y()));
+                QPointF pt1 = pos;
+                map->convertPx2Rad(pt1);
+                setZoom(pscale > 1.0f, needsRedraw);
+                map->convertRad2Px(pt1);
+                const QPointF & move = pos - pt1;
+                if (!move.isNull())
+                {
+                    moveMap(move);
+                }
+                pinch->setTotalScaleFactor(1.0f);
+                slotTriggerCompleteUpdate(needsRedraw);
+            }
         }
     }
     return true;
diff -Nru qmapshack-1.8.1/src/canvas/CCanvas.h qmapshack-1.9.0/src/canvas/CCanvas.h
--- qmapshack-1.8.1/src/canvas/CCanvas.h	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/canvas/CCanvas.h	2017-07-23 13:41:03.000000000 +0000
@@ -58,6 +58,7 @@
     static void restoreOverrideCursor(const QString &src);
     static void changeOverrideCursor(const QCursor& cursor, const QString &src);
 
+
     void saveConfig(QSettings& cfg);
     void loadConfig(QSettings& cfg);
 
@@ -85,6 +86,9 @@
     void  getElevationAt(const QPolygonF& pos, QPolygonF &ele) const;
     void  getElevationAt(SGisLine &line) const;
 
+    qreal getSlopeAt(const QPointF &pos) const;
+    void getSlopeAt(const QPolygonF& pos, QPolygonF& slope) const;
+
     void moveMap(const QPointF &delta);
     void zoomTo(const QRectF& rect);
     void displayInfo(const QPoint& px);
@@ -100,6 +104,8 @@
         , eRedrawAll = 0xFFFFFFFF
     };
 
+    static void triggerCompleteUpdate(CCanvas::redraw_e flags);
+
 
     void resetMouse();
     void setMouseMoveWpt(CGisItemWpt& wpt);
@@ -148,7 +154,7 @@
 
     static qreal gisLayerOpacity;
 signals:
-    void sigMousePosition(const QPointF& pos, qreal ele);
+    void sigMousePosition(const QPointF& pos, qreal ele, qreal slope);
     void sigZoom();
     void sigMove();
 
diff -Nru qmapshack-1.8.1/src/canvas/IDrawObject.cpp qmapshack-1.9.0/src/canvas/IDrawObject.cpp
--- qmapshack-1.8.1/src/canvas/IDrawObject.cpp	2017-04-17 10:41:19.000000000 +0000
+++ qmapshack-1.9.0/src/canvas/IDrawObject.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -206,8 +206,8 @@
             qreal dy1 = pPt[0].y() - pPt[1].y();
             qreal dx2 = pPt[0].x() - pPt[3].x();
             qreal dy2 = pPt[0].y() - pPt[3].y();
-            qreal w   = /*qRound*/( qSqrt(dx1*dx1 + dy1*dy1));
-            qreal h   = /*qRound*/( qSqrt(dx2*dx2 + dy2*dy2));
+            qreal w   = /*qRound*/ ( qSqrt(dx1*dx1 + dy1*dy1));
+            qreal h   = /*qRound*/ ( qSqrt(dx2*dx2 + dy2*dy2));
 
             // calculate rotation. This is not really a reprojection but might be good enough for close zoom levels
             qreal a = qAtan(dy1/dx1) * RAD_TO_DEG;
diff -Nru qmapshack-1.8.1/src/CMainWindow.cpp qmapshack-1.9.0/src/CMainWindow.cpp
--- qmapshack-1.8.1/src/CMainWindow.cpp	2017-03-26 10:12:43.000000000 +0000
+++ qmapshack-1.9.0/src/CMainWindow.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler@gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess@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
@@ -31,6 +32,8 @@
 #include "gis/trk/CKnownExtension.h"
 #include "helpers/CProgressDialog.h"
 #include "helpers/CSettings.h"
+#include "helpers/CToolBarConfig.h"
+#include "helpers/CToolBarSetupDialog.h"
 #include "helpers/CWptIconDialog.h"
 #include "map/CMapDraw.h"
 #include "map/CMapItem.h"
@@ -115,6 +118,7 @@
     connect(actionSetupUnits,            &QAction::triggered,            this,      &CMainWindow::slotSetupUnits);
     connect(actionSetupWorkspace,        &QAction::triggered,            this,      &CMainWindow::slotSetupWorkspace);
     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(actionLoadGISData,           &QAction::triggered,            this,      &CMainWindow::slotLoadGISData);
@@ -126,6 +130,7 @@
     connect(actionPrintMap,              &QAction::triggered,            this,      &CMainWindow::slotPrintMap);
     connect(actionSetupWaypointIcons,    &QAction::triggered,            this,      &CMainWindow::slotSetupWptIcons);
     connect(actionCloseTab,              &QAction::triggered,            this,      &CMainWindow::slotCloseTab);
+    connect(actionToggleDocks,           &QAction::triggered,            this,      &CMainWindow::slotToggleDocks);
     connect(tabWidget,                   &QTabWidget::tabCloseRequested, this,      &CMainWindow::slotTabCloseRequest);
 
     connect(tabWidget,                   &QTabWidget::currentChanged,    this,      &CMainWindow::slotCurrentTabCanvas);
@@ -194,13 +199,139 @@
     lblElevation = new QLabel(status);
     status->addPermanentWidget(lblElevation);
 
+    lblSlope = new QLabel(status);
+    status->addPermanentWidget(lblSlope);
+
     lblPosGrid = new QLabel(status);
     status->addPermanentWidget(lblPosGrid);
 
-    menuWindow->addAction(dockMaps->toggleViewAction());
-    menuWindow->addAction(dockDem->toggleViewAction());
-    menuWindow->addAction(dockGis->toggleViewAction());
-    menuWindow->addAction(dockRte->toggleViewAction());
+
+    docks << dockMaps
+          << dockDem
+          << dockGis
+          << dockRte;
+
+    if (cfg.contains(QStringLiteral("MainWindow/activedocks")))
+    {
+        const QStringList & dockNames = cfg.value(QStringLiteral("MainWindow/activedocks")).toStringList();
+        for(QDockWidget * const & dock : docks)
+        {
+            if(dockNames.contains(dock->objectName()))
+            {
+                activeDocks << dock;
+            }
+        }
+    }
+
+    for (QDockWidget * const & dock : docks)
+    {
+        connect(dock, &QDockWidget::visibilityChanged, this, &CMainWindow::slotDockVisibilityChanged);
+    }
+
+
+    QAction * actionToggleToolBar = toolBar->toggleViewAction();
+    actionToggleToolBar->setObjectName(QStringLiteral("actionToggleToolBar"));
+    actionToggleToolBar->setIcon(QIcon(QStringLiteral(":/icons/32x32/ToolBar.png")));
+    menuWindow->insertAction(actionSetupToolbar,actionToggleToolBar);
+
+    QAction * actionToggleMaps = dockMaps->toggleViewAction();
+    actionToggleMaps->setObjectName(QStringLiteral("actionToggleMaps"));
+    actionToggleMaps->setIcon(QIcon(QStringLiteral(":/icons/32x32/ToggleMaps.png")));
+    menuWindow->insertAction(actionSetupToolbar,actionToggleMaps);
+
+    QAction * actionToggleDem = dockDem->toggleViewAction();
+    actionToggleDem->setObjectName(QStringLiteral("actionToggleDem"));
+    actionToggleDem->setIcon(QIcon(QStringLiteral(":/icons/32x32/ToggleDem.png")));
+    menuWindow->insertAction(actionSetupToolbar,actionToggleDem);
+
+    QAction * actionToggleGis = dockGis->toggleViewAction();
+    actionToggleGis->setObjectName(QStringLiteral("actionToggleGis"));
+    actionToggleGis->setIcon(QIcon(QStringLiteral(":/icons/32x32/ToggleGis.png")));
+    menuWindow->insertAction(actionSetupToolbar,actionToggleGis);
+
+    QAction * actionToggleRte = dockRte->toggleViewAction();
+    actionToggleRte->setObjectName(QStringLiteral("actionToggleRte"));
+    actionToggleRte->setIcon(QIcon(QStringLiteral(":/icons/32x32/ToggleRouter.png")));
+    menuWindow->insertAction(actionSetupToolbar,actionToggleRte);
+
+    menuWindow->insertSeparator(actionSetupToolbar);
+
+    QAction * separator = new QAction(QStringLiteral("---------------"),this);
+    separator->setSeparator(true);
+    separator->setObjectName(QStringLiteral("separator"));
+
+    QList<QAction *> availableActions;
+    availableActions << separator
+                     << actionAddMapView
+                     << actionShowScale
+                     << actionSetupMapFont
+                     << actionShowGrid
+                     << actionSetupGrid
+                     << actionFlipMouseWheel
+                     << actionSetupMapPaths
+                     << actionPOIText
+                     << actionNightDay
+                     << actionMapToolTip
+                     << actionSetupDEMPaths
+                     << actionAbout
+                     << actionHelp
+                     << actionSetupMapView
+                     << actionLoadGISData
+                     << actionSaveGISData
+                     << actionSetupTimeZone
+                     << actionAddEmptyProject
+                     << actionSearchGoogle
+                     << actionCloseAllProjects
+                     << actionSetupUnits
+                     << actionSetupWorkspace
+                     << actionImportDatabase
+                     << actionVrtBuilder
+                     << actionStoreView
+                     << actionLoadView
+                     << actionProfileIsWindow
+                     << actionClose
+                     << actionCloneMapView
+                     << actionCreateRoutinoDatabase
+                     << actionPrintMap
+                     << actionSetupCoordFormat
+                     << actionSetupMapBackground
+                     << actionSetupWaypointIcons
+                     << actionCloseTab
+                     << actionQuickstart
+                     << actionSetupToolbar
+                     << actionToggleMaps
+                     << actionToggleDem
+                     << actionToggleGis
+                     << actionToggleRte
+                     << actionToggleDocks
+                     << actionToggleToolBar;
+
+    QAction * separator1 = new QAction(QStringLiteral("---------------"),this);
+    separator1->setSeparator(true);
+    separator1->setObjectName(QStringLiteral("separator"));
+
+    QList<QAction *> defaultActions;
+    defaultActions << actionSearchGoogle
+                   << actionAddEmptyProject
+                   << actionLoadGISData
+                   << actionSaveGISData
+                   << separator
+                   << actionShowScale
+                   << actionShowGrid
+                   << actionPOIText
+                   << actionNightDay
+                   << actionMapToolTip
+                   << actionProfileIsWindow
+                   << separator1
+                   << actionSetupToolbar
+                   << actionToggleMaps
+                   << actionToggleDem
+                   << actionToggleGis
+                   << actionToggleRte
+                   << actionToggleDocks;
+
+    toolBarConfig = new CToolBarConfig(this, toolBar, availableActions, defaultActions);
+    toolBarConfig->loadSettings();
 
     prepareMenuForMac();
 
@@ -211,7 +342,7 @@
 
 void CMainWindow::prepareMenuForMac()
 {
-    dockMaps->toggleViewAction()->setMenuRole(QAction::NoRole);
+    toolBar->toggleViewAction()->setMenuRole(QAction::NoRole);
     dockMaps->toggleViewAction()->setMenuRole(QAction::NoRole);
     dockDem->toggleViewAction()->setMenuRole(QAction::NoRole);
     dockGis->toggleViewAction()->setMenuRole(QAction::NoRole);
@@ -226,7 +357,12 @@
     cfg.setValue("MainWindow/state", saveState());
     cfg.setValue("MainWindow/geometry", saveGeometry());
     cfg.setValue("MainWindow/units", IUnit::self().type);
-
+    QStringList activeDockNames;
+    for (QDockWidget * const & dock : activeDocks)
+    {
+        activeDockNames << dock->objectName();
+    }
+    cfg.setValue("MainWindow/activedocks",activeDockNames);
 
     /*
        The "Canvas" section will hold all settings global to all views
@@ -298,6 +434,8 @@
     cfg.setValue("Units/time/useShortFormat", useShortFormat);
 
     cfg.setValue("Units/coordFormat", IUnit::getCoordFormat());
+
+    toolBarConfig->saveSettings();
 }
 
 QWidget * CMainWindow::getBestWidgetForParent()
@@ -479,6 +617,49 @@
     }
 }
 
+qreal CMainWindow::getSlopeAt(const QPointF& pos) const
+{
+    CCanvas * canvas = getVisibleCanvas();
+    if(canvas)
+    {
+        return canvas->getSlopeAt(pos);
+    }
+    else
+    {
+        for(int i = 0; i < tabWidget->count(); i++)
+        {
+            canvas = dynamic_cast<CCanvas*>(tabWidget->widget(i));
+            if(canvas)
+            {
+                return canvas->getSlopeAt(pos);
+            }
+        }
+    }
+    return NOFLOAT;
+}
+
+void CMainWindow::getSlopeAt(const QPolygonF &pos, QPolygonF& slope) const
+{
+    CCanvas * canvas = getVisibleCanvas();
+    if(canvas)
+    {
+        canvas->getSlopeAt(pos, slope);
+    }
+    else
+    {
+        for(int i = 0; i < tabWidget->count(); i++)
+        {
+            canvas = dynamic_cast<CCanvas*>(tabWidget->widget(i));
+            if(canvas)
+            {
+                canvas->getSlopeAt(pos, slope);
+                return;
+            }
+        }
+        slope.clear();
+    }
+}
+
 void CMainWindow::slotAbout()
 {
     CAbout dlg(this);
@@ -703,7 +884,7 @@
     }
 }
 
-void CMainWindow::slotMousePosition(const QPointF& pos, qreal ele)
+void CMainWindow::slotMousePosition(const QPointF& pos, qreal ele, qreal slope)
 {
     QString str;
     IUnit::degToStr(pos.x(), pos.y(), str);
@@ -721,6 +902,18 @@
         lblElevation->hide();
     }
 
+    if(slope != NOFLOAT)
+    {
+        QString val;
+        val.sprintf("%.1f", slope);
+        lblSlope->setText(tr("Slope: %1%2").arg(val).arg(QChar(0260)));
+        lblSlope->show();
+    }
+    else
+    {
+        lblSlope->hide();
+    }
+
     if(actionShowGrid->isChecked())
     {
         CCanvas * canvas = getVisibleCanvas();
@@ -840,6 +1033,12 @@
     dlg.exec();
 }
 
+void CMainWindow::slotSetupToolbar()
+{
+    CToolBarSetupDialog dlg(this,toolBarConfig);
+    dlg.exec();
+}
+
 void CMainWindow::slotImportDatabase()
 {
     CImportDatabase * widget = new CImportDatabase(this);
@@ -1004,6 +1203,70 @@
     }
 }
 
+void CMainWindow::slotToggleDocks()
+{
+    bool isHidden = true;
+    for (QDockWidget * const & dock : docks)
+    {
+        if (!dock->isHidden())
+        {
+            isHidden = false;
+            break;
+        }
+    }
+
+    if (isHidden)
+    {
+        if (activeDocks.isEmpty())
+        {
+            for (QDockWidget * const & dock : docks)
+            {
+                dock->show();
+            }
+        }
+        else
+        {
+            const QList<QDockWidget *> docksToShow(activeDocks);
+            for (QDockWidget * const & dock : docksToShow)
+            {
+                dock->show();
+            }
+        }
+    }
+    else
+    {
+        activeDocks.clear();
+        for (QDockWidget * const & dock : docks)
+        {
+            if (!dock->isHidden())
+            {
+                dock->hide();
+                activeDocks << dock;
+            }
+        }
+    }
+}
+
+void CMainWindow::slotDockVisibilityChanged(bool visible)
+{
+    if (visible)
+    {
+        activeDocks.clear();
+    }
+    else
+    {
+        for (QDockWidget * const & dock : docks)
+        {
+            if (!dock->isHidden())
+            {
+                visible = true;
+                break;
+            }
+        }
+    }
+    actionToggleDocks->setChecked(visible);
+}
+
 #ifdef WIN32
 
 static void sendDeviceEvent(DWORD unitmask, bool add)
diff -Nru qmapshack-1.8.1/src/CMainWindow.h qmapshack-1.9.0/src/CMainWindow.h
--- qmapshack-1.8.1/src/CMainWindow.h	2017-03-26 10:12:50.000000000 +0000
+++ qmapshack-1.9.0/src/CMainWindow.h	2017-07-01 14:40:11.000000000 +0000
@@ -1,5 +1,6 @@
 /**********************************************************************************************
     Copyright (C) 2014 Oliver Eichler oliver.eichler@gmx.de
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess@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,9 +28,9 @@
 class QLabel;
 class CGisWidget;
 class CCanvas;
+class CToolBarConfig;
 struct SGisLine;
 
-
 class CMainWindow : public QMainWindow, private Ui::IMainWindow
 {
     Q_OBJECT
@@ -70,6 +71,9 @@
     qreal getElevationAt(const QPointF &pos) const;
     void  getElevationAt(const QPolygonF& pos, QPolygonF &ele) const;
     void  getElevationAt(SGisLine &line) const;
+
+    qreal getSlopeAt(const QPointF &pos) const;
+    void getSlopeAt(const QPolygonF &pos, QPolygonF& slope) const;
     /**
        @brief Get pointer to the currently visible canvas object.
        @return If the currently visible tab does not contain a CCanvas object 0 is returned.
@@ -107,7 +111,7 @@
     void slotCurrentTabCanvas(int i);
     void slotCurrentTabMaps(int i);
     void slotCurrentTabDem(int i);
-    void slotMousePosition(const QPointF& pos, qreal ele);
+    void slotMousePosition(const QPointF& pos, qreal ele, qreal slope);
     void slotUpdateCurrentWidget();
     void slotSetupMapFont();
     void slotSetupMapBackground();
@@ -119,6 +123,7 @@
     void slotSetupUnits();
     void slotSetupWorkspace();
     void slotSetupCoordFormat();
+    void slotSetupToolbar();
     void slotImportDatabase();
     void slotLoadGISData();
     void slotBuildVrt();
@@ -131,6 +136,8 @@
     void slotLinkActivated(const QString& link);
     void slotSanityTest();
     void slotCloseTab();
+    void slotToggleDocks();
+    void slotDockVisibilityChanged(bool visible);
 
 private:
     friend int main(int argc, char ** argv);
@@ -143,11 +150,17 @@
     /// status bar label
     QLabel * lblPosWGS84;
     QLabel * lblElevation;
+    QLabel * lblSlope;
     QLabel * lblPosGrid;
 
     QFont mapFont;
 
     CGisWidget * gisWidget;
+
+    CToolBarConfig * toolBarConfig;
+
+    QList<QDockWidget *> docks;
+    QList<QDockWidget *> activeDocks;
 };
 
 #endif //CMAINWINDOW_H
diff -Nru qmapshack-1.8.1/src/CMakeLists.txt qmapshack-1.9.0/src/CMakeLists.txt
--- qmapshack-1.8.1/src/CMakeLists.txt	2017-05-14 09:59:29.000000000 +0000
+++ qmapshack-1.9.0/src/CMakeLists.txt	2017-07-23 13:41:03.000000000 +0000
@@ -99,6 +99,7 @@
         widgets/CPhotoAlbum.cpp
         widgets/CColorLegend.cpp
         widgets/CColorChooser.cpp
+        widgets/CSelectDoubleListWidget.cpp
         helpers/CInputDialog.cpp
         helpers/CPositionDialog.cpp
         helpers/CWptIconDialog.cpp
@@ -111,6 +112,8 @@
         helpers/CDraw.cpp
         helpers/CValue.cpp
         helpers/CLimit.cpp
+        helpers/CToolBarConfig.cpp
+        helpers/CToolBarSetupDialog.cpp
         canvas/CCanvas.cpp
         canvas/CCanvasSetup.cpp
         canvas/IDrawContext.cpp
@@ -191,6 +194,7 @@
         gis/CGisListDB.cpp
         gis/CGisListWks.cpp
         gis/CSelDevices.cpp
+        gis/CSetupFilter.cpp
         gis/prj/IGisProject.cpp
         gis/prj/CDetailsPrj.cpp
         gis/gpx/CGpxProject.cpp
@@ -257,6 +261,7 @@
         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
@@ -380,6 +385,7 @@
         widgets/CPhotoAlbum.h
         widgets/CColorLegend.h
         widgets/CColorChooser.h
+        widgets/CSelectDoubleListWidget.h
         helpers/Platform.h
         helpers/CFileExt.h
         helpers/CSettings.h
@@ -396,6 +402,8 @@
         helpers/CValue.h
         helpers/CLimit.h
         helpers/Signals.h
+        helpers/CToolBarConfig.h
+        helpers/CToolBarSetupDialog.h
         canvas/CCanvas.h
         canvas/CCanvasSetup.h
         canvas/IDrawContext.h
@@ -480,6 +488,7 @@
         gis/CGisListDB.h
         gis/CGisListWks.h
         gis/CSelDevices.h
+        gis/CSetupFilter.h
         gis/qms/CQmsProject.h
         gis/tnv/CTwoNavProject.h
         gis/tcx/CTcxProject.h
@@ -536,6 +545,7 @@
         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
@@ -656,6 +666,7 @@
     widgets/ITextEditWidgetSelMenu.ui
     widgets/IPhotoAlbum.ui
     widgets/IColorChooser.ui
+    widgets/ISelectDoubleListWidget.ui
     helpers/IInputDialog.ui
     helpers/IPositionDialog.ui
     helpers/IWptIconDialog.ui
@@ -664,6 +675,7 @@
     helpers/IElevationDialog.ui
     helpers/ILinksDialog.ui
     helpers/IProgressDialog.ui
+    helpers/IToolBarSetupDialog.ui
     canvas/ICanvasSetup.ui
     dem/IDemList.ui
     dem/IDemPathSetup.ui
@@ -680,6 +692,7 @@
     mouse/line/IScrOptRangeLine.ui
     gis/IGisWidget.ui
     gis/ISelDevices.ui
+    gis/ISetupFilter.ui
     gis/prj/IDetailsPrj.ui
     gis/db/ISetupDatabase.ui
     gis/db/ISetupWorkspace.ui
@@ -712,6 +725,7 @@
     gis/trk/filter/IFilterObscureDate.ui
     gis/trk/filter/IFilterSpeed.ui
     gis/trk/filter/IFilterSplitSegment.ui
+    gis/trk/filter/IFilterTerrainSlope.ui
     gis/rte/IScrOptRte.ui
     gis/rte/ICreateRouteFromWpt.ui
     gis/rte/IDetailsRte.ui
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/cursors/cursorAdd.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/cursors/cursorAdd.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/cursors/cursorMovePoint.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/cursors/cursorMovePoint.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/cursors/cursorPointAdd.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/cursors/cursorPointAdd.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/cursors/cursorPointDel.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/cursors/cursorPointDel.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/cursors/cursorPointMove.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/cursors/cursorPointMove.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/cursors/wptHighlightBlue.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/cursors/wptHighlightBlue.png differ
diff -Nru qmapshack-1.8.1/src/cursors/wptHighlightBlue.svg qmapshack-1.9.0/src/cursors/wptHighlightBlue.svg
--- qmapshack-1.8.1/src/cursors/wptHighlightBlue.svg	2017-03-18 17:41:22.000000000 +0000
+++ qmapshack-1.9.0/src/cursors/wptHighlightBlue.svg	2017-05-17 17:42:32.000000000 +0000
@@ -15,7 +15,10 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="wptHighlightBlue.svg">
+   sodipodi:docname="wptHighlightBlue.svg"
+   inkscape:export-filename="/home/oeichler/Code/cpp/QMapShack/src/cursors/wptHighlightBlue.png"
+   inkscape:export-xdpi="137"
+   inkscape:export-ydpi="137">
   <defs
      id="defs4">
     <linearGradient
@@ -71,14 +74,14 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8"
-     inkscape:cx="-29.774046"
+     inkscape:cx="24.288454"
      inkscape:cy="49.055774"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="1920"
-     inkscape:window-height="989"
-     inkscape:window-x="0"
+     inkscape:window-height="1051"
+     inkscape:window-x="1920"
      inkscape:window-y="0"
      inkscape:window-maximized="1">
     <inkscape:grid
@@ -115,28 +118,26 @@
        sodipodi:rx="15"
        sodipodi:ry="15"
        d="M 45,29 A 15,15 0 0 1 30.015812,43.999992 15,15 0 0 1 15.000033,29.031623 15,15 0 0 1 29.952565,14.000075 15,15 0 0 1 44.999867,28.936754"
-       transform="matrix(0.97281118,0,0,0.97281118,0.87316707,989.09323)"
        sodipodi:start="0"
        sodipodi:end="6.2789689"
        sodipodi:open="true"
        inkscape:export-filename="/home/oeichler/Code/cpp/QMapShack/src/cursors/wptHighlightBlue.png"
        inkscape:export-xdpi="137.22581"
-       inkscape:export-ydpi="137.22581" />
+       inkscape:export-ydpi="137.22581"
+       transform="matrix(0.97281118,0,0,0.97281118,0.87316707,989.09323)" />
     <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#0000ff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4144"
        sodipodi:type="arc"
-       style="fill:none;stroke:#2a2aff;stroke-width:0.50444174;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path3823"
-       sodipodi:cx="-5"
-       sodipodi:cy="31.5"
-       sodipodi:rx="5"
-       sodipodi:ry="2.5"
-       d="m 0,31.5 a 5,2.5 0 0 1 -4.9947295,2.499999 5,2.5 0 0 1 -5.0052594,-2.494728 5,2.5 0 0 1 4.9841774,-2.505258 5,2.5 0 0 1 5.015767054842,2.489446"
-       transform="matrix(2.0535053,0,0,4.1070106,40.325029,887.93392)"
+       sodipodi:cx="30.057718"
+       sodipodi:cy="1017.3047"
+       sodipodi:rx="10"
+       sodipodi:ry="10.5"
        sodipodi:start="0"
-       sodipodi:end="6.2789689"
+       sodipodi:end="6.2789616"
        sodipodi:open="true"
-       inkscape:export-filename="/home/oeichler/Code/cpp/QMapShack/src/cursors/wptHighlightBlue.png"
-       inkscape:export-xdpi="137.22581"
-       inkscape:export-ydpi="137.22581" />
+       d="m 40.057718,1017.3047 a 10,10.5 0 0 1 -9.98944,10.5 10,10.5 0 0 1 -10.010537,-10.4778 10,10.5 0 0 1 9.9683,-10.5221 10,10.5 0 0 1 10.031588,10.4556"
+       inkscape:export-xdpi="137"
+       inkscape:export-ydpi="137" />
   </g>
 </svg>
diff -Nru qmapshack-1.8.1/src/dem/CDemDraw.cpp qmapshack-1.9.0/src/dem/CDemDraw.cpp
--- qmapshack-1.8.1/src/dem/CDemDraw.cpp	2017-03-26 10:12:44.000000000 +0000
+++ qmapshack-1.9.0/src/dem/CDemDraw.cpp	2017-06-30 14:25:55.000000000 +0000
@@ -286,6 +286,38 @@
     return ele;
 }
 
+qreal CDemDraw::getSlopeAt(const QPointF& pos)
+{
+    qreal slope = NOFLOAT;
+    if(CDemItem::mutexActiveDems.tryLock())
+    {
+        if(demList)
+        {
+            for(int i = 0; i < demList->count(); i++)
+            {
+                CDemItem * item = demList->item(i);
+
+                if(!item || item->demfile.isNull())
+                {
+                    // as all active maps have to be at the top of the list
+                    // it is ok to break as soon as the first map with no
+                    // active files is hit.
+                    break;
+                }
+
+                slope = item->demfile->getSlopeAt(pos);
+                if(slope != NOFLOAT)
+                {
+                    break;
+                }
+            }
+        }
+        CDemItem::mutexActiveDems.unlock();
+    }
+    return slope;
+}
+
+
 void CDemDraw::getElevationAt(const QPolygonF& pos, QPolygonF& ele)
 {
     qreal basefactor = IUnit::self().basefactor;
@@ -297,6 +329,14 @@
     }
 }
 
+void CDemDraw::getSlopeAt(const QPolygonF& pos, QPolygonF& slope)
+{
+    for(int i = 0; i < pos.size(); i++)
+    {
+        slope[i].ry() = getSlopeAt(pos[i]);
+    }
+}
+
 void CDemDraw::getElevationAt(SGisLine& line)
 {
     line.updateElevation(this);
diff -Nru qmapshack-1.8.1/src/dem/CDemDraw.h qmapshack-1.9.0/src/dem/CDemDraw.h
--- qmapshack-1.8.1/src/dem/CDemDraw.h	2017-03-26 10:12:50.000000000 +0000
+++ qmapshack-1.9.0/src/dem/CDemDraw.h	2017-06-30 14:25:55.000000000 +0000
@@ -51,6 +51,9 @@
     void  getElevationAt(const QPolygonF& pos, QPolygonF& ele);
     void  getElevationAt(SGisLine& line);
 
+    qreal getSlopeAt(const QPointF& pos);
+    void  getSlopeAt(const QPolygonF& pos, QPolygonF& slope);
+
     void setProjection(const QString& proj) override;
 
     static const QStringList& getDemPaths()
diff -Nru qmapshack-1.8.1/src/dem/CDemVRT.cpp qmapshack-1.9.0/src/dem/CDemVRT.cpp
--- qmapshack-1.8.1/src/dem/CDemVRT.cpp	2017-04-17 10:11:47.000000000 +0000
+++ qmapshack-1.9.0/src/dem/CDemVRT.cpp	2017-06-05 12:03:34.000000000 +0000
@@ -47,7 +47,7 @@
 
     if(dataset->GetRasterCount() != 1)
     {
-        delete dataset;
+        GDALClose(dataset);
         dataset = nullptr;
         QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("Error..."), tr("DEM must have one band with 16bit or 32bit data."));
         return;
@@ -56,7 +56,7 @@
     GDALRasterBand *pBand = dataset->GetRasterBand(1);
     if(nullptr == pBand)
     {
-        delete dataset;
+        GDALClose(dataset);
         dataset = nullptr;
         QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("Error..."), tr("DEM must have one band with 16bit or 32bit data."));
         return;
@@ -85,7 +85,7 @@
 
     if(pjsrc == 0)
     {
-        delete dataset;
+        GDALClose(dataset);
         dataset = nullptr;
         QMessageBox::warning(0, tr("Error..."), tr("No georeference information found."));
         return;
@@ -134,7 +134,7 @@
 
 CDemVRT::~CDemVRT()
 {
-    delete dataset;
+    GDALClose(dataset);
 }
 
 qreal CDemVRT::getElevationAt(const QPointF& pos)
@@ -182,6 +182,47 @@
     return ele;
 }
 
+qreal CDemVRT::getSlopeAt(const QPointF& pos)
+{
+    if(pjsrc == 0)
+    {
+        return NOFLOAT;
+    }
+
+    QPointF pt = pos;
+
+    pj_transform(pjtar, pjsrc, 1, 0, &pt.rx(), &pt.ry(), 0);
+
+    if(!boundingBox.contains(pt))
+    {
+        return NOFLOAT;
+    }
+
+    pt = trInv.map(pt);
+
+    qreal x    = pt.x() - qFloor(pt.x());
+    qreal y    = pt.y() - qFloor(pt.y());
+
+    qint16 win[eWinsize4x4];
+    mutex.lock();
+    CPLErr err = dataset->RasterIO(GF_Read, qFloor(pt.x())-1, qFloor(pt.y())-1, 4, 4, &win, 4, 4, GDT_Int16, 1, 0, 0, 0, 0);
+    mutex.unlock();
+    if(err == CE_Failure)
+    {
+        return NOFLOAT;
+    }
+    for(int i=0; i<eWinsize4x4; i++)
+    {
+        if(hasNoData && win[i] == noData)
+        {
+            return NOFLOAT;
+        }
+    }
+
+    qreal slope = slopeOfWindowInterp(win, eWinsize4x4, x, y);
+    return slope;
+}
+
 
 void CDemVRT::draw(IDrawContext::buffer_t& buf)
 {
diff -Nru qmapshack-1.8.1/src/dem/CDemVRT.h qmapshack-1.9.0/src/dem/CDemVRT.h
--- qmapshack-1.8.1/src/dem/CDemVRT.h	2017-03-26 10:12:50.000000000 +0000
+++ qmapshack-1.9.0/src/dem/CDemVRT.h	2017-05-19 14:53:52.000000000 +0000
@@ -36,6 +36,7 @@
     void draw(IDrawContext::buffer_t& buf) override;
 
     qreal getElevationAt(const QPointF& pos) override;
+    qreal getSlopeAt(const QPointF& pos) override;
 
 private:
     QMutex mutex;
diff -Nru qmapshack-1.8.1/src/dem/IDem.cpp qmapshack-1.9.0/src/dem/IDem.cpp
--- qmapshack-1.8.1/src/dem/IDem.cpp	2017-05-12 16:10:23.000000000 +0000
+++ qmapshack-1.9.0/src/dem/IDem.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -41,6 +41,29 @@
     w[8] = getValue(data, x + 1, y + 1, dx);
 }
 
+inline void fillWindow4x4(QVector<qint16>& data, qreal x, qreal y, int dx, qint16* w)
+{
+    x = qFloor(x);
+    y = qFloor(y);
+
+    w[0]  = getValue(data, x - 1, y - 1, dx);
+    w[1]  = getValue(data, x, y - 1, dx);
+    w[2]  = getValue(data, x + 1, y - 1, dx);
+    w[3]  = getValue(data, x + 2, y - 1, dx);
+    w[4]  = getValue(data, x - 1, y, dx);
+    w[5]  = getValue(data, x, y, dx);
+    w[6]  = getValue(data, x + 1, y, dx);
+    w[7]  = getValue(data, x + 2, y, dx);
+    w[8]  = getValue(data, x - 1, y + 1, dx);
+    w[9]  = getValue(data, x, y + 1, dx);
+    w[10] = getValue(data, x + 1, y + 1, dx);
+    w[11] = getValue(data, x + 2, y + 1, dx);
+    w[12] = getValue(data, x - 1, y + 2, dx);
+    w[13] = getValue(data, x, y + 2, dx);
+    w[14] = getValue(data, x + 1, y + 2, dx);
+    w[15] = getValue(data, x + 2, y + 2, dx);
+}
+
 const struct SlopePresets IDem::slopePresets[7]
 {
     /* http://www.alpenverein.de/bergsport/sicherheit/skitouren-schneeschuh-sicher-im-schnee/dav-snowcard_aid_10619.html */
@@ -193,7 +216,7 @@
         unsigned char* scan = img.scanLine(m - 1);
         for(unsigned int n = 1; n <= w; n++)
         {
-            qint16 win[9];
+            qint16 win[eWinsize3x3];
             fillWindow(data, n, m, wp2, win);
 
             if(hasNoData && win[4] == noData)
@@ -222,6 +245,52 @@
     }
 }
 
+qreal IDem::slopeOfWindowInterp(qint16* win2, winsize_e size, qreal x, qreal y)
+{
+    for(int i = 0; i < size; i++)
+    {
+        if(hasNoData && win2[i] == noData)
+        {
+            return NOFLOAT;
+        }
+    }
+
+    qreal win[eWinsize3x3];
+    switch(size)
+    {
+    case eWinsize3x3:
+        for(int i = 0; i < 9; i++)
+        {
+            win[i] = win2[i];
+        }
+        break;
+
+    case eWinsize4x4:
+        win[0] = win2[0] + x * (win2[1]-win2[0]) + y * (win2[4]-win2[0]) + x*y*(win2[0]-win2[1]-win2[4]+win2[5]);
+        win[1] = win2[1] + x * (win2[2]-win2[1]) + y * (win2[5]-win2[1]) + x*y*(win2[1]-win2[2]-win2[5]+win2[6]);
+        win[2] = win2[2] + x * (win2[3]-win2[2]) + y * (win2[6]-win2[2]) + x*y*(win2[2]-win2[3]-win2[6]+win2[7]);
+
+        win[3] = win2[4] + x * (win2[5]-win2[4]) + y * (win2[8]-win2[4]) + x*y*(win2[4]-win2[5]-win2[8]+win2[9]);
+        win[4] = win2[5] + x * (win2[6]-win2[5]) + y * (win2[9]-win2[5]) + x*y*(win2[5]-win2[6]-win2[9]+win2[10]);
+        win[5] = win2[6] + x * (win2[7]-win2[6]) + y * (win2[10]-win2[6]) + x*y*(win2[6]-win2[7]-win2[10]+win2[11]);
+
+        win[6] = win2[8] + x * (win2[9]-win2[8]) + y * (win2[12]-win2[8]) + x*y*(win2[8]-win2[9]-win2[12]+win2[13]);
+        win[7] = win2[9] + x * (win2[10]-win2[9]) + y * (win2[13]-win2[9]) + x*y*(win2[9]-win2[10]-win2[13]+win2[14]);
+        win[8] = win2[10] + x * (win2[11]-win2[10]) + y * (win2[14]-win2[10]) + x*y*(win2[10]-win2[11]-win2[14]+win2[15]);
+        break;
+
+    default:
+        return NOFLOAT;
+    }
+
+    qreal dx    = ((win[0] + win[3] + win[3] + win[6]) - (win[2] + win[5] + win[5] + win[8])) / (xscale);
+    qreal dy    = ((win[6] + win[7] + win[7] + win[8]) - (win[0] + win[1] + win[1] + win[2])) / (yscale);
+    qreal k     = dx * dx + dy * dy;
+    qreal slope =  qAtan(qSqrt(k) / (8 * 1.0)) * 180.0 / M_PI;
+
+    return slope;
+}
+
 void IDem::slopecolor(QVector<qint16>& data, qreal w, qreal h, QImage &img)
 {
     int wp2 = w + 2;
@@ -231,13 +300,9 @@
         unsigned char* scan = img.scanLine(m - 1);
         for(unsigned int n = 1; n <= w; n++)
         {
-            qint16 win[9];
+            qint16 win[eWinsize3x3];
             fillWindow(data, n, m, wp2, win);
-
-            qreal dx    = ((win[0] + win[3] + win[3] + win[6]) - (win[2] + win[5] + win[5] + win[8])) / (xscale);
-            qreal dy    = ((win[6] + win[7] + win[7] + win[8]) - (win[0] + win[1] + win[1] + win[2])) / (yscale);
-            qreal k     = dx * dx + dy * dy;
-            qreal slope =  qAtan(qSqrt(k) / (8 * 1.0)) * 180.0 / M_PI;
+            qreal slope = slopeOfWindowInterp(win, eWinsize3x3, 0, 0);
 
             const qreal *currentSlopeStepTable = getCurrentSlopeStepTable();
 
diff -Nru qmapshack-1.8.1/src/dem/IDem.h qmapshack-1.9.0/src/dem/IDem.h
--- qmapshack-1.8.1/src/dem/IDem.h	2017-05-12 16:10:23.000000000 +0000
+++ qmapshack-1.9.0/src/dem/IDem.h	2017-07-04 16:44:15.000000000 +0000
@@ -50,6 +50,7 @@
     virtual void draw(IDrawContext::buffer_t& buf) = 0;
 
     virtual qreal getElevationAt(const QPointF& pos) = 0;
+    virtual qreal getSlopeAt(const QPointF& pos) = 0;
 
     bool activated()
     {
@@ -96,6 +97,8 @@
     void setSlopeStepTable(int idx);
     void setSlopeStepTableCustomValue(int idx, int val);
 
+    enum winsize_e {eWinsize3x3 = 9, eWinsize4x4 = 16};
+
 public slots:
     void slotSetHillshading(bool yes)
     {
@@ -116,6 +119,16 @@
     void slopecolor(QVector<qint16>& data, qreal w, qreal h, QImage &img);
 
     /**
+       @brief Slope in degrees based on a window. Origin is at point (1,1), counting from zero.
+       @param win2  window data
+       @param size  size of window (eWinsize3x3 or eWinsize4x4)
+       @param x     Fractional value (0..1) for interpolation in x (4x4 window only)
+       @param y     Fractional value (0..1) for interpolation in y (4x4 window only)
+       @return      Slope in degrees
+     */
+    qreal slopeOfWindowInterp(qint16* win2, winsize_e size, qreal x, qreal y);
+
+    /**
        @brief Reproject (translate, rotate, scale) tile before drawing it.
        @param img   the tile as QImage
        @param l     a 4 point polygon to fit the tile in
diff -Nru qmapshack-1.8.1/src/gis/CGisListWks.cpp qmapshack-1.9.0/src/gis/CGisListWks.cpp
--- qmapshack-1.8.1/src/gis/CGisListWks.cpp	2017-03-26 10:12:45.000000000 +0000
+++ qmapshack-1.9.0/src/gis/CGisListWks.cpp	2017-07-24 15:41:33.000000000 +0000
@@ -1591,11 +1591,7 @@
         searchGoogle = new CSearchGoogle(this);
     }
 
-    CCanvas *canvas = CMainWindow::self().getVisibleCanvas();
-    if(nullptr != canvas)
-    {
-        canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
-    }
+    CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
 void CGisListWks::slotSyncWksDev()
@@ -1705,7 +1701,8 @@
 {
     if(e->type() > QEvent::User)
     {
-        CGisListWksEditLock lock(true, IGisItem::mutexItems);
+        const bool doWaitCursoer = (eEvtA2WCutTrk != event_types_e(e->type()));
+        CGisListWksEditLock lock(doWaitCursoer, IGisItem::mutexItems);
 
         switch(e->type())
         {
diff -Nru qmapshack-1.8.1/src/gis/CGisWidget.cpp qmapshack-1.9.0/src/gis/CGisWidget.cpp
--- qmapshack-1.8.1/src/gis/CGisWidget.cpp	2017-03-26 10:12:45.000000000 +0000
+++ qmapshack-1.9.0/src/gis/CGisWidget.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -20,6 +20,7 @@
 #include "device/IDevice.h"
 #include "gis/CGisDraw.h"
 #include "gis/CGisWidget.h"
+#include "gis/CSetupFilter.h"
 #include "gis/IGisItem.h"
 #include "gis/db/CDBProject.h"
 #include "gis/db/CSelectDBFolder.h"
@@ -50,15 +51,21 @@
     pSelf = this;
     setupUi(this);
 
+    lineFilter->addAction(actionClearFilter,QLineEdit::TrailingPosition);
+    lineFilter->addAction(actionSetupFilter, QLineEdit::LeadingPosition);
+
     treeWks->setExternalMenu(menuProject);
 
     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();
 
@@ -70,7 +77,7 @@
     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.
@@ -134,6 +141,42 @@
     }
 }
 
+void CGisWidget::applyFilter()
+{
+    slotFilter(lineFilter->text());
+}
+
+void CGisWidget::slotFilter(const QString& str)
+{
+    CCanvas::setOverrideCursor(Qt::WaitCursor, "slotFilter");
+    QMutexLocker lock(&IGisItem::mutexItems);
+
+    const int N = treeWks->topLevelItemCount();
+    for(int n = 0; n < N; n++)
+    {
+        IGisProject * item = dynamic_cast<IGisProject*>(treeWks->topLevelItem(n));
+        if(item == nullptr)
+        {
+            continue;
+        }
+
+        item->filter(str.toUpper());
+        item->setExpanded(!str.isEmpty());
+    }
+
+    CCanvas::restoreOverrideCursor("slotFilter");
+
+    CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
+}
+
+void CGisWidget::slotSetupFilter()
+{
+    CSetupFilter * setupFilter = new CSetupFilter(this);
+    setupFilter->adjustSize();
+    setupFilter->move(lineFilter->geometry().topLeft());
+    setupFilter->show();
+}
+
 void CGisWidget::slotSaveAll()
 {
     CCanvas::setOverrideCursor(Qt::WaitCursor, "slotSaveAll");
@@ -445,11 +488,7 @@
         project->blockUpdateItems(false);
     }
 
-    CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
-    if(canvas)
-    {
-        canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
-    }
+    CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
 void CGisWidget::editItemByKey(const IGisItem::key_t& key)
@@ -524,19 +563,18 @@
     }
     project->blockUpdateItems(false);
 
-    CCanvas *canvas = CMainWindow::self().getVisibleCanvas();
-    if(nullptr != canvas)
-    {
-        canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
-    }
+    CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
 void CGisWidget::changeWptSymByKey(const QList<IGisItem::key_t>& keys, const QString& sym)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
+    PROGRESS_SETUP(tr("Change waypoint symbols."), 0, keys.count(), this);
+    int cnt = 0;
     for(const IGisItem::key_t& key : keys)
     {
+        PROGRESS(cnt++, break);
         CGisItemWpt *wpt = dynamic_cast<CGisItemWpt*>(getItemByKey(key));
         if(nullptr != wpt)
         {
diff -Nru qmapshack-1.8.1/src/gis/CGisWidget.h qmapshack-1.9.0/src/gis/CGisWidget.h
--- qmapshack-1.8.1/src/gis/CGisWidget.h	2017-03-26 10:12:51.000000000 +0000
+++ qmapshack-1.9.0/src/gis/CGisWidget.h	2017-07-23 13:41:03.000000000 +0000
@@ -319,7 +319,7 @@
 
     /**
        @brief Add a new waypoint by Position
-       @param pt    the position in [°]
+       @param pt    the position in [?]
      */
     void addWptByPos(QPointF pt, const QString& label = QString::Null(), const QString& desc = QString::Null()) const;
 
@@ -390,6 +390,8 @@
 
     void setOpacity(qreal val);
 
+    void applyFilter();
+
 signals:
     void sigChanged();
 
@@ -399,6 +401,8 @@
 private slots:
     void slotHelpText();
     void slotSetGisLayerOpacity(int val);
+    void slotFilter(const QString& str);
+    void slotSetupFilter();
 
 
 private:
diff -Nru qmapshack-1.8.1/src/gis/CSetupFilter.cpp qmapshack-1.9.0/src/gis/CSetupFilter.cpp
--- qmapshack-1.8.1/src/gis/CSetupFilter.cpp	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/gis/CSetupFilter.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -0,0 +1,51 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Oliver Eichler oliver.eichler@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 "gis/CGisWidget.h"
+#include "gis/CSetupFilter.h"
+#include "gis/prj/IGisProject.h"
+
+CSetupFilter::CSetupFilter(CGisWidget *parent)
+    : QWidget(parent)
+    , gisWidget(parent)
+{
+    setupUi(this);
+
+    switch (IGisProject::filterMode)
+    {
+    case IGisProject::eFilterModeName:
+        radioName->setChecked(true);
+        break;
+
+    case IGisProject::eFilterModeText:
+        radioText->setChecked(true);
+        break;
+    }
+
+    connect(radioName, &QRadioButton::clicked, this, &CSetupFilter::slotSelect);
+    connect(radioText, &QRadioButton::clicked, this, &CSetupFilter::slotSelect);
+}
+
+
+void CSetupFilter::slotSelect()
+{
+    IGisProject::filterMode = radioName->isChecked() ? IGisProject::eFilterModeName : IGisProject::eFilterModeText;
+    gisWidget->applyFilter();
+    deleteLater();
+}
+
diff -Nru qmapshack-1.8.1/src/gis/CSetupFilter.h qmapshack-1.9.0/src/gis/CSetupFilter.h
--- qmapshack-1.8.1/src/gis/CSetupFilter.h	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/gis/CSetupFilter.h	2017-07-23 13:41:03.000000000 +0000
@@ -0,0 +1,42 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Oliver Eichler oliver.eichler@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/>.
+
+**********************************************************************************************/
+
+#ifndef CSETUPFILTER_H
+#define CSETUPFILTER_H
+
+#include "ui_ISetupFilter.h"
+#include <QWidget>
+
+class CGisWidget;
+
+class CSetupFilter : public QWidget, private Ui::ISetupFilter
+{
+    Q_OBJECT
+public:
+    CSetupFilter(CGisWidget *parent);
+    virtual ~CSetupFilter() = default;
+
+private slots:
+    void slotSelect();
+
+private:
+    CGisWidget * gisWidget;
+};
+
+#endif //CSETUPFILTER_H
+
diff -Nru qmapshack-1.8.1/src/gis/fit/CFitProject.cpp qmapshack-1.9.0/src/gis/fit/CFitProject.cpp
--- qmapshack-1.8.1/src/gis/fit/CFitProject.cpp	2017-04-06 18:50:16.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/CFitProject.cpp	2017-06-30 14:25:55.000000000 +0000
@@ -142,7 +142,13 @@
     }
     // ql:area is not directly available in FIT (could be calculated)
 
-    setupName(QFileInfo(filename).completeBaseName().replace("_", " "));
+    QString tmp = QFileInfo(filename).completeBaseName().replace("_", " ");
+    if(!name.isEmpty())
+    {
+        tmp += QString("(%1)").arg(name);
+    }
+
+    setupName(tmp);
 }
 
 CFitProject::~CFitProject()
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/CFitByteDataTransformer.cpp qmapshack-1.9.0/src/gis/fit/decoder/CFitByteDataTransformer.cpp
--- qmapshack-1.8.1/src/gis/fit/decoder/CFitByteDataTransformer.cpp	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/CFitByteDataTransformer.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -37,9 +37,11 @@
     case eBaseTypeNrUint32:
     case eBaseTypeNrUint32z:
         return getUint32(rawData);
+
     case eBaseTypeNrUint64:
     case eBaseTypeNrUint64z:
         return getUint64(rawData);
+
     default:
         return 0;
     }
@@ -57,9 +59,10 @@
 
     case eBaseTypeNrSint32:
         return getSint32(rawData);
-        
+
     case eBaseTypeNrSint64:
         return getSint64(rawData);
+
     default:
         return 0;
     }
@@ -121,10 +124,10 @@
 
 qint64 CFitByteDataTransformer::getSint64(quint8* rawData)
 {
-    return  ((qint64) rawData[7] << 56) | ((qint64) rawData[6] << 48)
-                | ((qint64) rawData[5] << 40) | ((qint64) rawData[4] << 32)
-                | ((qint64) rawData[3] << 24) | ((qint64) rawData[2] << 16)
-                | ((qint64) rawData[1] << 8) | rawData[0];
+    return ((qint64) rawData[7] << 56) | ((qint64) rawData[6] << 48)
+           | ((qint64) rawData[5] << 40) | ((qint64) rawData[4] << 32)
+           | ((qint64) rawData[3] << 24) | ((qint64) rawData[2] << 16)
+           | ((qint64) rawData[1] << 8) | rawData[0];
 }
 
 qreal CFitByteDataTransformer::getFloat32(quint8* rawData)
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/CFitDecoder.cpp qmapshack-1.9.0/src/gis/fit/decoder/CFitDecoder.cpp
--- qmapshack-1.8.1/src/gis/fit/decoder/CFitDecoder.cpp	2017-05-12 16:10:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/CFitDecoder.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -18,9 +18,9 @@
 
 #include "gis/fit/decoder/CFitCrcState.h"
 #include "gis/fit/decoder/CFitDecoder.h"
+#include "gis/fit/decoder/CFitDevFieldDefinitionState.h"
 #include "gis/fit/decoder/CFitFieldDataState.h"
 #include "gis/fit/decoder/CFitFieldDefinitionState.h"
-#include "gis/fit/decoder/CFitDevFieldDefinitionState.h"
 #include "gis/fit/decoder/CFitHeaderState.h"
 #include "gis/fit/decoder/CFitRecordContentState.h"
 #include "gis/fit/decoder/CFitRecordHeaderState.h"
@@ -94,9 +94,9 @@
 void printByte(QFile& file, decode_state_e state, quint8 dataByte)
 {
     FITDEBUG(3, qDebug() << QString("decoding byte %1 - %2 - %3")
-            .arg(file.pos(), 6, 10, QLatin1Char(' '))
-            .arg(dataByte, 8, 2, QLatin1Char('0'))
-            .arg(decoderStateNames.at(state)));
+             .arg(file.pos(), 6, 10, QLatin1Char(' '))
+             .arg(dataByte, 8, 2, QLatin1Char('0'))
+             .arg(decoderStateNames.at(state)));
 }
 
 void CFitDecoder::decode(QFile &file)
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/CFitDefinitionMessage.cpp qmapshack-1.9.0/src/gis/fit/decoder/CFitDefinitionMessage.cpp
--- qmapshack-1.8.1/src/gis/fit/decoder/CFitDefinitionMessage.cpp	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/CFitDefinitionMessage.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -42,7 +42,7 @@
 
 CFitDefinitionMessage::CFitDefinitionMessage(quint8 localMesgNr, bool devFlag)
     : globalMesgNr(fitGlobalMesgNrInvalid), architecture(0), nrOfFields(0), nrOfDevFields(0), localMesgNr(localMesgNr),
-      devFlag(devFlag), fields(), devFields(), messageProfile(CFitProfileLookup::getProfile(fitGlobalMesgNrInvalid))
+    devFlag(devFlag), fields(), devFields(), messageProfile(CFitProfileLookup::getProfile(fitGlobalMesgNrInvalid))
 {
 }
 
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/CFitDefinitionMessage.h qmapshack-1.9.0/src/gis/fit/decoder/CFitDefinitionMessage.h
--- qmapshack-1.8.1/src/gis/fit/decoder/CFitDefinitionMessage.h	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/CFitDefinitionMessage.h	2017-07-04 16:44:15.000000000 +0000
@@ -19,8 +19,8 @@
 #ifndef CFITMESSAGEDEFINTION_H
 #define CFITMESSAGEDEFINTION_H
 
-#include "gis/fit/decoder/CFitFieldDefinition.h"
 #include "gis/fit/decoder/CFitDevFieldDefinition.h"
+#include "gis/fit/decoder/CFitFieldDefinition.h"
 
 #include <QtCore>
 
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/CFitDevFieldDefinition.cpp qmapshack-1.9.0/src/gis/fit/decoder/CFitDevFieldDefinition.cpp
--- qmapshack-1.8.1/src/gis/fit/decoder/CFitDevFieldDefinition.cpp	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/CFitDevFieldDefinition.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -49,6 +49,7 @@
     return size;
 }
 
-quint8 CFitDevFieldDefinition::getDevDataIndex() const {
+quint8 CFitDevFieldDefinition::getDevDataIndex() const
+{
     return devDataIndex;
 }
\ No newline at end of file
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/CFitDevFieldDefinitionState.cpp qmapshack-1.9.0/src/gis/fit/decoder/CFitDevFieldDefinitionState.cpp
--- qmapshack-1.8.1/src/gis/fit/decoder/CFitDevFieldDefinitionState.cpp	2017-05-12 16:10:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/CFitDevFieldDefinitionState.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -17,8 +17,8 @@
 **********************************************************************************************/
 
 #include "gis/fit/decoder/CFitDevFieldDefinitionState.h"
-#include "gis/fit/defs/fit_const.h"
 #include "gis/fit/defs/CFitBaseType.h"
+#include "gis/fit/defs/fit_const.h"
 
 /**
  * byte
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/CFitFieldBuilder.cpp qmapshack-1.9.0/src/gis/fit/decoder/CFitFieldBuilder.cpp
--- qmapshack-1.8.1/src/gis/fit/decoder/CFitFieldBuilder.cpp	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/CFitFieldBuilder.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -23,8 +23,8 @@
 #include "gis/fit/decoder/CFitMessage.h"
 #include "gis/fit/defs/CFitBaseType.h"
 #include "gis/fit/defs/CFitFieldProfile.h"
-#include "gis/fit/defs/CFitProfileLookup.h"
 #include "gis/fit/defs/CFitProfile.h"
+#include "gis/fit/defs/CFitProfileLookup.h"
 
 
 void CFitFieldBuilder::evaluateSubfieldsAndExpandComponents(CFitMessage& mesg)
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/CFitFieldDataState.cpp qmapshack-1.9.0/src/gis/fit/decoder/CFitFieldDataState.cpp
--- qmapshack-1.8.1/src/gis/fit/decoder/CFitFieldDataState.cpp	2017-05-12 16:10:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/CFitFieldDataState.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -18,11 +18,11 @@
 
 #include "gis/fit/decoder/CFitFieldBuilder.h"
 #include "gis/fit/decoder/CFitFieldDataState.h"
-#include "gis/fit/defs/fit_const.h"
-#include "gis/fit/defs/fit_fields.h"
-#include "gis/fit/defs/fit_enums.h"
 #include "gis/fit/defs/CFitBaseType.h"
 #include "gis/fit/defs/CFitProfileLookup.h"
+#include "gis/fit/defs/fit_const.h"
+#include "gis/fit/defs/fit_enums.h"
+#include "gis/fit/defs/fit_fields.h"
 
 void CFitFieldDataState::reset()
 {
@@ -160,55 +160,72 @@
     quint8 natvieMesgNum = 0;
     quint8 nativeFieldNum = 0;
 
-    for (const CFitField field : mesg.getFields()) {
-        if (field.isValidValue()) {
-            switch (field.getFieldDefNr()) {
-                case eFieldDescriptionDeveloperDataIndex:
-                    devDataIdx = (quint8) field.getValue().toUInt();
-                    break;
-                case eFieldDescriptionFieldDefinitionNumber:
-                    fieldDefNr = (quint8) field.getValue().toUInt();
-                    break;
-                case eFieldDescriptionFitBaseTypeId:
-                    baseType = (quint8) field.getValue().toUInt(); // enum
-                    break;
-                case eFieldDescriptionFieldName:
-                    fieldName = field.getValue().toString();
-                    break;
-                case eFieldDescriptionArray:
-                    array = (quint8) field.getValue().toUInt();
-                    break;
-                case eFieldDescriptionComponents:
-                    components = field.getValue().toString();
-                    break;
-                case eFieldDescriptionScale:
-                    scale = (qreal) field.getValue().toDouble();
-                    break;
-                case eFieldDescriptionOffset:
-                    offset = (qint16) field.getValue().toInt();
-                    break;
-                case eFieldDescriptionUnits:
-                    units = field.getValue().toString();
-                    break;
-                case eFieldDescriptionBits:
-                    bits = field.getValue().toString();
-                    break;
-                case eFieldDescriptionAccumulate:
-                    accumulate = field.getValue().toString();
-                    break;
-                case eFieldDescriptionFitBaseUnitId:
-                    baseUnitId = (quint8) field.getValue().toUInt(); // enum
-                    break;
-                case eFieldDescriptionNativeMesgNum:
-                    natvieMesgNum = (quint8) field.getValue().toUInt(); // enum
-                    break;
-                case eFieldDescriptionNativeFieldNum:
-                    nativeFieldNum = (quint8) field.getValue().toUInt();
-                    break;
-                default:
-                    throw tr("FIT decoding error: invalid field def nr %1 while creating dev field profile.")
-                            .arg(field.getFieldDefNr());
-                    break;
+    for (const CFitField field : mesg.getFields())
+    {
+        if (field.isValidValue())
+        {
+            switch (field.getFieldDefNr())
+            {
+            case eFieldDescriptionDeveloperDataIndex:
+                devDataIdx = (quint8) field.getValue().toUInt();
+                break;
+
+            case eFieldDescriptionFieldDefinitionNumber:
+                fieldDefNr = (quint8) field.getValue().toUInt();
+                break;
+
+            case eFieldDescriptionFitBaseTypeId:
+                baseType = (quint8) field.getValue().toUInt();     // enum
+                break;
+
+            case eFieldDescriptionFieldName:
+                fieldName = field.getValue().toString();
+                break;
+
+            case eFieldDescriptionArray:
+                array = (quint8) field.getValue().toUInt();
+                break;
+
+            case eFieldDescriptionComponents:
+                components = field.getValue().toString();
+                break;
+
+            case eFieldDescriptionScale:
+                scale = (qreal) field.getValue().toDouble();
+                break;
+
+            case eFieldDescriptionOffset:
+                offset = (qint16) field.getValue().toInt();
+                break;
+
+            case eFieldDescriptionUnits:
+                units = field.getValue().toString();
+                break;
+
+            case eFieldDescriptionBits:
+                bits = field.getValue().toString();
+                break;
+
+            case eFieldDescriptionAccumulate:
+                accumulate = field.getValue().toString();
+                break;
+
+            case eFieldDescriptionFitBaseUnitId:
+                baseUnitId = (quint8) field.getValue().toUInt();     // enum
+                break;
+
+            case eFieldDescriptionNativeMesgNum:
+                natvieMesgNum = (quint8) field.getValue().toUInt();     // enum
+                break;
+
+            case eFieldDescriptionNativeFieldNum:
+                nativeFieldNum = (quint8) field.getValue().toUInt();
+                break;
+
+            default:
+                throw tr("FIT decoding error: invalid field def nr %1 while creating dev field profile.")
+                      .arg(field.getFieldDefNr());
+                break;
             }
         }
     }
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/CFitFieldDefinition.cpp qmapshack-1.9.0/src/gis/fit/decoder/CFitFieldDefinition.cpp
--- qmapshack-1.8.1/src/gis/fit/decoder/CFitFieldDefinition.cpp	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/CFitFieldDefinition.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -16,8 +16,8 @@
 
 **********************************************************************************************/
 
-#include "gis/fit/decoder/CFitFieldDefinition.h"
 #include "gis/fit/decoder/CFitDefinitionMessage.h"
+#include "gis/fit/decoder/CFitFieldDefinition.h"
 #include "gis/fit/defs/CFitBaseType.h"
 #include "gis/fit/defs/CFitFieldProfile.h"
 #include "gis/fit/defs/CFitProfileLookup.h"
@@ -27,12 +27,12 @@
 
 
 CFitFieldDefinition::CFitFieldDefinition(CFitDefinitionMessage* parent, CFitFieldProfile* fieldProfile, quint8 defNr, quint8 size, quint8 type)
-   : defNr(defNr), size(size), type(type), baseType(CFitBaseTypeMap::get(type)), parentDefintion(parent), fieldProfile(fieldProfile)
+    : defNr(defNr), size(size), type(type), baseType(CFitBaseTypeMap::get(type)), parentDefintion(parent), fieldProfile(fieldProfile)
 {
 }
 
 CFitFieldDefinition::CFitFieldDefinition(CFitDefinitionMessage* parent, quint8 defNr, quint8 size, quint8 type)
-   : CFitFieldDefinition(parent, nullptr, defNr, size, type)
+    : CFitFieldDefinition(parent, nullptr, defNr, size, type)
 
 {
     fieldProfile = CFitProfileLookup::getFieldForProfile(parentDefintion ? parentDefintion->getGlobalMesgNr() : fitGlobalMesgNrInvalid, defNr);
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/CFitMessage.cpp qmapshack-1.9.0/src/gis/fit/decoder/CFitMessage.cpp
--- qmapshack-1.8.1/src/gis/fit/decoder/CFitMessage.cpp	2017-05-12 16:10:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/CFitMessage.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -18,8 +18,8 @@
 
 #include "gis/fit/decoder/CFitDefinitionMessage.h"
 #include "gis/fit/decoder/CFitMessage.h"
-#include "gis/fit/defs/CFitProfile.h"
 #include "gis/fit/defs/CFitFieldProfile.h"
+#include "gis/fit/defs/CFitProfile.h"
 #include "gis/fit/defs/CFitProfileLookup.h"
 #include "gis/fit/defs/fit_const.h"
 
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/CFitRecordContentState.cpp qmapshack-1.9.0/src/gis/fit/decoder/CFitRecordContentState.cpp
--- qmapshack-1.8.1/src/gis/fit/decoder/CFitRecordContentState.cpp	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/CFitRecordContentState.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -78,7 +78,8 @@
         def->setNrOfFields(nrOfFields);
 
         // only reset if developer flag not set, else developer fields follow
-        if(! def->developerFlag()) {
+        if(!def->developerFlag())
+        {
             reset();
         }
         if (nrOfFields == 0)
@@ -89,6 +90,7 @@
         // the fields definitions follows
         return eDecoderStateFieldDef;
         break;
+
     case 5:
         // number of development fields
         nrOfFields = dataByte;
@@ -103,6 +105,7 @@
         // the fields definitions follows
         return eDecoderStateDevFieldDef;
         break;
+
     default:
         throw tr("FIT decoding error: invalid offset %1 for state 'record content'").arg(offset);
     }
diff -Nru qmapshack-1.8.1/src/gis/fit/decoder/IFitDecoderState.cpp qmapshack-1.9.0/src/gis/fit/decoder/IFitDecoderState.cpp
--- qmapshack-1.8.1/src/gis/fit/decoder/IFitDecoderState.cpp	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/decoder/IFitDecoderState.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -122,7 +122,7 @@
     if(devFieldProfile(fieldProfile.getFieldDefNum())->getFieldDefNum() ==  fieldProfile.getFieldDefNum())
     {
         throw tr("FIT decoding error: a development field with the field_definition_number %1 already exists.")
-                .arg(fieldProfile.getFieldDefNum());
+              .arg(fieldProfile.getFieldDefNum());
     }
     data.devFieldProfiles.append(fieldProfile);
 }
diff -Nru qmapshack-1.8.1/src/gis/fit/defs/CFitFieldProfile.cpp qmapshack-1.9.0/src/gis/fit/defs/CFitFieldProfile.cpp
--- qmapshack-1.8.1/src/gis/fit/defs/CFitFieldProfile.cpp	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/defs/CFitFieldProfile.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -125,17 +125,17 @@
 QString CFitFieldProfile::fieldProfileInfo()
 {
     QString str = QString("%1 %2 (%3): %4 %5")
-            .arg(QString("field profile"))
-            .arg(getName())
-            .arg(getFieldDefNum())
-            .arg(getUnits())
-            .arg(getBaseType().name());
+                  .arg(QString("field profile"))
+                  .arg(getName())
+                  .arg(getFieldDefNum())
+                  .arg(getUnits())
+                  .arg(getBaseType().name());
 
     if(getBaseType().isNumber())
     {
         str += QString(" (%1-%2)")
-                .arg(getScale())
-                .arg(getOffset());
+               .arg(getScale())
+               .arg(getOffset());
     }
     return str;
 }
diff -Nru qmapshack-1.8.1/src/gis/fit/defs/CFitFieldProfile.h qmapshack-1.9.0/src/gis/fit/defs/CFitFieldProfile.h
--- qmapshack-1.8.1/src/gis/fit/defs/CFitFieldProfile.h	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/defs/CFitFieldProfile.h	2017-07-04 16:44:15.000000000 +0000
@@ -26,7 +26,8 @@
 class CFitComponentfieldProfile;
 class CFitBaseType;
 
-typedef enum {
+typedef enum
+{
     eFieldTypeFit = 0,
     eFieldTypeDevelopment = 1,
 } field_type_e;
diff -Nru qmapshack-1.8.1/src/gis/fit/defs/fit_enums.h qmapshack-1.9.0/src/gis/fit/defs/fit_enums.h
--- qmapshack-1.8.1/src/gis/fit/defs/fit_enums.h	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/defs/fit_enums.h	2017-07-04 16:44:15.000000000 +0000
@@ -20,7 +20,8 @@
 #define FIT_PROFILE_H
 
 // ----------- start generated code -----------
-typedef enum {
+typedef enum
+{
     eFileDevice = 1,
     eFileSettings = 2,
     eFileSport = 3,
@@ -43,7 +44,8 @@
     eFileMfgRangeMax = 0xFE
 } file_e;
 
-typedef enum {
+typedef enum
+{
     eMesgNumFileId = 0,
     eMesgNumCapabilities = 1,
     eMesgNumDeviceSettings = 2,
@@ -124,47 +126,56 @@
     eMesgNumMfgRangeMax = 0xFFFE
 } mesg_num_e;
 
-typedef enum {
+typedef enum
+{
     eChecksumClear = 0,
     eChecksumOk = 1
 } checksum_e;
 
-typedef enum {
+typedef enum
+{
     eFileFlagsRead = 0x02,
     eFileFlagsWrite = 0x04,
     eFileFlagsErase = 0x08
 } file_flags_e;
 
-typedef enum {
+typedef enum
+{
     eMesgCountNumPerFile = 0,
     eMesgCountMaxPerFile = 1,
     eMesgCountMaxPerFileType = 2
 } mesg_count_e;
 
-typedef enum {
+typedef enum
+{
     eDateTimeMin = 0x10000000
 } date_time_e;
 
-typedef enum {
+typedef enum
+{
     eLocalDateTimeMin = 0x10000000
 } local_date_time_e;
 
-typedef enum {
+typedef enum
+{
     eMessageIndexSelected = 0x8000,
     eMessageIndexReserved = 0x7000,
     eMessageIndexMask = 0x0FFF
 } message_index_e;
 
-typedef enum {
+typedef enum
+{
     eDeviceIndexCreator = 0
 } device_index_e;
 
-typedef enum {
+typedef enum
+{
     eGenderFemale = 0,
     eGenderMale = 1
 } gender_e;
 
-typedef enum {
+typedef enum
+{
     eLanguageEnglish = 0,
     eLanguageFrench = 1,
     eLanguageItalian = 2,
@@ -206,7 +217,8 @@
     eLanguageCustom = 254
 } language_e;
 
-typedef enum {
+typedef enum
+{
     eLanguageBits0English = 0x01,
     eLanguageBits0French = 0x02,
     eLanguageBits0Italian = 0x04,
@@ -217,7 +229,8 @@
     eLanguageBits0Danish = 0x80
 } language_bits_0_e;
 
-typedef enum {
+typedef enum
+{
     eLanguageBits1Dutch = 0x01,
     eLanguageBits1Finnish = 0x02,
     eLanguageBits1Greek = 0x04,
@@ -228,7 +241,8 @@
     eLanguageBits1Slovakian = 0x80
 } language_bits_1_e;
 
-typedef enum {
+typedef enum
+{
     eLanguageBits2Slovenian = 0x01,
     eLanguageBits2Swedish = 0x02,
     eLanguageBits2Russian = 0x04,
@@ -239,7 +253,8 @@
     eLanguageBits2Farsi = 0x80
 } language_bits_2_e;
 
-typedef enum {
+typedef enum
+{
     eLanguageBits3Bulgarian = 0x01,
     eLanguageBits3Romanian = 0x02,
     eLanguageBits3Chinese = 0x04,
@@ -250,7 +265,8 @@
     eLanguageBits3Hebrew = 0x80
 } language_bits_3_e;
 
-typedef enum {
+typedef enum
+{
     eLanguageBits4BrazilianPortuguese = 0x01,
     eLanguageBits4Indonesian = 0x02,
     eLanguageBits4Malaysian = 0x04,
@@ -259,7 +275,8 @@
     eLanguageBits4Mongolian = 0x20
 } language_bits_4_e;
 
-typedef enum {
+typedef enum
+{
     eTimeZoneAlmaty = 0,
     eTimeZoneBangkok = 1,
     eTimeZoneBombay = 2,
@@ -368,24 +385,28 @@
     eTimeZoneAutomatic = 254
 } time_zone_e;
 
-typedef enum {
+typedef enum
+{
     eDisplayMeasureMetric = 0,
     eDisplayMeasureStatute = 1,
     eDisplayMeasureNautical = 2
 } display_measure_e;
 
-typedef enum {
+typedef enum
+{
     eDisplayHeartBpm = 0,
     eDisplayHeartMax = 1,
     eDisplayHeartReserve = 2
 } display_heart_e;
 
-typedef enum {
+typedef enum
+{
     eDisplayPowerWatts = 0,
     eDisplayPowerPercentFtp = 1
 } display_power_e;
 
-typedef enum {
+typedef enum
+{
     eDisplayPositionDegree = 0,
     eDisplayPositionDegreeMinute = 1,
     eDisplayPositionDegreeMinuteSecond = 2,
@@ -430,13 +451,15 @@
     eDisplayPositionSwedishRef99Grid = 41
 } display_position_e;
 
-typedef enum {
+typedef enum
+{
     eSwitchOff = 0,
     eSwitchOn = 1,
     eSwitchAuto = 2
 } switch_e;
 
-typedef enum {
+typedef enum
+{
     eSportGeneric = 0,
     eSportRunning = 1,
     eSportCycling = 2,
@@ -489,7 +512,8 @@
     eSportAll = 254
 } sport_e;
 
-typedef enum {
+typedef enum
+{
     eSportBits0Generic = 0x01,
     eSportBits0Running = 0x02,
     eSportBits0Cycling = 0x04,
@@ -500,7 +524,8 @@
     eSportBits0Soccer = 0x80
 } sport_bits_0_e;
 
-typedef enum {
+typedef enum
+{
     eSportBits1Tennis = 0x01,
     eSportBits1AmericanFootball = 0x02,
     eSportBits1Training = 0x04,
@@ -511,7 +536,8 @@
     eSportBits1Rowing = 0x80
 } sport_bits_1_e;
 
-typedef enum {
+typedef enum
+{
     eSportBits2Mountaineering = 0x01,
     eSportBits2Hiking = 0x02,
     eSportBits2Multisport = 0x04,
@@ -522,7 +548,8 @@
     eSportBits2Boating = 0x80
 } sport_bits_2_e;
 
-typedef enum {
+typedef enum
+{
     eSportBits3Driving = 0x01,
     eSportBits3Golf = 0x02,
     eSportBits3HangGliding = 0x04,
@@ -533,7 +560,8 @@
     eSportBits3RockClimbing = 0x80
 } sport_bits_3_e;
 
-typedef enum {
+typedef enum
+{
     eSportBits4Sailing = 0x01,
     eSportBits4IceSkating = 0x02,
     eSportBits4SkyDiving = 0x04,
@@ -544,7 +572,8 @@
     eSportBits4Wakeboarding = 0x80
 } sport_bits_4_e;
 
-typedef enum {
+typedef enum
+{
     eSportBits5WaterSkiing = 0x01,
     eSportBits5Kayaking = 0x02,
     eSportBits5Rafting = 0x04,
@@ -555,11 +584,13 @@
     eSportBits5Boxing = 0x80
 } sport_bits_5_e;
 
-typedef enum {
+typedef enum
+{
     eSportBits6FloorClimbing = 0x01
 } sport_bits_6_e;
 
-typedef enum {
+typedef enum
+{
     eSubSportGeneric = 0,
     eSubSportTreadmill = 1,
     eSubSportStreet = 2,
@@ -616,7 +647,8 @@
     eSubSportAll = 254
 } sub_sport_e;
 
-typedef enum {
+typedef enum
+{
     eSportEventUncategorized = 0,
     eSportEventGeocaching = 1,
     eSportEventFitness = 2,
@@ -628,26 +660,30 @@
     eSportEventTouring = 8
 } sport_event_e;
 
-typedef enum {
+typedef enum
+{
     eActivityManual = 0,
     eActivityAutoMultiSport = 1
 } activity_e;
 
-typedef enum {
+typedef enum
+{
     eIntensityActive = 0,
     eIntensityRest = 1,
     eIntensityWarmup = 2,
     eIntensityCooldown = 3
 } intensity_e;
 
-typedef enum {
+typedef enum
+{
     eSessionTriggerActivityEnd = 0,
     eSessionTriggerManual = 1,
     eSessionTriggerAutoMultiSport = 2,
     eSessionTriggerFitnessEquipment = 3
 } session_trigger_e;
 
-typedef enum {
+typedef enum
+{
     eAutolapTriggerTime = 0,
     eAutolapTriggerDistance = 1,
     eAutolapTriggerPositionStart = 2,
@@ -657,7 +693,8 @@
     eAutolapTriggerOff = 6
 } autolap_trigger_e;
 
-typedef enum {
+typedef enum
+{
     eLapTriggerManual = 0,
     eLapTriggerTime = 1,
     eLapTriggerDistance = 2,
@@ -669,7 +706,8 @@
     eLapTriggerFitnessEquipment = 8
 } lap_trigger_e;
 
-typedef enum {
+typedef enum
+{
     eTimeModeHour12 = 0,
     eTimeModeHour24 = 1,
     eTimeModeMilitary = 2,
@@ -678,7 +716,8 @@
     eTimeModeUtc = 5
 } time_mode_e;
 
-typedef enum {
+typedef enum
+{
     eBacklightModeOff = 0,
     eBacklightModeManual = 1,
     eBacklightModeKeyAndMessages = 2,
@@ -688,12 +727,14 @@
     eBacklightModeKeyAndMessagesAndSmartNotifications = 6
 } backlight_mode_e;
 
-typedef enum {
+typedef enum
+{
     eDateModeDayMonth = 0,
     eDateModeMonthDay = 1
 } date_mode_e;
 
-typedef enum {
+typedef enum
+{
     eEventTimer = 0,
     eEventWorkout = 3,
     eEventWorkoutStep = 4,
@@ -732,7 +773,8 @@
     eEventCommTimeout = 47
 } event_e;
 
-typedef enum {
+typedef enum
+{
     eEventTypeStart = 0,
     eEventTypeStop = 1,
     eEventTypeConsecutiveDepreciated = 2,
@@ -745,44 +787,51 @@
     eEventTypeStopDisableAll = 9
 } event_type_e;
 
-typedef enum {
+typedef enum
+{
     eTimerTriggerManual = 0,
     eTimerTriggerAuto = 1,
     eTimerTriggerFitnessEquipment = 2
 } timer_trigger_e;
 
-typedef enum {
+typedef enum
+{
     eFitnessEquipmentStateReady = 0,
     eFitnessEquipmentStateInUse = 1,
     eFitnessEquipmentStatePaused = 2,
     eFitnessEquipmentStateUnknown = 3
 } fitness_equipment_state_e;
 
-typedef enum {
+typedef enum
+{
     eAutoscrollNone = 0,
     eAutoscrollSlow = 1,
     eAutoscrollMedium = 2,
     eAutoscrollFast = 3
 } autoscroll_e;
 
-typedef enum {
+typedef enum
+{
     eActivityClassLevel = 0x7F,
     eActivityClassLevelMax = 100,
     eActivityClassAthlete = 0x80
 } activity_class_e;
 
-typedef enum {
+typedef enum
+{
     eHrZoneCalcCustom = 0,
     eHrZoneCalcPercentMaxHr = 1,
     eHrZoneCalcPercentHrr = 2
 } hr_zone_calc_e;
 
-typedef enum {
+typedef enum
+{
     ePwrZoneCalcCustom = 0,
     ePwrZoneCalcPercentFtp = 1
 } pwr_zone_calc_e;
 
-typedef enum {
+typedef enum
+{
     eWktStepDurationTime = 0,
     eWktStepDurationDistance = 1,
     eWktStepDurationHrLessThan = 2,
@@ -814,7 +863,8 @@
     eWktStepDurationRepetitionTime = 28
 } wkt_step_duration_e;
 
-typedef enum {
+typedef enum
+{
     eWktStepTargetSpeed = 0,
     eWktStepTargetHeartRate = 1,
     eWktStepTargetOpen = 2,
@@ -830,7 +880,8 @@
     eWktStepTargetHeartRateLap = 13
 } wkt_step_target_e;
 
-typedef enum {
+typedef enum
+{
     eGoalTime = 0,
     eGoalDistance = 1,
     eGoalCalories = 2,
@@ -840,7 +891,8 @@
     eGoalActiveMinutes = 6
 } goal_e;
 
-typedef enum {
+typedef enum
+{
     eGoalRecurrenceOff = 0,
     eGoalRecurrenceDaily = 1,
     eGoalRecurrenceWeekly = 2,
@@ -849,18 +901,21 @@
     eGoalRecurrenceCustom = 5
 } goal_recurrence_e;
 
-typedef enum {
+typedef enum
+{
     eGoalSourceAuto = 0,
     eGoalSourceCommunity = 1,
     eGoalSourceUser = 2
 } goal_source_e;
 
-typedef enum {
+typedef enum
+{
     eScheduleWorkout = 0,
     eScheduleCourse = 1
 } schedule_e;
 
-typedef enum {
+typedef enum
+{
     eCoursePointGeneric = 0,
     eCoursePointSummit = 1,
     eCoursePointValley = 2,
@@ -889,7 +944,8 @@
     eCoursePointSegmentEnd = 25
 } course_point_e;
 
-typedef enum {
+typedef enum
+{
     eManufacturerGarmin = 1,
     eManufacturerGarminFr405Antfs = 2,
     eManufacturerZephyr = 3,
@@ -1022,7 +1078,8 @@
     eManufacturerActigraphcorp = 5759
 } manufacturer_e;
 
-typedef enum {
+typedef enum
+{
     eGarminProductHrm1 = 1,
     eGarminProductAxh01 = 2,
     eGarminProductAxb01 = 3,
@@ -1172,7 +1229,8 @@
     eGarminProductConnect = 65534
 } garmin_product_e;
 
-typedef enum {
+typedef enum
+{
     eAntplusDeviceTypeAntfs = 1,
     eAntplusDeviceTypeBikePower = 11,
     eAntplusDeviceTypeEnvironmentSensorLegacy = 12,
@@ -1198,14 +1256,16 @@
     eAntplusDeviceTypeStrideSpeedDistance = 124
 } antplus_device_type_e;
 
-typedef enum {
+typedef enum
+{
     eAntNetworkPublic = 0,
     eAntNetworkAntplus = 1,
     eAntNetworkAntfs = 2,
     eAntNetworkPrivate = 3
 } ant_network_e;
 
-typedef enum {
+typedef enum
+{
     eWorkoutCapabilitiesInterval = 0x00000001,
     eWorkoutCapabilitiesCustom = 0x00000002,
     eWorkoutCapabilitiesFitnessEquipment = 0x00000004,
@@ -1222,7 +1282,8 @@
     eWorkoutCapabilitiesProtected = 0x00004000
 } workout_capabilities_e;
 
-typedef enum {
+typedef enum
+{
     eBatteryStatusNew = 1,
     eBatteryStatusGood = 2,
     eBatteryStatusOk = 3,
@@ -1232,12 +1293,14 @@
     eBatteryStatusUnknown = 7
 } battery_status_e;
 
-typedef enum {
+typedef enum
+{
     eHrTypeNormal = 0,
     eHrTypeIrregular = 1
 } hr_type_e;
 
-typedef enum {
+typedef enum
+{
     eCourseCapabilitiesProcessed = 0x00000001,
     eCourseCapabilitiesValid = 0x00000002,
     eCourseCapabilitiesTime = 0x00000004,
@@ -1251,19 +1314,23 @@
     eCourseCapabilitiesBikeway = 0x00000400
 } course_capabilities_e;
 
-typedef enum {
+typedef enum
+{
     eWeightCalculating = 0xFFFE
 } weight_e;
 
-typedef enum {
+typedef enum
+{
     eWorkoutHrBpmOffset = 100
 } workout_hr_e;
 
-typedef enum {
+typedef enum
+{
     eWorkoutPowerWattsOffset = 1000
 } workout_power_e;
 
-typedef enum {
+typedef enum
+{
     eBpStatusNoError = 0,
     eBpStatusErrorIncompleteData = 1,
     eBpStatusErrorNoMeasurement = 2,
@@ -1271,7 +1338,8 @@
     eBpStatusErrorIrregularHeartRate = 4
 } bp_status_e;
 
-typedef enum {
+typedef enum
+{
     eUserLocalIdLocalMin = 0x0000,
     eUserLocalIdLocalMax = 0x000F,
     eUserLocalIdStationaryMin = 0x0010,
@@ -1280,7 +1348,8 @@
     eUserLocalIdPortableMax = 0xFFFE
 } user_local_id_e;
 
-typedef enum {
+typedef enum
+{
     eSwimStrokeFreestyle = 0,
     eSwimStrokeBackstroke = 1,
     eSwimStrokeBreaststroke = 2,
@@ -1290,7 +1359,8 @@
     eSwimStrokeIm = 6
 } swim_stroke_e;
 
-typedef enum {
+typedef enum
+{
     eActivityTypeGeneric = 0,
     eActivityTypeRunning = 1,
     eActivityTypeCycling = 2,
@@ -1302,7 +1372,8 @@
     eActivityTypeAll = 254
 } activity_type_e;
 
-typedef enum {
+typedef enum
+{
     eActivitySubtypeGeneric = 0,
     eActivitySubtypeTreadmill = 1,
     eActivitySubtypeStreet = 2,
@@ -1325,33 +1396,39 @@
     eActivitySubtypeAll = 254
 } activity_subtype_e;
 
-typedef enum {
+typedef enum
+{
     eActivityLevelLow = 0,
     eActivityLevelMedium = 1,
     eActivityLevelHigh = 2
 } activity_level_e;
 
-typedef enum {
+typedef enum
+{
     eSideRight = 0,
     eSideLeft = 1
 } side_e;
 
-typedef enum {
+typedef enum
+{
     eLeftRightBalanceMask = 0x7F,
     eLeftRightBalanceRight = 0x80
 } left_right_balance_e;
 
-typedef enum {
+typedef enum
+{
     eLeftRightBalance100Mask = 0x3FFF,
     eLeftRightBalance100Right = 0x8000
 } left_right_balance_100_e;
 
-typedef enum {
+typedef enum
+{
     eLengthTypeIdle = 0,
     eLengthTypeActive = 1
 } length_type_e;
 
-typedef enum {
+typedef enum
+{
     eDayOfWeekSunday = 0,
     eDayOfWeekMonday = 1,
     eDayOfWeekTuesday = 2,
@@ -1361,7 +1438,8 @@
     eDayOfWeekSaturday = 6
 } day_of_week_e;
 
-typedef enum {
+typedef enum
+{
     eConnectivityCapabilitiesBluetooth = 0x00000001,
     eConnectivityCapabilitiesBluetoothLe = 0x00000002,
     eConnectivityCapabilitiesAnt = 0x00000004,
@@ -1396,14 +1474,16 @@
     eConnectivityCapabilitiesInstantInput = 0x80000000
 } connectivity_capabilities_e;
 
-typedef enum {
+typedef enum
+{
     eWeatherReportCurrent = 0,
     eWeatherReportForecast = 1,
     eWeatherReportHourlyForecast = 1,
     eWeatherReportDailyForecast = 2
 } weather_report_e;
 
-typedef enum {
+typedef enum
+{
     eWeatherStatusClear = 0,
     eWeatherStatusPartlyCloudy = 1,
     eWeatherStatusMostlyCloudy = 2,
@@ -1427,7 +1507,8 @@
     eWeatherStatusCloudy = 22
 } weather_status_e;
 
-typedef enum {
+typedef enum
+{
     eWeatherSeverityUnknown = 0,
     eWeatherSeverityWarning = 1,
     eWeatherSeverityWatch = 2,
@@ -1435,7 +1516,8 @@
     eWeatherSeverityStatement = 4
 } weather_severity_e;
 
-typedef enum {
+typedef enum
+{
     eWeatherSevereTypeUnspecified = 0,
     eWeatherSevereTypeTornado = 1,
     eWeatherSevereTypeTsunami = 2,
@@ -1523,7 +1605,8 @@
     eWeatherSevereTypeSpecialWeather = 84
 } weather_severe_type_e;
 
-typedef enum {
+typedef enum
+{
     eStrokeTypeNoEvent = 0,
     eStrokeTypeOther = 1,
     eStrokeTypeServe = 2,
@@ -1532,7 +1615,8 @@
     eStrokeTypeSmash = 5
 } stroke_type_e;
 
-typedef enum {
+typedef enum
+{
     eBodyLocationLeftLeg = 0,
     eBodyLocationLeftCalf = 1,
     eBodyLocationLeftShin = 2,
@@ -1575,12 +1659,14 @@
     eBodyLocationWaistRight = 39
 } body_location_e;
 
-typedef enum {
+typedef enum
+{
     eSegmentLapStatusEnd = 0,
     eSegmentLapStatusFail = 1
 } segment_lap_status_e;
 
-typedef enum {
+typedef enum
+{
     eSegmentLeaderboardTypeOverall = 0,
     eSegmentLeaderboardTypePersonalBest = 1,
     eSegmentLeaderboardTypeConnections = 2,
@@ -1594,18 +1680,21 @@
     eSegmentLeaderboardTypeClubLeader = 10
 } segment_leaderboard_type_e;
 
-typedef enum {
+typedef enum
+{
     eSegmentDeleteStatusDoNotDelete = 0,
     eSegmentDeleteStatusDeleteOne = 1,
     eSegmentDeleteStatusDeleteAll = 2
 } segment_delete_status_e;
 
-typedef enum {
+typedef enum
+{
     eSegmentSelectionTypeStarred = 0,
     eSegmentSelectionTypeSuggested = 1
 } segment_selection_type_e;
 
-typedef enum {
+typedef enum
+{
     eSourceTypeAnt = 0,
     eSourceTypeAntplus = 1,
     eSourceTypeBluetooth = 2,
@@ -1614,7 +1703,8 @@
     eSourceTypeLocal = 5
 } source_type_e;
 
-typedef enum {
+typedef enum
+{
     eDisplayOrientationAuto = 0,
     eDisplayOrientationPortrait = 1,
     eDisplayOrientationLandscape = 2,
@@ -1622,37 +1712,43 @@
     eDisplayOrientationLandscapeFlipped = 4
 } display_orientation_e;
 
-typedef enum {
+typedef enum
+{
     eWatchfaceModeDigital = 0,
     eWatchfaceModeAnalog = 1,
     eWatchfaceModeConnectIq = 2
 } watchface_mode_e;
 
-typedef enum {
+typedef enum
+{
     eDigitalWatchfaceLayoutTraditional = 0,
     eDigitalWatchfaceLayoutModern = 1,
     eDigitalWatchfaceLayoutBold = 2
 } digital_watchface_layout_e;
 
-typedef enum {
+typedef enum
+{
     eAnalogWatchfaceLayoutMinimal = 0,
     eAnalogWatchfaceLayoutTraditional = 1,
     eAnalogWatchfaceLayoutModern = 2
 } analog_watchface_layout_e;
 
-typedef enum {
+typedef enum
+{
     eRiderPositionTypeSeated = 0,
     eRiderPositionTypeStanding = 1
 } rider_position_type_e;
 
-typedef enum {
+typedef enum
+{
     ePowerPhaseTypePowerPhaseStartAngle = 0,
     ePowerPhaseTypePowerPhaseEndAngle = 1,
     ePowerPhaseTypePowerPhaseArcLength = 2,
     ePowerPhaseTypePowerPhaseCenter = 3
 } power_phase_type_e;
 
-typedef enum {
+typedef enum
+{
     eCameraEventTypeVideoStart = 0,
     eCameraEventTypeVideoSplit = 1,
     eCameraEventTypeVideoEnd = 2,
@@ -1668,41 +1764,47 @@
     eCameraEventTypeVideoSecondStreamResume = 14
 } camera_event_type_e;
 
-typedef enum {
+typedef enum
+{
     eSensorTypeAccelerometer = 0,
     eSensorTypeGyroscope = 1,
     eSensorTypeCompass = 2
 } sensor_type_e;
 
-typedef enum {
+typedef enum
+{
     eBikeLightNetworkConfigTypeAuto = 0,
     eBikeLightNetworkConfigTypeIndividual = 4,
     eBikeLightNetworkConfigTypeHighVisibility = 5,
     eBikeLightNetworkConfigTypeTrail = 6
 } bike_light_network_config_type_e;
 
-typedef enum {
+typedef enum
+{
     eCommTimeoutTypeWildcardPairingTimeout = 0,
     eCommTimeoutTypePairingTimeout = 1,
     eCommTimeoutTypeConnectionLost = 2,
     eCommTimeoutTypeConnectionTimeout = 3
 } comm_timeout_type_e;
 
-typedef enum {
+typedef enum
+{
     eCameraOrientationTypeCameraOrientation0 = 0,
     eCameraOrientationTypeCameraOrientation90 = 1,
     eCameraOrientationTypeCameraOrientation180 = 2,
     eCameraOrientationTypeCameraOrientation270 = 3
 } camera_orientation_type_e;
 
-typedef enum {
+typedef enum
+{
     eAttitudeStageFailed = 0,
     eAttitudeStageAligning = 1,
     eAttitudeStageDegraded = 2,
     eAttitudeStageValid = 3
 } attitude_stage_e;
 
-typedef enum {
+typedef enum
+{
     eAttitudeValidityTrackAngleHeadingValid = 0x0001,
     eAttitudeValidityPitchValid = 0x0002,
     eAttitudeValidityRollValid = 0x0004,
@@ -1718,14 +1820,16 @@
     eAttitudeValidityMagneticHeading = 0x1000
 } attitude_validity_e;
 
-typedef enum {
+typedef enum
+{
     eAutoSyncFrequencyNever = 0,
     eAutoSyncFrequencyOccasionally = 1,
     eAutoSyncFrequencyFrequent = 2,
     eAutoSyncFrequencyOnceADay = 3
 } auto_sync_frequency_e;
 
-typedef enum {
+typedef enum
+{
     eExdLayoutFullScreen = 0,
     eExdLayoutHalfVertical = 1,
     eExdLayoutHalfHorizontal = 2,
@@ -1736,7 +1840,8 @@
     eExdLayoutHalfHorizontalTopSplit = 7
 } exd_layout_e;
 
-typedef enum {
+typedef enum
+{
     eExdDisplayTypeNumerical = 0,
     eExdDisplayTypeSimple = 1,
     eExdDisplayTypeGraph = 2,
@@ -1750,7 +1855,8 @@
     eExdDisplayTypeGauge = 10
 } exd_display_type_e;
 
-typedef enum {
+typedef enum
+{
     eExdDataUnitsNoUnits = 0,
     eExdDataUnitsLaps = 1,
     eExdDataUnitsMilesPerHour = 2,
@@ -1803,7 +1909,8 @@
     eExdDataUnitsEightCardinal = 49
 } exd_data_units_e;
 
-typedef enum {
+typedef enum
+{
     eExdQualifiersNoQualifier = 0,
     eExdQualifiersInstantaneous = 1,
     eExdQualifiersAverage = 2,
@@ -1849,7 +1956,8 @@
     eExdQualifiersZone1 = 250
 } exd_qualifiers_e;
 
-typedef enum {
+typedef enum
+{
     eExdDescriptorsBikeLightBatteryStatus = 0,
     eExdDescriptorsBeamAngleStatus = 1,
     eExdDescriptorsBateryLevel = 2,
@@ -1948,7 +2056,8 @@
     eExdDescriptorsPressure = 95
 } exd_descriptors_e;
 
-typedef enum {
+typedef enum
+{
     eAutoActivityDetectNone = 0x00000000,
     eAutoActivityDetectRunning = 0x00000001,
     eAutoActivityDetectCycling = 0x00000002,
@@ -1958,7 +2067,8 @@
     eAutoActivityDetectSedentary = 0x00000400
 } auto_activity_detect_e;
 
-typedef enum {
+typedef enum
+{
     eSupportedExdScreenLayoutsFullScreen = 0x00000001,
     eSupportedExdScreenLayoutsHalfVertical = 0x00000002,
     eSupportedExdScreenLayoutsHalfHorizontal = 0x00000004,
@@ -1969,7 +2079,8 @@
     eSupportedExdScreenLayoutsHalfHorizontalTopSplit = 0x00000080
 } supported_exd_screen_layouts_e;
 
-typedef enum {
+typedef enum
+{
     eFitBaseTypeEnum = 0,
     eFitBaseTypeSint8 = 1,
     eFitBaseTypeUint8 = 2,
@@ -1989,7 +2100,8 @@
     eFitBaseTypeUint64Z = 144
 } fit_base_type_e;
 
-typedef enum {
+typedef enum
+{
     eTurnTypeArrivingIdx = 0,
     eTurnTypeArrivingLeftIdx = 1,
     eTurnTypeArrivingRightIdx = 2,
@@ -2030,12 +2142,14 @@
     eTurnTypeIconIdxCnt = 37
 } turn_type_e;
 
-typedef enum {
+typedef enum
+{
     eBikeLightBeamAngleModeManual = 0,
     eBikeLightBeamAngleModeAuto = 1
 } bike_light_beam_angle_mode_e;
 
-typedef enum {
+typedef enum
+{
     eFitBaseUnitOther = 0,
     eFitBaseUnitKilogram = 1,
     eFitBaseUnitPound = 2
diff -Nru qmapshack-1.8.1/src/gis/fit/defs/fit_fields.h qmapshack-1.9.0/src/gis/fit/defs/fit_fields.h
--- qmapshack-1.8.1/src/gis/fit/defs/fit_fields.h	2017-04-04 17:29:23.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/defs/fit_fields.h	2017-07-04 16:44:15.000000000 +0000
@@ -19,7 +19,8 @@
 #ifndef FIT_FIELDS_H
 #define FIT_FIELDS_H
 // ----------- start generated code -----------
-typedef enum {
+typedef enum
+{
     eFileIdType = 0,
     eFileIdManufacturer = 1,
     eFileIdProduct = 2,
@@ -29,12 +30,14 @@
     eFileIdProductName = 8
 } message_file_id_e;
 
-typedef enum {
+typedef enum
+{
     eFileCreatorSoftwareVersion = 0,
     eFileCreatorHardwareVersion = 1
 } message_file_creator_e;
 
-typedef enum {
+typedef enum
+{
     eTimestampCorrelationTimestamp = 253,
     eTimestampCorrelationFractionalTimestamp = 0,
     eTimestampCorrelationSystemTimestamp = 1,
@@ -44,25 +47,29 @@
     eTimestampCorrelationSystemTimestampMs = 5
 } message_timestamp_correlation_e;
 
-typedef enum {
+typedef enum
+{
     eSoftwareMessageIndex = 254,
     eSoftwareVersion = 3,
     eSoftwarePartNumber = 5
 } message_software_e;
 
-typedef enum {
+typedef enum
+{
     eSlaveDeviceManufacturer = 0,
     eSlaveDeviceProduct = 1
 } message_slave_device_e;
 
-typedef enum {
+typedef enum
+{
     eCapabilitiesLanguages = 0,
     eCapabilitiesSports = 1,
     eCapabilitiesWorkoutsSupported = 21,
     eCapabilitiesConnectivitySupported = 23
 } message_capabilities_e;
 
-typedef enum {
+typedef enum
+{
     eFileCapabilitiesMessageIndex = 254,
     eFileCapabilitiesType = 0,
     eFileCapabilitiesFlags = 1,
@@ -71,7 +78,8 @@
     eFileCapabilitiesMaxSize = 4
 } message_file_capabilities_e;
 
-typedef enum {
+typedef enum
+{
     eMesgCapabilitiesMessageIndex = 254,
     eMesgCapabilitiesFile = 0,
     eMesgCapabilitiesMesgNum = 1,
@@ -79,7 +87,8 @@
     eMesgCapabilitiesCount = 3
 } message_mesg_capabilities_e;
 
-typedef enum {
+typedef enum
+{
     eFieldCapabilitiesMessageIndex = 254,
     eFieldCapabilitiesFile = 0,
     eFieldCapabilitiesMesgNum = 1,
@@ -87,7 +96,8 @@
     eFieldCapabilitiesCount = 3
 } message_field_capabilities_e;
 
-typedef enum {
+typedef enum
+{
     eDeviceSettingsActiveTimeZone = 0,
     eDeviceSettingsUtcOffset = 1,
     eDeviceSettingsTimeOffset = 2,
@@ -112,7 +122,8 @@
     eDeviceSettingsSmartNotificationDisplayOrientation = 95
 } message_device_settings_e;
 
-typedef enum {
+typedef enum
+{
     eUserProfileMessageIndex = 254,
     eUserProfileFriendlyName = 0,
     eUserProfileGender = 1,
@@ -142,7 +153,8 @@
     eUserProfileUserWalkingStepLength = 32
 } message_user_profile_e;
 
-typedef enum {
+typedef enum
+{
     eHrmProfileMessageIndex = 254,
     eHrmProfileEnabled = 0,
     eHrmProfileHrmAntId = 1,
@@ -150,7 +162,8 @@
     eHrmProfileHrmAntIdTransType = 3
 } message_hrm_profile_e;
 
-typedef enum {
+typedef enum
+{
     eSdmProfileMessageIndex = 254,
     eSdmProfileEnabled = 0,
     eSdmProfileSdmAntId = 1,
@@ -161,7 +174,8 @@
     eSdmProfileOdometerRollover = 7
 } message_sdm_profile_e;
 
-typedef enum {
+typedef enum
+{
     eBikeProfileMessageIndex = 254,
     eBikeProfileName = 0,
     eBikeProfileSport = 1,
@@ -196,7 +210,8 @@
     eBikeProfileShimanoDi2Enabled = 44
 } message_bike_profile_e;
 
-typedef enum {
+typedef enum
+{
     eConnectivityBluetoothEnabled = 0,
     eConnectivityBluetoothLeEnabled = 1,
     eConnectivityAntEnabled = 2,
@@ -212,17 +227,20 @@
     eConnectivityGrouptrackEnabled = 12
 } message_connectivity_e;
 
-typedef enum {
+typedef enum
+{
     eWatchfaceSettingsMessageIndex = 254,
     eWatchfaceSettingsMode = 0,
     eWatchfaceSettingsLayout = 1
 } message_watchface_settings_e;
 
-typedef enum {
+typedef enum
+{
     eOhrSettingsEnabled = 0
 } message_ohr_settings_e;
 
-typedef enum {
+typedef enum
+{
     eZonesTargetMaxHeartRate = 1,
     eZonesTargetThresholdHeartRate = 2,
     eZonesTargetFunctionalThresholdPower = 3,
@@ -230,44 +248,51 @@
     eZonesTargetPwrCalcType = 7
 } message_zones_target_e;
 
-typedef enum {
+typedef enum
+{
     eSportSport = 0,
     eSportSubSport = 1,
     eSportName = 3
 } message_sport_e;
 
-typedef enum {
+typedef enum
+{
     eHrZoneMessageIndex = 254,
     eHrZoneHighBpm = 1,
     eHrZoneName = 2
 } message_hr_zone_e;
 
-typedef enum {
+typedef enum
+{
     eSpeedZoneMessageIndex = 254,
     eSpeedZoneHighValue = 0,
     eSpeedZoneName = 1
 } message_speed_zone_e;
 
-typedef enum {
+typedef enum
+{
     eCadenceZoneMessageIndex = 254,
     eCadenceZoneHighValue = 0,
     eCadenceZoneName = 1
 } message_cadence_zone_e;
 
-typedef enum {
+typedef enum
+{
     ePowerZoneMessageIndex = 254,
     ePowerZoneHighValue = 1,
     ePowerZoneName = 2
 } message_power_zone_e;
 
-typedef enum {
+typedef enum
+{
     eMetZoneMessageIndex = 254,
     eMetZoneHighBpm = 1,
     eMetZoneCalories = 2,
     eMetZoneFatCalories = 3
 } message_met_zone_e;
 
-typedef enum {
+typedef enum
+{
     eGoalMessageIndex = 254,
     eGoalSport = 0,
     eGoalSubSport = 1,
@@ -283,7 +308,8 @@
     eGoalSource = 11
 } message_goal_e;
 
-typedef enum {
+typedef enum
+{
     eActivityTimestamp = 253,
     eActivityTotalTimerTime = 0,
     eActivityNumSessions = 1,
@@ -294,7 +320,8 @@
     eActivityEventGroup = 6
 } message_activity_e;
 
-typedef enum {
+typedef enum
+{
     eSessionMessageIndex = 254,
     eSessionTimestamp = 253,
     eSessionEvent = 0,
@@ -416,7 +443,8 @@
     eSessionAvgVam = 139
 } message_session_e;
 
-typedef enum {
+typedef enum
+{
     eLapMessageIndex = 254,
     eLapTimestamp = 253,
     eLapEvent = 0,
@@ -525,7 +553,8 @@
     eLapAvgVam = 121
 } message_lap_e;
 
-typedef enum {
+typedef enum
+{
     eLengthMessageIndex = 254,
     eLengthTimestamp = 253,
     eLengthEvent = 0,
@@ -546,7 +575,8 @@
     eLengthZoneCount = 21
 } message_length_e;
 
-typedef enum {
+typedef enum
+{
     eRecordTimestamp = 253,
     eRecordPositionLat = 0,
     eRecordPositionLong = 1,
@@ -608,7 +638,8 @@
     eRecordStepLength = 85
 } message_record_e;
 
-typedef enum {
+typedef enum
+{
     eEventTimestamp = 253,
     eEventEvent = 0,
     eEventEventType = 1,
@@ -624,7 +655,8 @@
     eEventDeviceIndex = 13
 } message_event_e;
 
-typedef enum {
+typedef enum
+{
     eDeviceInfoTimestamp = 253,
     eDeviceInfoDeviceIndex = 0,
     eDeviceInfoDeviceType = 1,
@@ -645,7 +677,8 @@
     eDeviceInfoProductName = 27
 } message_device_info_e;
 
-typedef enum {
+typedef enum
+{
     eTrainingFileTimestamp = 253,
     eTrainingFileType = 0,
     eTrainingFileManufacturer = 1,
@@ -654,11 +687,13 @@
     eTrainingFileTimeCreated = 4
 } message_training_file_e;
 
-typedef enum {
+typedef enum
+{
     eHrvTime = 0
 } message_hrv_e;
 
-typedef enum {
+typedef enum
+{
     eWeatherConditionsTimestamp = 253,
     eWeatherConditionsWeatherReport = 0,
     eWeatherConditionsTemperature = 1,
@@ -677,7 +712,8 @@
     eWeatherConditionsLowTemperature = 14
 } message_weather_conditions_e;
 
-typedef enum {
+typedef enum
+{
     eWeatherAlertTimestamp = 253,
     eWeatherAlertReportId = 0,
     eWeatherAlertIssueTime = 1,
@@ -686,7 +722,8 @@
     eWeatherAlertType = 4
 } message_weather_alert_e;
 
-typedef enum {
+typedef enum
+{
     eGpsMetadataTimestamp = 253,
     eGpsMetadataTimestampMs = 0,
     eGpsMetadataPositionLat = 1,
@@ -698,7 +735,8 @@
     eGpsMetadataVelocity = 7
 } message_gps_metadata_e;
 
-typedef enum {
+typedef enum
+{
     eCameraEventTimestamp = 253,
     eCameraEventTimestampMs = 0,
     eCameraEventCameraEventType = 1,
@@ -706,7 +744,8 @@
     eCameraEventCameraOrientation = 3
 } message_camera_event_e;
 
-typedef enum {
+typedef enum
+{
     eGyroscopeDataTimestamp = 253,
     eGyroscopeDataTimestampMs = 0,
     eGyroscopeDataSampleTimeOffset = 1,
@@ -718,7 +757,8 @@
     eGyroscopeDataCalibratedGyroZ = 7
 } message_gyroscope_data_e;
 
-typedef enum {
+typedef enum
+{
     eAccelerometerDataTimestamp = 253,
     eAccelerometerDataTimestampMs = 0,
     eAccelerometerDataSampleTimeOffset = 1,
@@ -733,7 +773,8 @@
     eAccelerometerDataCompressedCalibratedAccelZ = 10
 } message_accelerometer_data_e;
 
-typedef enum {
+typedef enum
+{
     eMagnetometerDataTimestamp = 253,
     eMagnetometerDataTimestampMs = 0,
     eMagnetometerDataSampleTimeOffset = 1,
@@ -745,7 +786,8 @@
     eMagnetometerDataCalibratedMagZ = 7
 } message_magnetometer_data_e;
 
-typedef enum {
+typedef enum
+{
     eThreeDSensorCalibrationTimestamp = 253,
     eThreeDSensorCalibrationSensorType = 0,
     eThreeDSensorCalibrationCalibrationFactor = 1,
@@ -755,13 +797,15 @@
     eThreeDSensorCalibrationOrientationMatrix = 5
 } message_three_d_sensor_calibration_e;
 
-typedef enum {
+typedef enum
+{
     eVideoFrameTimestamp = 253,
     eVideoFrameTimestampMs = 0,
     eVideoFrameFrameNumber = 1
 } message_video_frame_e;
 
-typedef enum {
+typedef enum
+{
     eObdiiDataTimestamp = 253,
     eObdiiDataTimestampMs = 0,
     eObdiiDataTimeOffset = 1,
@@ -773,13 +817,15 @@
     eObdiiDataStartTimestampMs = 7
 } message_obdii_data_e;
 
-typedef enum {
+typedef enum
+{
     eNmeaSentenceTimestamp = 253,
     eNmeaSentenceTimestampMs = 0,
     eNmeaSentenceSentence = 1
 } message_nmea_sentence_e;
 
-typedef enum {
+typedef enum
+{
     eAviationAttitudeTimestamp = 253,
     eAviationAttitudeTimestampMs = 0,
     eAviationAttitudeSystemTime = 1,
@@ -794,25 +840,29 @@
     eAviationAttitudeValidity = 10
 } message_aviation_attitude_e;
 
-typedef enum {
+typedef enum
+{
     eVideoUrl = 0,
     eVideoHostingProvider = 1,
     eVideoDuration = 2
 } message_video_e;
 
-typedef enum {
+typedef enum
+{
     eVideoTitleMessageIndex = 254,
     eVideoTitleMessageCount = 0,
     eVideoTitleText = 1
 } message_video_title_e;
 
-typedef enum {
+typedef enum
+{
     eVideoDescriptionMessageIndex = 254,
     eVideoDescriptionMessageCount = 0,
     eVideoDescriptionText = 1
 } message_video_description_e;
 
-typedef enum {
+typedef enum
+{
     eVideoClipClipNumber = 0,
     eVideoClipStartTimestamp = 1,
     eVideoClipStartTimestampMs = 2,
@@ -822,14 +872,16 @@
     eVideoClipClipEnd = 7
 } message_video_clip_e;
 
-typedef enum {
+typedef enum
+{
     eCourseSport = 4,
     eCourseName = 5,
     eCourseCapabilities = 6,
     eCourseSubSport = 7
 } message_course_e;
 
-typedef enum {
+typedef enum
+{
     eCoursePointMessageIndex = 254,
     eCoursePointTimestamp = 1,
     eCoursePointPositionLat = 2,
@@ -840,7 +892,8 @@
     eCoursePointFavorite = 8
 } message_course_point_e;
 
-typedef enum {
+typedef enum
+{
     eSegmentIdName = 0,
     eSegmentIdUuid = 1,
     eSegmentIdSport = 2,
@@ -852,7 +905,8 @@
     eSegmentIdSelectionType = 8
 } message_segment_id_e;
 
-typedef enum {
+typedef enum
+{
     eSegmentLeaderboardEntryMessageIndex = 254,
     eSegmentLeaderboardEntryName = 0,
     eSegmentLeaderboardEntryType = 1,
@@ -862,7 +916,8 @@
     eSegmentLeaderboardEntryActivityIdString = 5
 } message_segment_leaderboard_entry_e;
 
-typedef enum {
+typedef enum
+{
     eSegmentPointMessageIndex = 254,
     eSegmentPointPositionLat = 1,
     eSegmentPointPositionLong = 2,
@@ -871,7 +926,8 @@
     eSegmentPointLeaderTime = 5
 } message_segment_point_e;
 
-typedef enum {
+typedef enum
+{
     eSegmentLapMessageIndex = 254,
     eSegmentLapTimestamp = 253,
     eSegmentLapEvent = 0,
@@ -960,7 +1016,8 @@
     eSegmentLapManufacturer = 83
 } message_segment_lap_e;
 
-typedef enum {
+typedef enum
+{
     eSegmentFileMessageIndex = 254,
     eSegmentFileFileUuid = 1,
     eSegmentFileEnabled = 3,
@@ -972,14 +1029,16 @@
     eSegmentFileDefaultRaceLeader = 11
 } message_segment_file_e;
 
-typedef enum {
+typedef enum
+{
     eWorkoutSport = 4,
     eWorkoutCapabilities = 5,
     eWorkoutNumValidSteps = 6,
     eWorkoutWktName = 8
 } message_workout_e;
 
-typedef enum {
+typedef enum
+{
     eWorkoutStepMessageIndex = 254,
     eWorkoutStepWktStepName = 0,
     eWorkoutStepDurationType = 1,
@@ -992,7 +1051,8 @@
     eWorkoutStepNotes = 8
 } message_workout_step_e;
 
-typedef enum {
+typedef enum
+{
     eScheduleManufacturer = 0,
     eScheduleProduct = 1,
     eScheduleSerialNumber = 2,
@@ -1002,7 +1062,8 @@
     eScheduleScheduledTime = 6
 } message_schedule_e;
 
-typedef enum {
+typedef enum
+{
     eTotalsMessageIndex = 254,
     eTotalsTimestamp = 253,
     eTotalsTimerTime = 0,
@@ -1015,7 +1076,8 @@
     eTotalsSportIndex = 9
 } message_totals_e;
 
-typedef enum {
+typedef enum
+{
     eWeightScaleTimestamp = 253,
     eWeightScaleWeight = 0,
     eWeightScalePercentFat = 1,
@@ -1031,7 +1093,8 @@
     eWeightScaleUserProfileIndex = 12
 } message_weight_scale_e;
 
-typedef enum {
+typedef enum
+{
     eBloodPressureTimestamp = 253,
     eBloodPressureSystolicPressure = 0,
     eBloodPressureDiastolicPressure = 1,
@@ -1045,7 +1108,8 @@
     eBloodPressureUserProfileIndex = 9
 } message_blood_pressure_e;
 
-typedef enum {
+typedef enum
+{
     eMonitoringInfoTimestamp = 253,
     eMonitoringInfoLocalTimestamp = 0,
     eMonitoringInfoActivityType = 1,
@@ -1054,7 +1118,8 @@
     eMonitoringInfoRestingMetabolicRate = 5
 } message_monitoring_info_e;
 
-typedef enum {
+typedef enum
+{
     eMonitoringTimestamp = 253,
     eMonitoringDeviceIndex = 0,
     eMonitoringCalories = 1,
@@ -1086,7 +1151,8 @@
     eMonitoringVigorousActivityMinutes = 34
 } message_monitoring_e;
 
-typedef enum {
+typedef enum
+{
     eHrTimestamp = 253,
     eHrFractionalTimestamp = 0,
     eHrTime256 = 1,
@@ -1095,14 +1161,16 @@
     eHrEventTimestamp12 = 10
 } message_hr_e;
 
-typedef enum {
+typedef enum
+{
     eMemoGlobPartIndex = 250,
     eMemoGlobMemo = 0,
     eMemoGlobMessageNumber = 1,
     eMemoGlobMessageIndex = 2
 } message_memo_glob_e;
 
-typedef enum {
+typedef enum
+{
     eAntChannelIdChannelNumber = 0,
     eAntChannelIdDeviceType = 1,
     eAntChannelIdDeviceNumber = 2,
@@ -1110,7 +1178,8 @@
     eAntChannelIdDeviceIndex = 4
 } message_ant_channel_id_e;
 
-typedef enum {
+typedef enum
+{
     eAntRxTimestamp = 253,
     eAntRxFractionalTimestamp = 0,
     eAntRxMesgId = 1,
@@ -1119,7 +1188,8 @@
     eAntRxData = 4
 } message_ant_rx_e;
 
-typedef enum {
+typedef enum
+{
     eAntTxTimestamp = 253,
     eAntTxFractionalTimestamp = 0,
     eAntTxMesgId = 1,
@@ -1128,14 +1198,16 @@
     eAntTxData = 4
 } message_ant_tx_e;
 
-typedef enum {
+typedef enum
+{
     eExdScreenConfigurationScreenIndex = 0,
     eExdScreenConfigurationFieldCount = 1,
     eExdScreenConfigurationLayout = 2,
     eExdScreenConfigurationScreenEnabled = 3
 } message_exd_screen_configuration_e;
 
-typedef enum {
+typedef enum
+{
     eExdDataFieldConfigurationScreenIndex = 0,
     eExdDataFieldConfigurationConceptField = 1,
     eExdDataFieldConfigurationFieldId = 2,
@@ -1144,7 +1216,8 @@
     eExdDataFieldConfigurationTitle = 5
 } message_exd_data_field_configuration_e;
 
-typedef enum {
+typedef enum
+{
     eExdDataConceptConfigurationScreenIndex = 0,
     eExdDataConceptConfigurationConceptField = 1,
     eExdDataConceptConfigurationFieldId = 2,
@@ -1158,7 +1231,8 @@
     eExdDataConceptConfigurationIsSigned = 11
 } message_exd_data_concept_configuration_e;
 
-typedef enum {
+typedef enum
+{
     eFieldDescriptionDeveloperDataIndex = 0,
     eFieldDescriptionFieldDefinitionNumber = 1,
     eFieldDescriptionFitBaseTypeId = 2,
@@ -1175,7 +1249,8 @@
     eFieldDescriptionNativeFieldNum = 15
 } message_field_description_e;
 
-typedef enum {
+typedef enum
+{
     eDeveloperDataIdDeveloperId = 0,
     eDeveloperDataIdApplicationId = 1,
     eDeveloperDataIdManufacturerId = 2,
diff -Nru qmapshack-1.8.1/src/gis/fit/serialization.cpp qmapshack-1.9.0/src/gis/fit/serialization.cpp
--- qmapshack-1.8.1/src/gis/fit/serialization.cpp	2017-04-06 18:50:16.000000000 +0000
+++ qmapshack-1.9.0/src/gis/fit/serialization.cpp	2017-07-11 19:52:23.000000000 +0000
@@ -45,7 +45,6 @@
 {
     QDateTime dateTime;
     dateTime.setTime_t(sec1970to1990 + timestamp);
-    dateTime.setTimeSpec(Qt::UTC);
     return dateTime;
 }
 
diff -Nru qmapshack-1.8.1/src/gis/gpx/CGpxProject.cpp qmapshack-1.9.0/src/gis/gpx/CGpxProject.cpp
--- qmapshack-1.8.1/src/gis/gpx/CGpxProject.cpp	2017-03-26 10:12:45.000000000 +0000
+++ qmapshack-1.9.0/src/gis/gpx/CGpxProject.cpp	2017-07-10 19:52:50.000000000 +0000
@@ -149,6 +149,10 @@
             {
                 CKnownExtension::initGarminTPXv1(IUnit::self(), ns);
             }
+            else if(att.value() == gpxdata_ns)
+            {
+                CKnownExtension::initClueTrustTPXv1(IUnit::self(), ns);
+            }
         }
     }
 
diff -Nru qmapshack-1.8.1/src/gis/gpx/serialization.cpp qmapshack-1.9.0/src/gis/gpx/serialization.cpp
--- qmapshack-1.8.1/src/gis/gpx/serialization.cpp	2017-03-26 10:12:45.000000000 +0000
+++ qmapshack-1.9.0/src/gis/gpx/serialization.cpp	2017-07-10 19:52:50.000000000 +0000
@@ -38,6 +38,7 @@
 const QString IGisProject::ql_ns     = "http://www.qlandkarte.org/xmlschemas/v1.1";
 const QString IGisProject::gs_ns     = "http://www.groundspeak.com/cache/1/0";
 const QString IGisProject::tp1_ns    = "http://www.garmin.com/xmlschemas/TrackPointExtension/v1";
+const QString IGisProject::gpxdata_ns= "http://www.cluetrust.com/XML/GPXDATA/1/0";
 
 
 static void readXml(const QDomNode& xml, const QString& tag, qint32& value)
@@ -299,7 +300,7 @@
 static void readXml(const QDomNode& node, const QString& parentTags, QHash<QString, QVariant>& extensions)
 {
     QString tag = node.nodeName();
-    if(tag.left(3) == "ql:")
+    if(tag.left(8) == "ql:flags")
     {
         return;
     }
@@ -454,13 +455,17 @@
         gpx.setAttribute("xmlns:rmc",    rmc_ns);
         gpx.setAttribute("xmlns:ql",     ql_ns);
         gpx.setAttribute("xmlns:tp1",    tp1_ns);
+        gpx.setAttribute("xmlns:gpxdata",gpxdata_ns);
+
+
 
         schemaLocation = QString()
                          + gpx_ns    + " http://www.topografix.com/GPX/1/1/gpx.xsd "
                          + gpxx_ns   + " http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd "
                          + gpxtpx_ns + " http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd "
                          + wptx1_ns  + " http://www.garmin.com/xmlschemas/WaypointExtensionv1.xsd "
-                         + ql_ns     + " http://www.qlandkarte.org/xmlschemas/v1.1/ql-extensions.xsd ";
+                         + ql_ns     + " http://www.qlandkarte.org/xmlschemas/v1.1/ql-extensions.xsd "
+                         + gpxdata_ns+ " http://www.cluetrust.com/Schemas/gpxdata10.xsd";
     }
     else
     {
diff -Nru qmapshack-1.8.1/src/gis/IGisItem.h qmapshack-1.9.0/src/gis/IGisItem.h
--- qmapshack-1.8.1/src/gis/IGisItem.h	2017-04-15 15:35:44.000000000 +0000
+++ qmapshack-1.9.0/src/gis/IGisItem.h	2017-07-04 16:44:15.000000000 +0000
@@ -440,7 +440,7 @@
 
     /**
        @brief Remove all history entries older than the current selected one.
-    */
+     */
     void cutHistoryBefore();
 
     /**
diff -Nru qmapshack-1.8.1/src/gis/IGisWidget.ui qmapshack-1.9.0/src/gis/IGisWidget.ui
--- qmapshack-1.8.1/src/gis/IGisWidget.ui	2017-01-14 08:29:06.000000000 +0000
+++ qmapshack-1.9.0/src/gis/IGisWidget.ui	2017-07-23 13:41:03.000000000 +0000
@@ -30,27 +30,21 @@
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_5">
-     <property name="leftMargin">
+    <layout class="QFormLayout" name="formLayout">
+     <property name="horizontalSpacing">
       <number>3</number>
      </property>
-     <property name="topMargin">
+     <property name="verticalSpacing">
       <number>3</number>
      </property>
-     <property name="rightMargin">
-      <number>3</number>
-     </property>
-     <property name="bottomMargin">
-      <number>3</number>
-     </property>
-     <item>
+     <item row="0" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Opacity</string>
        </property>
       </widget>
      </item>
-     <item>
+     <item row="0" column="1">
       <widget class="QSlider" name="sliderOpacity">
        <property name="toolTip">
         <string>Change the opacity of all GIS Items on the map.</string>
@@ -66,6 +60,20 @@
        </property>
       </widget>
      </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Filter</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="lineFilter">
+       <property name="clearButtonEnabled">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -188,6 +196,24 @@
     </widget>
    </item>
   </layout>
+  <action name="actionClearFilter">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/icons/32x32/Cancel.png</normaloff>:/icons/32x32/Cancel.png</iconset>
+   </property>
+   <property name="text">
+    <string>Clear Filter</string>
+   </property>
+  </action>
+  <action name="actionSetupFilter">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/icons/32x32/Apply.png</normaloff>:/icons/32x32/Apply.png</iconset>
+   </property>
+   <property name="text">
+    <string>Setup Filter</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
@@ -204,5 +230,22 @@
  <resources>
   <include location="../resources.qrc"/>
  </resources>
- <connections/>
+ <connections>
+  <connection>
+   <sender>actionClearFilter</sender>
+   <signal>triggered()</signal>
+   <receiver>lineFilter</receiver>
+   <slot>clear()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>228</x>
+     <y>34</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff -Nru qmapshack-1.8.1/src/gis/ISetupFilter.ui qmapshack-1.9.0/src/gis/ISetupFilter.ui
--- qmapshack-1.8.1/src/gis/ISetupFilter.ui	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/gis/ISetupFilter.ui	2017-07-23 13:41:03.000000000 +0000
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ISetupFilter</class>
+ <widget class="QWidget" name="ISetupFilter">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>123</width>
+    <height>78</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <property name="autoFillBackground">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>3</number>
+   </property>
+   <property name="leftMargin">
+    <number>3</number>
+   </property>
+   <property name="topMargin">
+    <number>3</number>
+   </property>
+   <property name="rightMargin">
+    <number>3</number>
+   </property>
+   <property name="bottomMargin">
+    <number>3</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Apply filter to</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="radioName">
+     <property name="text">
+      <string>name only</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="radioText">
+     <property name="text">
+      <string>complete text</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff -Nru qmapshack-1.8.1/src/gis/Poi.h qmapshack-1.9.0/src/gis/Poi.h
--- qmapshack-1.8.1/src/gis/Poi.h	2017-03-26 10:12:51.000000000 +0000
+++ qmapshack-1.9.0/src/gis/Poi.h	2017-07-04 16:44:15.000000000 +0000
@@ -27,6 +27,7 @@
     QString name;
     QString desc;
     QPointF pos;
+    QSize symbolSize;
 };
 
 #endif //POI_H
diff -Nru qmapshack-1.8.1/src/gis/prj/IGisProject.cpp qmapshack-1.9.0/src/gis/prj/IGisProject.cpp
--- qmapshack-1.8.1/src/gis/prj/IGisProject.cpp	2017-03-26 10:12:45.000000000 +0000
+++ qmapshack-1.9.0/src/gis/prj/IGisProject.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -49,7 +49,7 @@
 const QString IGisProject::filedialogSaveFilters = filedialogFilterGPX + ";; " + filedialogFilterQMS + ";; " + filedialogFilterTCX;
 const QString IGisProject::filedialogLoadFilters = filedialogAllSupported + ";; " + filedialogFilterGPX + ";; " + filedialogFilterTCX + ";; " + filedialogFilterQMS + ";; " + filedialogFilterSLF + ";;" + filedialogFilterFIT;
 
-
+IGisProject::filter_mode_e IGisProject::filterMode = IGisProject::eFilterModeName;
 
 IGisProject::IGisProject(type_e type, const QString &filename, CGisListWks *parent)
     : QTreeWidgetItem(parent)
@@ -593,7 +593,7 @@
     for(int i = 0; i < childCount(); i++)
     {
         IGisItem * item = dynamic_cast<IGisItem*>(child(i));
-        if(nullptr == item)
+        if(nullptr == item || item->isHidden())
         {
             continue;
         }
@@ -615,7 +615,7 @@
     for(int i = 0; i < childCount(); i++)
     {
         IGisItem * item = dynamic_cast<IGisItem*>(child(i));
-        if(nullptr == item)
+        if(nullptr == item || item->isHidden())
         {
             continue;
         }
@@ -637,7 +637,7 @@
     for(int i = 0; i < childCount(); i++)
     {
         IGisItem * item = dynamic_cast<IGisItem*>(child(i));
-        if(nullptr == item)
+        if(nullptr == item || item->isHidden())
         {
             continue;
         }
@@ -652,7 +652,7 @@
     for(int i = childCount(); i > 0; i--)
     {
         IGisItem * item = dynamic_cast<IGisItem*>(child(i-1));
-        if(nullptr == item)
+        if(nullptr == item )
         {
             continue;
         }
@@ -818,7 +818,7 @@
         }
 
         IGisItem * item = dynamic_cast<IGisItem*>(child(i));
-        if(nullptr == item)
+        if(nullptr == item || item->isHidden())
         {
             continue;
         }
@@ -837,7 +837,7 @@
     for(int i = 0; i < childCount(); i++)
     {
         IGisItem * item = dynamic_cast<IGisItem*>(child(i));
-        if(nullptr == item)
+        if(nullptr == item || item->isHidden())
         {
             continue;
         }
@@ -862,7 +862,7 @@
         }
 
         IGisItem * item = dynamic_cast<IGisItem*>(child(i));
-        if(nullptr == item)
+        if(nullptr == item || item->isHidden())
         {
             continue;
         }
@@ -1098,3 +1098,37 @@
         break;
     }
 }
+
+void IGisProject::filter(const QString& str)
+{
+    const int N = childCount();
+
+    if(str.isEmpty())
+    {
+        for(int n = 0; n < N; n++)
+        {
+            child(n)->setHidden(false);
+        }
+        return;
+    }
+
+    for(int n = 0; n < N; n++)
+    {
+        IGisItem * item = dynamic_cast<IGisItem*>(child(n));
+        if(item == nullptr)
+        {
+            continue;
+        }
+
+        switch(filterMode)
+        {
+        case eFilterModeName:
+            item->setHidden(!item->getName().toUpper().contains(str));
+            break;
+
+        case eFilterModeText:
+            item->setHidden(!item->getInfo(true, true).toUpper().contains(str));
+            break;
+        }
+    }
+}
diff -Nru qmapshack-1.8.1/src/gis/prj/IGisProject.h qmapshack-1.9.0/src/gis/prj/IGisProject.h
--- qmapshack-1.8.1/src/gis/prj/IGisProject.h	2017-03-26 10:12:51.000000000 +0000
+++ qmapshack-1.9.0/src/gis/prj/IGisProject.h	2017-07-23 13:41:03.000000000 +0000
@@ -62,6 +62,12 @@
         ,eSortFolderSymbol
     };
 
+    enum filter_mode_e
+    {
+        eFilterModeName
+        ,eFilterModeText
+    };
+
     struct person_t
     {
         QString name;
@@ -103,6 +109,8 @@
     static const QString filedialogSaveFilters;
     static const QString filedialogLoadFilters;
 
+    static filter_mode_e filterMode;
+
     IGisProject(type_e type, const QString &filename, CGisListWks *parent);
     IGisProject(type_e type, const QString &filename, IDevice     *parent);
     virtual ~IGisProject();
@@ -478,6 +486,8 @@
         return noUpdate;
     }
 
+    void filter(const QString& str);
+
 protected:
     void genKey() const;
     virtual void setupName(const QString& defaultName);
@@ -510,6 +520,7 @@
     // Those are standard GPX/XML namespaces
     static const QString gpx_ns;
     static const QString xsi_ns;
+    static const QString gpxdata_ns;
 
     QPointer<CDetailsPrj> dlgDetails;
 
diff -Nru qmapshack-1.8.1/src/gis/rte/CGisItemRte.cpp qmapshack-1.9.0/src/gis/rte/CGisItemRte.cpp
--- qmapshack-1.8.1/src/gis/rte/CGisItemRte.cpp	2017-03-26 10:12:44.000000000 +0000
+++ qmapshack-1.9.0/src/gis/rte/CGisItemRte.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -860,6 +860,9 @@
 
             rtept->fakeSubpt.type      = subpt_t::eTypeWpt;
             rtept->fakeSubpt.instruction = QString(next->desc1) + ".\n" + QString(next->desc2) + ".";
+
+            rte.totalDistance = rtept->fakeSubpt.distance;
+            rte.totalTime     = rtept->fakeSubpt.time.toTime_t() - time.toTime_t();
         }
         else if(rtept != nullptr)
         {
diff -Nru qmapshack-1.8.1/src/gis/rte/router/CRouterRoutino.cpp qmapshack-1.9.0/src/gis/rte/router/CRouterRoutino.cpp
--- qmapshack-1.8.1/src/gis/rte/router/CRouterRoutino.cpp	2017-03-26 10:12:44.000000000 +0000
+++ qmapshack-1.9.0/src/gis/rte/router/CRouterRoutino.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -358,11 +358,7 @@
 
     mutex.unlock();
 
-    CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
-    if(canvas)
-    {
-        canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
-    }
+    CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
 
diff -Nru qmapshack-1.8.1/src/gis/search/CSearchGoogle.cpp qmapshack-1.9.0/src/gis/search/CSearchGoogle.cpp
--- qmapshack-1.8.1/src/gis/search/CSearchGoogle.cpp	2017-03-26 10:12:45.000000000 +0000
+++ qmapshack-1.9.0/src/gis/search/CSearchGoogle.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -160,9 +160,6 @@
     }
 
     setExpanded(true);
-    CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
-    if(canvas)
-    {
-        canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
-    }
+
+    CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
 }
diff -Nru qmapshack-1.8.1/src/gis/trk/CDetailsTrk.cpp qmapshack-1.9.0/src/gis/trk/CDetailsTrk.cpp
--- qmapshack-1.8.1/src/gis/trk/CDetailsTrk.cpp	2017-03-26 10:12:45.000000000 +0000
+++ qmapshack-1.9.0/src/gis/trk/CDetailsTrk.cpp	2017-06-30 14:25:55.000000000 +0000
@@ -33,6 +33,7 @@
 #include "gis/trk/filter/CFilterSpeed.h"
 #include "gis/trk/filter/CFilterSplitSegment.h"
 #include "gis/trk/filter/CFilterSubPt2Pt.h"
+#include "gis/trk/filter/CFilterTerrainSlope.h"
 #include "helpers/CLinksDialog.h"
 #include "helpers/CSettings.h"
 #include "helpers/Signals.h"
@@ -173,7 +174,7 @@
     addFilterGroup<CFilterNewDate, CFilterObscureDate, CFilterSpeed>
         (treeFilter, trk, tr("Change timestamp of track points"), "://icons/48x48/Time.png");
 
-    addFilterGroup<CFilterDeleteExtension, CFilterSplitSegment, CFilterSubPt2Pt>
+    addFilterGroup<CFilterDeleteExtension, CFilterSplitSegment, CFilterSubPt2Pt, CFilterTerrainSlope>
         (treeFilter, trk, tr("Miscellaneous"), "://icons/48x48/CSrcUnknown.png");
 
 
@@ -449,13 +450,12 @@
     widgetColorActivity->setVisible(enabledActivity);
     widgetColorActivity->setEnabled(enabledActivity);
 
+    X_____________UnBlockAllSignals_____________X(this);
 
     // refill comboboxes to select track property to be displayed by graphs
     loadGraphSource(comboGraph2, 2, CKnownExtension::internalSpeed);
     loadGraphSource(comboGraph3, 3, CKnownExtension::internalProgress);
 
-    X_____________UnBlockAllSignals_____________X(this);
-
     CFilterDeleteExtension *filter = treeFilter->findChild<CFilterDeleteExtension*>();
     if(nullptr != filter)
     {
diff -Nru qmapshack-1.8.1/src/gis/trk/CGisItemTrk.cpp qmapshack-1.9.0/src/gis/trk/CGisItemTrk.cpp
--- qmapshack-1.8.1/src/gis/trk/CGisItemTrk.cpp	2017-03-26 10:12:45.000000000 +0000
+++ qmapshack-1.9.0/src/gis/trk/CGisItemTrk.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -1977,13 +1977,7 @@
     resetMouseRange();
     mouseFocusOwner = (mode == eModeRange) ? owner : "";
 
-
-    CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
-    if(nullptr != canvas)
-    {
-        canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
-    }
-
+    CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
     return true;
 }
 
diff -Nru qmapshack-1.8.1/src/gis/trk/CGisItemTrk.h qmapshack-1.9.0/src/gis/trk/CGisItemTrk.h
--- qmapshack-1.8.1/src/gis/trk/CGisItemTrk.h	2017-03-26 10:12:51.000000000 +0000
+++ qmapshack-1.9.0/src/gis/trk/CGisItemTrk.h	2017-06-30 14:25:55.000000000 +0000
@@ -524,6 +524,7 @@
     /** @param speed speed in meter per seconds */
     void filterSpeed(qreal speed);
 
+    void filterTerrainSlope();
     void filterReplaceElevation();
     void filterInterpolateElevation();
     void filterReset();
diff -Nru qmapshack-1.8.1/src/gis/trk/CKnownExtension.cpp qmapshack-1.9.0/src/gis/trk/CKnownExtension.cpp
--- qmapshack-1.8.1/src/gis/trk/CKnownExtension.cpp	2017-03-26 10:12:45.000000000 +0000
+++ qmapshack-1.9.0/src/gis/trk/CKnownExtension.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -24,10 +24,13 @@
 const QString CKnownExtension::internalSpeed    = "::ql:speed";
 const QString CKnownExtension::internalEle      = "::ql:ele";
 const QString CKnownExtension::internalProgress = "::ql:progress";
+const QString CKnownExtension::internalTerrainSlope = "::ql:terrainslope";
 
 QHash<QString, CKnownExtension> CKnownExtension::knownExtensions;
 QSet<QString> CKnownExtension::registeredNS;
 
+static const int NOORDER = std::numeric_limits<int>::max();
+
 static fTrkPtGetVal getExtensionValueFunc(const QString ext)
 {
     return [ext](const CTrackData::trkpt_t &p)
@@ -83,26 +86,57 @@
 {
     // support for extensions used by MIO Cyclo ver. 4.2 (who needs xml namespaces?!)
     knownExtensions.insert("heartrate",
-                           { tr("Heart Rate"), std::numeric_limits<int>::max(), 0., 300., 1., "bpm", "://icons/32x32/CSrcHR.png", true, false,
+                           { tr("Heart Rate"), NOORDER, 0., 300., 1., "bpm", "://icons/32x32/CSrcHR.png", true, false,
                              getExtensionValueFunc("heartrate")});
 
     knownExtensions.insert("cadence",
-                           { tr("Cadence"), std::numeric_limits<int>::max(), 0., 500., 1., "rpm", "://icons/32x32/CSrcCAD.png", true, false,
+                           { tr("Cadence"), NOORDER, 0., 500., 1., "rpm", "://icons/32x32/CSrcCAD.png", true, false,
                              getExtensionValueFunc("cadence")});
 
     knownExtensions.insert("speed",
-                           { tr("Speed"), std::numeric_limits<int>::max(), 0., 600., units.speedfactor, units.speedunit, "://icons/32x32/CSrcSpeed.png", true, false,
+                           { tr("Speed"), NOORDER, 0., 600., units.speedfactor, units.speedunit, "://icons/32x32/CSrcSpeed.png", true, false,
                              getExtensionValueFunc("speed")});
 
     knownExtensions.insert("acceleration",
-                           { tr("Acceleration"), std::numeric_limits<int>::max(), std::numeric_limits<qreal>::lowest(), std::numeric_limits<qreal>::max(), units.basefactor, units.baseunit + "/s²", "://icons/32x32/CSrcAccel.png", true, false,
+                           { tr("Acceleration"), 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"), std::numeric_limits<int>::max(), -3.2, 3.2, 1., "rad", "://icons/32x32/CSrcCourse.png", true, false,
+                           { tr("Course"), 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,
+                             getExtensionValueFunc(ns % ":cadence")});
+
+    knownExtensions.insert(ns % ":temp",
+                           { tr("Temperature"), 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,
+                             getExtensionValueFunc(ns % ":distance") });
+
+    knownExtensions.insert(ns % ":altitude",
+                           { tr("Elevation"), 3, -1000., +10000., units.basefactor, units.baseunit, "://icons/32x32/CSrcElevation.png", true, false,
+                             getExtensionValueFunc(ns % ":altitude") });
+
+    knownExtensions.insert(ns % ":seaLevelPressure",
+                           { tr("Sea Level Pressure"), 4, 0., 1500., 1., "hPa", "://icons/32x32/CSrcSeaLevelPressure.png", true, false,
+                             getExtensionValueFunc(ns % ":seaLevelPressure") });
+
+    knownExtensions.insert(ns % ":speed",
+                           { tr("Speed"), 5, 0., 600., units.speedfactor, units.speedunit, "://icons/32x32/CSrcSpeed.png", true, false,
+                             getExtensionValueFunc(ns % ":speed")});
+
+    knownExtensions.insert(ns % ":verticalSpeed",
+                           { tr("Speed (vertical)"), 6, 0., 50., units.speedfactor, units.speedunit, "://icons/32x32/CSrcVertSpeed.png", true, false,
+                             getExtensionValueFunc(ns % ":verticalSpeed")});
+}
+
 void CKnownExtension::init(const IUnit &units)
 {
     knownExtensions =
@@ -125,6 +159,11 @@
         {internalProgress,
          { tr("Progress"), -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,
+           getExtensionValueFunc(internalTerrainSlope)}
         }
     };
 
@@ -132,11 +171,12 @@
     initGarminTPXv1(units, "tp1");
 
     initMioTPX(units);
+    initClueTrustTPXv1(units, "gpxdata");
 }
 
 const CKnownExtension CKnownExtension::get(const QString &name)
 {
-    CKnownExtension def("", std::numeric_limits<int>::max(), -100000., 100000., 1., "", "://icons/32x32/CSrcUnknown.png", false, true,
+    CKnownExtension def("", NOORDER, -100000., 100000., 1., "", "://icons/32x32/CSrcUnknown.png", false, true,
                         getExtensionValueFunc(name)
                         );
     return knownExtensions.value(name, def);
diff -Nru qmapshack-1.8.1/src/gis/trk/CKnownExtension.h qmapshack-1.9.0/src/gis/trk/CKnownExtension.h
--- qmapshack-1.8.1/src/gis/trk/CKnownExtension.h	2017-03-26 10:12:51.000000000 +0000
+++ qmapshack-1.9.0/src/gis/trk/CKnownExtension.h	2017-07-23 13:41:03.000000000 +0000
@@ -40,10 +40,13 @@
      */
     static void initGarminTPXv1(const IUnit &units, const QString &ns);
 
+    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 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
 
     /**
        @brief Get extension descriptor for name
diff -Nru qmapshack-1.8.1/src/gis/trk/filter/CFilterTerrainSlope.cpp qmapshack-1.9.0/src/gis/trk/filter/CFilterTerrainSlope.cpp
--- qmapshack-1.8.1/src/gis/trk/filter/CFilterTerrainSlope.cpp	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/gis/trk/filter/CFilterTerrainSlope.cpp	2017-06-30 14:25:55.000000000 +0000
@@ -0,0 +1,37 @@
+/**********************************************************************************************
+    Copyright (C) 2014 Oliver Eichler oliver.eichler@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 "canvas/CCanvas.h"
+#include "gis/trk/CGisItemTrk.h"
+#include "gis/trk/filter/CFilterTerrainSlope.h"
+
+CFilterTerrainSlope::CFilterTerrainSlope(CGisItemTrk &trk, QWidget *parent)
+    : QWidget(parent)
+    , trk(trk)
+{
+    setupUi(this);
+
+    connect(toolApply, &QToolButton::clicked, this, &CFilterTerrainSlope::slotApply);
+}
+
+void CFilterTerrainSlope::slotApply()
+{
+    CCanvas::setOverrideCursor(Qt::WaitCursor,"CFilterTerrainSlope");
+    trk.filterTerrainSlope();
+    CCanvas::restoreOverrideCursor("CFilterTerrainSlope");
+}
diff -Nru qmapshack-1.8.1/src/gis/trk/filter/CFilterTerrainSlope.h qmapshack-1.9.0/src/gis/trk/filter/CFilterTerrainSlope.h
--- qmapshack-1.8.1/src/gis/trk/filter/CFilterTerrainSlope.h	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/gis/trk/filter/CFilterTerrainSlope.h	2017-06-30 14:25:55.000000000 +0000
@@ -0,0 +1,42 @@
+/**********************************************************************************************
+    Copyright (C) 2014 Oliver Eichler oliver.eichler@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/>.
+
+**********************************************************************************************/
+
+#ifndef CFILTERTERRAINSLOPE_H
+#define CFILTERTERRAINSLOPE_H
+
+#include "ui_IFilterTerrainSlope.h"
+#include <QWidget>
+
+class CGisItemTrk;
+
+class CFilterTerrainSlope : public QWidget, private Ui::IFilterTerrainSlope
+{
+    Q_OBJECT
+public:
+    CFilterTerrainSlope(CGisItemTrk& trk, QWidget * parent);
+    virtual ~CFilterTerrainSlope() = default;
+
+private slots:
+    void slotApply();
+
+private:
+    CGisItemTrk& trk;
+};
+
+#endif //CFILTERTERRAINSLOPE_H
+
diff -Nru qmapshack-1.8.1/src/gis/trk/filter/filter.cpp qmapshack-1.9.0/src/gis/trk/filter/filter.cpp
--- qmapshack-1.8.1/src/gis/trk/filter/filter.cpp	2017-03-26 10:12:45.000000000 +0000
+++ qmapshack-1.9.0/src/gis/trk/filter/filter.cpp	2017-06-30 14:25:55.000000000 +0000
@@ -199,6 +199,28 @@
     changed(tr("Smoothed profile with a Median filter of size %1").arg(points), "://icons/48x48/SetEle.png");
 }
 
+void CGisItemTrk::filterTerrainSlope()
+{
+    QPolygonF line;
+    for(const CTrackData::trkpt_t &pt : trk)
+    {
+        line << pt.radPoint();
+    }
+
+    QPolygonF slope(line.size());
+    CMainWindow::self().getSlopeAt(line, slope);
+
+    int cnt = 0;
+    for(CTrackData::trkpt_t& pt : trk)
+    {
+        pt.extensions[CKnownExtension::internalTerrainSlope] = slope[cnt].ry();
+        ++cnt;
+    }
+
+    deriveSecondaryData();
+    changed(tr("Added terrain slope from DEM file."), "://icons/48x48/CSrcSlope.png");
+}
+
 void CGisItemTrk::filterReplaceElevation()
 {
     QPolygonF line;
diff -Nru qmapshack-1.8.1/src/gis/trk/filter/IFilterTerrainSlope.ui qmapshack-1.9.0/src/gis/trk/filter/IFilterTerrainSlope.ui
--- qmapshack-1.8.1/src/gis/trk/filter/IFilterTerrainSlope.ui	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/gis/trk/filter/IFilterTerrainSlope.ui	2017-06-30 14:26:24.000000000 +0000
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>IFilterTerrainSlope</class>
+ <widget class="QWidget" name="IFilterTerrainSlope">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>996</width>
+    <height>69</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>3</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>3</number>
+   </property>
+   <item row="0" column="0" rowspan="2">
+    <widget class="QLabel" name="label_3">
+     <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/CSrcSlope.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>&lt;b&gt;Calculate Terrain Slope&lt;/b&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>3</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Calculate slope of the terrain based on loaded DEM files.</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="toolApply">
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../resources.qrc">
+         <normaloff>:/icons/32x32/Apply.png</normaloff>:/icons/32x32/Apply.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../../resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff -Nru qmapshack-1.8.1/src/gis/wpt/CDetailsGeoCache.cpp qmapshack-1.9.0/src/gis/wpt/CDetailsGeoCache.cpp
--- qmapshack-1.8.1/src/gis/wpt/CDetailsGeoCache.cpp	2017-03-26 10:12:44.000000000 +0000
+++ qmapshack-1.9.0/src/gis/wpt/CDetailsGeoCache.cpp	2017-07-10 19:52:50.000000000 +0000
@@ -221,7 +221,7 @@
     }
 
     QRegExp re1(".*CachePageImages.*");
-    QRegExp re2("(http://.*\\.jpg).*>(.*)</a>");
+    QRegExp re2("(https://.*\\.jpg).*>(.*)</a>");
     re2.setMinimal(true);
 
     bool watchOut       = false;
diff -Nru qmapshack-1.8.1/src/helpers/CProgressDialog.cpp qmapshack-1.9.0/src/helpers/CProgressDialog.cpp
--- qmapshack-1.8.1/src/helpers/CProgressDialog.cpp	2017-03-26 10:14:54.000000000 +0000
+++ qmapshack-1.9.0/src/helpers/CProgressDialog.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -45,7 +45,8 @@
         // add a timer to update the elapsed time
         QTimer * timer = new QTimer(this);
         timer->start(1000);
-        connect(timer, &QTimer::timeout, this, [this]{setValue(0);});
+        connect(timer, &QTimer::timeout, this, [this] {setValue(0);
+                });
     }
     hide();
     QTimer::singleShot(1000, this, SLOT(show()));
diff -Nru qmapshack-1.8.1/src/helpers/CToolBarConfig.cpp qmapshack-1.9.0/src/helpers/CToolBarConfig.cpp
--- qmapshack-1.8.1/src/helpers/CToolBarConfig.cpp	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/helpers/CToolBarConfig.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -0,0 +1,110 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess@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 2 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, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+**********************************************************************************************/
+
+#include "CSettings.h"
+#include "helpers/CToolBarConfig.h"
+#include <QAction>
+#include <QToolBar>
+
+CToolBarConfig::CToolBarConfig(QObject * const & parent, QToolBar * const & toolBar, const QList<QAction *> & availableActions, const QList<QAction *> & defaultActions)
+    : QObject(parent),
+    toolBar(toolBar),
+    available(availableActions),
+    defaultActions(defaultActions)
+{
+}
+
+CToolBarConfig::~CToolBarConfig()
+{
+}
+
+void CToolBarConfig::loadSettings()
+{
+    SETTINGS;
+    QStringList actions = cfg.value(QStringLiteral("ToolBar/actions")).toStringList();
+    if (actions.isEmpty())
+    {
+        setDefaultConfiguredActions();
+    }
+    else
+    {
+        setConfiguredActionsByName(actions);
+    }
+}
+
+void CToolBarConfig::saveSettings() const
+{
+    SETTINGS;
+    QStringList configuredNames;
+    for (QAction * const & action : configuredActions())
+    {
+        configuredNames << action->objectName();
+    }
+    cfg.setValue(QStringLiteral("ToolBar/actions"),configuredNames);
+}
+
+const QList<QAction *> & CToolBarConfig::availableActions() const
+{
+    return available;
+}
+
+const QList<QAction *> & CToolBarConfig::configuredActions() const
+{
+    return configured;
+}
+
+void CToolBarConfig::setConfiguredActionsByName(const QStringList & names)
+{
+    QList<QAction *> actions;
+    for (const QString & name : names)
+    {
+        for (QAction * const & action : available)
+        {
+            if (action->objectName() == name)
+            {
+                if (action->isSeparator())
+                {
+                    QAction * separator = new QAction(this);
+                    separator->setObjectName(QStringLiteral("separator"));
+                    separator->setSeparator(true);
+                    actions << separator;
+                }
+                else
+                {
+                    actions << action;
+                }
+                break;
+            }
+        }
+    }
+    setConfiguredActions(actions);
+}
+
+void CToolBarConfig::setDefaultConfiguredActions()
+{
+    setConfiguredActions(defaultActions);
+}
+
+void CToolBarConfig::setConfiguredActions(const QList<QAction *> & actions)
+{
+    configured.clear();
+    configured << actions;
+    toolBar->clear();
+    toolBar->addActions(actions);
+}
diff -Nru qmapshack-1.8.1/src/helpers/CToolBarConfig.h qmapshack-1.9.0/src/helpers/CToolBarConfig.h
--- qmapshack-1.8.1/src/helpers/CToolBarConfig.h	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/helpers/CToolBarConfig.h	2017-07-04 16:44:15.000000000 +0000
@@ -0,0 +1,51 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess@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 2 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, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+**********************************************************************************************/
+
+#ifndef CTOOLBARCONFIG_H
+#define CTOOLBARCONFIG_H
+
+#include <QObject>
+class T;
+template <>
+class QList<T>;
+class QAction;
+class QToolBar;
+
+class CToolBarConfig : public QObject
+{
+    Q_OBJECT
+public:
+    CToolBarConfig(QObject * const & parent, QToolBar * const & toolBar, const QList<QAction *> & availableActions, const QList<QAction *> & defaultActions);
+    virtual ~CToolBarConfig();
+
+    void loadSettings();
+    void saveSettings() const;
+    const QList<QAction *> & availableActions() const;
+    const QList<QAction *> & configuredActions() const;
+    void setConfiguredActionsByName(const QStringList & actions);
+    void setConfiguredActions(const QList<QAction *> & actions);
+    void setDefaultConfiguredActions();
+
+private:
+    QToolBar * const toolBar;
+    const QList<QAction *> available;
+    const QList<QAction *> defaultActions;
+    QList<QAction *> configured;
+};
+#endif //CTOOLBARCONFIG_H
diff -Nru qmapshack-1.8.1/src/helpers/CToolBarSetupDialog.cpp qmapshack-1.9.0/src/helpers/CToolBarSetupDialog.cpp
--- qmapshack-1.8.1/src/helpers/CToolBarSetupDialog.cpp	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/helpers/CToolBarSetupDialog.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -0,0 +1,107 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess@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 2 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, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+**********************************************************************************************/
+
+#include "helpers/CToolBarConfig.h"
+#include "helpers/CToolBarSetupDialog.h"
+
+bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item)
+{
+    CDialogItem * dialogItem = dynamic_cast<CDialogItem *>(item);
+    if (dialogItem != nullptr)
+    {
+        return dialogItem->actionName != QStringLiteral("separator");
+    }
+    return true;
+}
+
+CToolBarSetupDialog::CToolBarSetupDialog(QWidget * const & parent, CToolBarConfig * const & config) : QDialog(parent), config(config)
+{
+    setupUi(this);
+
+    selectActionsWidget->setFilter(new CItemFilter(this));
+
+    connect(buttonBox, &QDialogButtonBox::clicked, this, &CToolBarSetupDialog::slotButtonClicked);
+
+    configure();
+
+    selectActionsWidget->setLabelAvailable(tr("Available Actions"));
+    selectActionsWidget->setLabelSelected(tr("Selected Actions"));
+}
+
+CToolBarSetupDialog::~CToolBarSetupDialog()
+{
+    selectActionsWidget->clear();
+}
+
+void CToolBarSetupDialog::accept()
+{
+    QStringList actionNames;
+    for (const QListWidgetItem * const selectedItem : selectActionsWidget->selected())
+    {
+        const CDialogItem * const setupDialogItem = dynamic_cast<const CDialogItem * const>(selectedItem);
+        if (setupDialogItem != nullptr)
+        {
+            actionNames << setupDialogItem->actionName;
+        }
+    }
+    config->setConfiguredActionsByName(actionNames);
+    QDialog::accept();
+}
+
+void CToolBarSetupDialog::slotButtonClicked(QAbstractButton *button) const
+{
+    if(buttonBox->buttonRole(button) == QDialogButtonBox::ResetRole)
+    {
+        config->setDefaultConfiguredActions();
+        configure();
+    }
+}
+
+void CToolBarSetupDialog::configure() const
+{
+    QList<QListWidgetItem *> availableItems;
+    QList<QListWidgetItem *> selectedItems;
+
+    for(QAction * const & action : config->availableActions())
+    {
+        availableItems << new CDialogItem(action->icon(),action->iconText(),action->objectName());
+    }
+    for(QAction * const & action : config->configuredActions())
+    {
+        if (action->isSeparator())
+        {
+            selectedItems << new CDialogItem(action->icon(),QStringLiteral("---------------"),action->objectName());
+        }
+        else
+        {
+            QString configuredName = action->objectName();
+            for(QListWidgetItem * const & item : availableItems)
+            {
+                if(configuredName == dynamic_cast<CDialogItem * const>(item)->actionName)
+                {
+                    selectedItems << item;
+                    break;
+                }
+            }
+        }
+    }
+    selectActionsWidget->setSelected(selectedItems);
+    selectActionsWidget->setAvailable(availableItems);
+}
+
diff -Nru qmapshack-1.8.1/src/helpers/CToolBarSetupDialog.h qmapshack-1.9.0/src/helpers/CToolBarSetupDialog.h
--- qmapshack-1.8.1/src/helpers/CToolBarSetupDialog.h	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/helpers/CToolBarSetupDialog.h	2017-07-04 16:44:15.000000000 +0000
@@ -0,0 +1,63 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess@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 2 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, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+**********************************************************************************************/
+
+#ifndef CTOOLBARSETUPDIALOG_H
+#define CTOOLBARSETUPDIALOG_H
+
+#include "ui_IToolBarSetupDialog.h"
+
+class CToolBarConfig;
+
+class CToolBarSetupDialog : public QDialog, private Ui::IToolBarSetupDialog
+{
+    Q_OBJECT
+public:
+    CToolBarSetupDialog(QWidget * const &parent, CToolBarConfig * const &config);
+    virtual ~CToolBarSetupDialog();
+
+public slots:
+    void accept() override;
+    void slotButtonClicked(QAbstractButton * button) const;
+
+private:
+    class CDialogItem : public QListWidgetItem
+    {
+public:
+        CDialogItem(QIcon icon, QString text, QString name)
+            : QListWidgetItem(icon, text, nullptr, QListWidgetItem::UserType),
+            actionName(name) {}
+        ~CDialogItem() override {}
+        QListWidgetItem * clone() const override { return new CDialogItem(this->icon(),this->text(),this->actionName); }
+private:
+        const QString actionName;
+        friend class CToolBarSetupDialog;
+    };
+
+    class CItemFilter : public QObject, public CSelectDoubleListWidget::IItemFilter
+    {
+public:
+        CItemFilter(QObject *parent) : QObject(parent) {}
+        ~CItemFilter() override {}
+        bool shouldBeMoved(QListWidgetItem *item) override;
+    };
+
+    void configure() const;
+    CToolBarConfig * config;
+};
+#endif //CTOOLBARSETUPDIALOG_H
diff -Nru qmapshack-1.8.1/src/helpers/IToolBarSetupDialog.ui qmapshack-1.9.0/src/helpers/IToolBarSetupDialog.ui
--- qmapshack-1.8.1/src/helpers/IToolBarSetupDialog.ui	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/helpers/IToolBarSetupDialog.ui	2017-07-01 14:40:11.000000000 +0000
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>IToolBarSetupDialog</class>
+ <widget class="QDialog" name="IToolBarSetupDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>847</width>
+    <height>549</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Setup Toolbar</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="CSelectDoubleListWidget" name="selectActionsWidget" native="true"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CSelectDoubleListWidget</class>
+   <extends>QWidget</extends>
+   <header>widgets/CSelectDoubleListWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>IToolBarSetupDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>423</x>
+     <y>526</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>423</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>IToolBarSetupDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>423</x>
+     <y>526</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>423</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/CSrcDistance.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/CSrcDistance.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/CSrcSeaLevelPressure.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/CSrcSeaLevelPressure.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/CSrcVertSpeed.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/CSrcVertSpeed.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/PointAdd.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/PointAdd.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/PointDel.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/PointDel.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/PointMove.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/PointMove.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/ToggleDem.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/ToggleDem.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/ToggleDocks.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/ToggleDocks.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/ToggleGis.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/ToggleGis.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/ToggleMaps.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/ToggleMaps.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/ToggleRouter.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/ToggleRouter.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/ToolBar.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/ToolBar.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/32x32/ToolBarSetup.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/32x32/ToolBarSetup.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/CSrcDistance.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/CSrcDistance.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/CSrcSeaLevelPressure.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/CSrcSeaLevelPressure.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/CSrcVertSpeed.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/CSrcVertSpeed.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/PointAdd.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/PointAdd.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/PointDel.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/PointDel.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/PointMove.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/PointMove.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/ToggleDem.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/ToggleDem.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/ToggleDocks.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/ToggleDocks.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/ToggleGis.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/ToggleGis.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/ToggleMaps.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/ToggleMaps.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/ToggleRouter.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/ToggleRouter.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/ToolBar.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/ToolBar.png differ
Binary files /tmp/tmprg8cUl/8HpAjC3POT/qmapshack-1.8.1/src/icons/48x48/ToolBarSetup.png and /tmp/tmprg8cUl/f_XP8KOo2z/qmapshack-1.9.0/src/icons/48x48/ToolBarSetup.png differ
diff -Nru qmapshack-1.8.1/src/icons/CSrcDistance.svg qmapshack-1.9.0/src/icons/CSrcDistance.svg
--- qmapshack-1.8.1/src/icons/CSrcDistance.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/CSrcDistance.svg	2017-07-10 19:52:50.000000000 +0000
@@ -0,0 +1,121 @@
+<?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="15.7mm"
+   height="15.7mm"
+   viewBox="0 0 15.7 15.7"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="CSrcDistance.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="50.876716"
+     inkscape:cy="11.396583"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1375"
+     inkscape:window-height="819"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <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="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-84.502808,-93.493311)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:0.27065563;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-dasharray:none;stroke-opacity:1"
+       d="m 100.02008,100.47547 -15.380017,0.0267"
+       id="path4862"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:0.27065563;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-dasharray:none;stroke-opacity:1"
+       d="m 92.581492,98.307387 -0.01202,4.369833"
+       id="path4862-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:0.27065563;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-dasharray:none;stroke-opacity:1"
+       d="m 85.665894,98.307397 -0.01202,4.369833"
+       id="path4862-5-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:0.27065563;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-dasharray:none;stroke-opacity:1"
+       d="m 99.163006,98.273987 -0.01202,4.369833"
+       id="path4862-5-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:0.18764158;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-dasharray:none;stroke-opacity:1"
+       d="m 87.236102,99.340767 -0.01202,2.100343"
+       id="path4862-5-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:0.18764158;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-dasharray:none;stroke-opacity:1"
+       d="m 89.006763,99.375317 -0.01202,2.100343"
+       id="path4862-5-1-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:0.18764158;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-dasharray:none;stroke-opacity:1"
+       d="m 90.710606,99.375327 -0.01202,2.100343"
+       id="path4862-5-1-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:0.18764158;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-dasharray:none;stroke-opacity:1"
+       d="m 93.951249,99.408727 -0.01202,2.100343"
+       id="path4862-5-1-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:0.18764158;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-dasharray:none;stroke-opacity:1"
+       d="m 95.688501,99.475547 -0.01202,2.100343"
+       id="path4862-5-1-82"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:0.18764158;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-dasharray:none;stroke-opacity:1"
+       d="m 97.358936,99.475537 -0.01202,2.100343"
+       id="path4862-5-1-00"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff -Nru qmapshack-1.8.1/src/icons/CSrcSeaLevelPressure.svg qmapshack-1.9.0/src/icons/CSrcSeaLevelPressure.svg
--- qmapshack-1.8.1/src/icons/CSrcSeaLevelPressure.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/CSrcSeaLevelPressure.svg	2017-07-10 19:52:50.000000000 +0000
@@ -0,0 +1,127 @@
+<?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="17.030975mm"
+   height="17.279997mm"
+   viewBox="0 0 17.030975 17.279997"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="CSrcSeaLevelPressure.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="118.26079"
+     inkscape:cy="34.741928"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1375"
+     inkscape:window-height="819"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <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="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-63.173574,-70.87816)">
+    <path
+       style="fill:none;stroke:#000080;stroke-width:0.24374077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 70.074089,77.9508 c 1.427795,-2.282245 6.250338,-4.857416 8.766655,-3.347022 1.417282,1.072314 1.441287,3.187209 0.922808,6.451506 -0.997705,3.466947 -4.548708,5.884161 -7.810894,4.317169 -3.545353,-1.487961 -3.656091,-4.505877 -1.878569,-7.421653 z"
+       id="path4489"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:0.24374077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 70.502534,79.163489 c 1.124903,-1.548315 4.924386,-3.295351 6.906891,-2.270674 1.116616,0.727474 1.135529,2.162253 0.727039,4.376805 -0.786048,2.352037 -3.583738,3.991917 -6.153882,2.928842 -2.793238,-1.009455 -2.880484,-3.056863 -1.480048,-5.034973 z"
+       id="path4489-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:0.24374077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 70.912395,80.239165 c 0.682352,-0.864378 2.987075,-1.839702 4.189641,-1.267652 0.677327,0.406127 0.688798,1.207125 0.441015,2.443446 -0.47681,1.313076 -2.173857,2.228577 -3.732876,1.635092 -1.694346,-0.56355 -1.747269,-1.70656 -0.89778,-2.810886 z"
+       id="path4489-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:0.24374077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 72.481355,88.017667 C 61.69595,82.322627 73.876396,76.462218 67.766822,70.968784"
+       id="path4518"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:0.24374077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 69.969414,87.990717 C 60.884732,82.879586 71.13049,77.070752 65.853357,71.045083"
+       id="path4518-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:0.24374077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 67.927287,87.94785 C 58.883032,83.568031 70.769804,79.263715 63.945441,71.018538"
+       id="path4518-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:0.24374077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 70.019949,71.009235 c 3.343906,4.550772 7.204746,0.946571 10.016331,2.439104"
+       id="path4518-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:0.24374077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 72.19391,71.058876 c 3.115002,2.845285 5.531646,0.164139 7.916809,0.701531"
+       id="path4518-4-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:0.24374077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 80.107771,83.429878 c -1.64896,2.154522 -3.371635,4.123241 -5.270906,4.610228"
+       id="path4518-4-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:0.24374077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 80.038357,85.855867 c -0.892231,1.150621 -0.910208,1.703425 -2.874164,2.136151"
+       id="path4518-4-5-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:0.24374077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 65.604496,87.952036 C 60.356998,85.068865 66.589072,81.705658 63.282095,75.23437"
+       id="path4518-2-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff -Nru qmapshack-1.8.1/src/icons/CSrcVertSpeed.svg qmapshack-1.9.0/src/icons/CSrcVertSpeed.svg
--- qmapshack-1.8.1/src/icons/CSrcVertSpeed.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/CSrcVertSpeed.svg	2017-07-10 19:52:50.000000000 +0000
@@ -0,0 +1,484 @@
+<?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="9.2844858mm"
+   height="10.12942mm"
+   viewBox="0 0 9.2844858 10.12942"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="CSrcVertSpeed.svg">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Send"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Send">
+      <path
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4165"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Mstart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mstart">
+      <path
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4156"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart">
+      <path
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4150"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Send-0"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Send">
+      <path
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4165-0"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Mstart-3"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mstart">
+      <path
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4156-4"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Lstart-0"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart">
+      <path
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4150-4"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineEnd"
+       id="marker5745"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g5747"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1">
+        <circle
+           id="circle5749"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle5751"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle5753"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineEnd"
+       id="marker5413"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g5415"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1">
+        <circle
+           id="circle5417"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle5419"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle5421"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineEnd"
+       id="marker5277"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g5279"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1">
+        <circle
+           id="circle5281"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle5283"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle5285"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Tail"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Tail">
+      <g
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="scale(-1.2,-1.2)"
+         id="g4297">
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-opacity:1"
+           d="M -3.8048674,-3.9585227 0.54352094,0"
+           id="path4299"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-opacity:1"
+           d="M -1.2866832,-3.9585227 3.0617053,0"
+           id="path4301"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-opacity:1"
+           d="M 1.3053582,-3.9585227 5.6537466,0"
+           id="path4303"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-opacity:1"
+           d="M -3.8048674,4.1775838 0.54352094,0.21974226"
+           id="path4305"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-opacity:1"
+           d="M -1.2866832,4.1775838 3.0617053,0.21974226"
+           id="path4307"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-opacity:1"
+           d="M 1.3053582,4.1775838 5.6537466,0.21974226"
+           id="path4309"
+           inkscape:connector-curvature="0" />
+      </g>
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="InfiniteLineEnd"
+       inkscape:stockid="InfiniteLineEnd"
+       style="overflow:visible">
+      <g
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         id="g4496">
+        <circle
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+           cx="3"
+           cy="0"
+           r="0.80000001"
+           id="circle4498" />
+        <circle
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+           cx="6.5"
+           cy="0"
+           r="0.80000001"
+           id="circle4500" />
+        <circle
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+           cx="10"
+           cy="0"
+           r="0.80000001"
+           id="circle4502" />
+      </g>
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Send-03"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Send">
+      <path
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4276"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Sstart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Sstart">
+      <path
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4273"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5453"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path5455"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker5203"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Sstart">
+      <path
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path5205"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Mstart-9"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mstart">
+      <path
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4156-9"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Lstart-3"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart">
+      <path
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4150-6"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Send-1"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Send">
+      <path
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4163"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Lend"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4151"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Mend"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mend">
+      <path
+         transform="matrix(-0.4,0,0,-0.4,-4,0)"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4157"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="47.031546"
+     inkscape:cy="63.230244"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1375"
+     inkscape:window-height="819"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <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="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-119.08088,-126.30656)">
+    <g
+       transform="matrix(0,-0.26458333,0.26458333,0,-144.13563,141.04872)"
+       id="layer1-75-1"
+       inkscape:label="Ebene 1">
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4137-2-9"
+         d="m 41.655129,995.41469 12.805682,17.95661 -13.005771,15.9211"
+         style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4137-1-6-0"
+         d="m 32.675412,997.35733 10.728551,15.97437 -10.896185,14.1638"
+         style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:1.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4137-1-4-0"
+         d="m 25.135467,999.60694 7.930481,13.75116 -8.054395,12.1921"
+         style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4137-1-4-8-3"
+         d="m 18.046495,1003.0023 6.221065,10.3823 -6.318269,9.2054"
+         style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff -Nru qmapshack-1.8.1/src/icons/PointAdd.svg qmapshack-1.9.0/src/icons/PointAdd.svg
--- qmapshack-1.8.1/src/icons/PointAdd.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/PointAdd.svg	2017-05-19 14:53:52.000000000 +0000
@@ -0,0 +1,354 @@
+<?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="PointAdd.svg">
+  <defs
+     id="defs3515">
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Send"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4215"
+         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.2) rotate(180) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Sstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4230"
+         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.3) translate(-2.3,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Send"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4233"
+         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(0.3) rotate(180) translate(-2.3,0)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker7570"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Send">
+      <path
+         transform="scale(0.2) rotate(180) translate(6,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         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 "
+         id="path7572" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker7453"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4227"
+         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(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker7353"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path7355"
+         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) rotate(180) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker7253"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Sstart">
+      <path
+         transform="scale(0.3) 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:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path7255" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Sstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4212"
+         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="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker7079"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path7081"
+         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) rotate(180) translate(6,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="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3880-4"
+         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>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Sstart-3"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4230-6"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         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="matrix(0.3,0,0,0.3,-0.69,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4215-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker7253-5"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Sstart">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         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"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path7255-6" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Send-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4233-9"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         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="matrix(-0.3,0,0,-0.3,0.69,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11"
+     inkscape:cx="23.339261"
+     inkscape:cy="30.971502"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1051"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     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">
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4284"
+       width="64"
+       height="64"
+       x="0"
+       y="0" />
+    <g
+       id="g4287"
+       transform="translate(0,8)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4300"
+         d="m 5,39 55,0"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="m 39.318504,39.184418 a 7.7185264,7.7186804 0 0 1 -7.710376,7.718676 7.7185264,7.7186804 0 0 1 -7.72666,-7.702376 7.7185264,7.7186804 0 0 1 7.694059,-7.734942 7.7185264,7.7186804 0 0 1 7.742908,7.68604"
+         sodipodi:open="true"
+         sodipodi:end="6.2789616"
+         sodipodi:start="0"
+         sodipodi:ry="7.7186804"
+         sodipodi:rx="7.7185264"
+         sodipodi:cy="39.184418"
+         sodipodi:cx="31.599977"
+         sodipodi:type="arc"
+         id="path4180"
+         style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#0000ff;stroke-width:4.56263685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:21.23931313px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;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="27.074331"
+       y="41.14505"
+       id="text4315"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0305941,0.9703141)"><tspan
+         sodipodi:role="line"
+         id="tspan4317"
+         x="27.074331"
+         y="41.14505"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:59.735569px;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#008000">+</tspan></text>
+  </g>
+</svg>
diff -Nru qmapshack-1.8.1/src/icons/PointDel.svg qmapshack-1.9.0/src/icons/PointDel.svg
--- qmapshack-1.8.1/src/icons/PointDel.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/PointDel.svg	2017-05-19 14:53:52.000000000 +0000
@@ -0,0 +1,354 @@
+<?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="PointDel.svg">
+  <defs
+     id="defs3515">
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Send"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4215"
+         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.2) rotate(180) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Sstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4230"
+         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.3) translate(-2.3,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Send"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4233"
+         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(0.3) rotate(180) translate(-2.3,0)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker7570"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Send">
+      <path
+         transform="scale(0.2) rotate(180) translate(6,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         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 "
+         id="path7572" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker7453"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4227"
+         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(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker7353"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path7355"
+         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) rotate(180) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker7253"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Sstart">
+      <path
+         transform="scale(0.3) 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:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path7255" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Sstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4212"
+         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="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker7079"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path7081"
+         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) rotate(180) translate(6,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="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3880-4"
+         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>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Sstart-3"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4230-6"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         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="matrix(0.3,0,0,0.3,-0.69,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4215-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker7253-5"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Sstart">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         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"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path7255-6" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Send-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4233-9"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         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="matrix(-0.3,0,0,-0.3,0.69,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11"
+     inkscape:cx="16.066534"
+     inkscape:cy="30.971502"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1051"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     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">
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4284"
+       width="64"
+       height="64"
+       x="0"
+       y="0" />
+    <g
+       id="g4287"
+       transform="translate(0,8)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4300"
+         d="m 5,39 55,0"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="m 39.318504,39.184418 a 7.7185264,7.7186804 0 0 1 -7.710376,7.718676 7.7185264,7.7186804 0 0 1 -7.72666,-7.702376 7.7185264,7.7186804 0 0 1 7.694059,-7.734942 7.7185264,7.7186804 0 0 1 7.742908,7.68604"
+         sodipodi:open="true"
+         sodipodi:end="6.2789616"
+         sodipodi:start="0"
+         sodipodi:ry="7.7186804"
+         sodipodi:rx="7.7185264"
+         sodipodi:cy="39.184418"
+         sodipodi:cx="31.599977"
+         sodipodi:type="arc"
+         id="path4180"
+         style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#0000ff;stroke-width:4.56263685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:21.23931313px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;letter-spacing:0px;word-spacing:0px;fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-1.4926199"
+       y="66.322571"
+       id="text4315"
+       sodipodi:linespacing="125%"
+       transform="matrix(0.72874008,-0.72874008,0.68611569,0.68611569,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan4317"
+         x="-1.4926199"
+         y="66.322571"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:59.735569px;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#aa0000">+</tspan></text>
+  </g>
+</svg>
diff -Nru qmapshack-1.8.1/src/icons/PointMove.svg qmapshack-1.9.0/src/icons/PointMove.svg
--- qmapshack-1.8.1/src/icons/PointMove.svg	2015-05-22 16:29:44.000000000 +0000
+++ qmapshack-1.9.0/src/icons/PointMove.svg	2017-05-19 14:53:52.000000000 +0000
@@ -13,11 +13,137 @@
    height="64px"
    id="svg3513"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="PointMove.svg">
   <defs
      id="defs3515">
     <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Send"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4215"
+         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.2) rotate(180) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Sstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4230"
+         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.3) translate(-2.3,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Send"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4233"
+         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(0.3) rotate(180) translate(-2.3,0)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker7570"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Send">
+      <path
+         transform="scale(0.2) rotate(180) translate(6,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         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 "
+         id="path7572" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker7453"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4227"
+         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(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker7353"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path7355"
+         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) rotate(180) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker7253"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Sstart">
+      <path
+         transform="scale(0.3) 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:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path7255" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Sstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4212"
+         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="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker7079"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path7081"
+         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) rotate(180) translate(6,0)" />
+    </marker>
+    <marker
        inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
@@ -83,6 +209,66 @@
          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
          transform="matrix(0.4,0,0,0.4,4,0)" />
     </marker>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Sstart-3"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4230-6"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         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="matrix(0.3,0,0,0.3,-0.69,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4215-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker7253-5"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Sstart">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         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"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path7255-6" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Send-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4233-9"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         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="matrix(-0.3,0,0,-0.3,0.69,0)" />
+    </marker>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -91,17 +277,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="-74.181819"
-     inkscape:cy="32"
+     inkscape:zoom="11"
+     inkscape:cx="27.657443"
+     inkscape:cy="32.697415"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="996"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-height="1051"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
      inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
@@ -115,7 +301,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>
@@ -124,39 +310,100 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       style="fill:none;stroke:none"
-       id="rect5814"
-       width="40"
-       height="40"
-       x="13.269119"
-       y="10.153573" />
-    <path
-       style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow2Mend)"
-       d="m 33.269119,30.328819 -18.790668,-5"
-       id="path3096"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Mend)"
-       d="m 33.269119,30.328819 18.790669,5"
-       id="path3098"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#000080;stroke:#000080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart)"
-       d="m 23.873785,45.328819 9.395334,-15"
-       id="path3100"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#000080;stroke:#000080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart)"
-       d="m 42.707469,14.978327 -9.395334,15"
-       id="path3100-4"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:none;stroke:none"
-       id="rect4025"
-       width="40"
-       height="40"
-       x="13.269119"
-       y="10.153573" />
+       style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4284"
+       width="64"
+       height="64"
+       x="0"
+       y="0" />
+    <g
+       id="g4287"
+       transform="translate(0,8)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4300"
+         d="m 5,39 55,0"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="m 39.318504,39.184418 a 7.7185264,7.7186804 0 0 1 -7.710376,7.718676 7.7185264,7.7186804 0 0 1 -7.72666,-7.702376 7.7185264,7.7186804 0 0 1 7.694059,-7.734942 7.7185264,7.7186804 0 0 1 7.742908,7.68604"
+         sodipodi:open="true"
+         sodipodi:end="6.2789616"
+         sodipodi:start="0"
+         sodipodi:ry="7.7186804"
+         sodipodi:rx="7.7185264"
+         sodipodi:cy="39.184418"
+         sodipodi:cx="31.599977"
+         sodipodi:type="arc"
+         id="path4180"
+         style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#0000ff;stroke-width:4.56263685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4291"
+       transform="matrix(1.1910314,0,0,1.106179,-4.6063547,-1.9811613)">
+      <g
+         transform="matrix(2.7713857,0,0,2.1726845,-12.642604,-13.556808)"
+         style="fill:#008000;stroke:#008000"
+         id="g4303">
+        <path
+           style="fill:#008000;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 7,14 3,-5 3,5"
+           id="path4299"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#008000;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 13,14 7,14"
+           id="path4301"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(2.7713857,0,0,-2.1726845,-12.642603,54.298899)"
+         style="fill:#008000;stroke:#008000"
+         id="g4303-3">
+        <path
+           style="fill:#008000;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 7,14 3,-5 3,5"
+           id="path4299-6"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#008000;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 13,14 7,14"
+           id="path4301-7"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       id="g4291-3"
+       transform="matrix(0,-1.1910314,1.106179,0,21.991776,38.594107)">
+      <g
+         transform="matrix(2.7713857,0,0,2.1726845,-12.642604,-13.556808)"
+         style="fill:#008000;stroke:#008000"
+         id="g4303-6">
+        <path
+           style="fill:#008000;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 7,14 3,-5 3,5"
+           id="path4299-7"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#008000;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 13,14 7,14"
+           id="path4301-5"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(2.7713857,0,0,-2.1726845,-12.642603,54.298899)"
+         style="fill:#008000;stroke:#008000"
+         id="g4303-3-3">
+        <path
+           style="fill:#008000;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 7,14 3,-5 3,5"
+           id="path4299-6-5"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#008000;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 13,14 7,14"
+           id="path4301-7-6"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
   </g>
 </svg>
diff -Nru qmapshack-1.8.1/src/icons/ToggleDem.svg qmapshack-1.9.0/src/icons/ToggleDem.svg
--- qmapshack-1.8.1/src/icons/ToggleDem.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/ToggleDem.svg	2017-07-01 14:40:11.000000000 +0000
@@ -0,0 +1,97 @@
+<?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="ToggleDem.svg"
+   inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_touch/src/icons/48x48/ToggleDem.png"
+   inkscape:export-xdpi="67.5"
+   inkscape:export-ydpi="67.5">
+  <defs
+     id="defs3464" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-53.545455"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <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-opacity:1"
+       id="rect3342"
+       width="37.454121"
+       height="35.975674"
+       x="6.8615112"
+       y="20.427578" />
+    <rect
+       style="fill:#ffffff;stroke:#000080;stroke-width:0.9201774"
+       id="rect3797"
+       width="36.807095"
+       height="36.807095"
+       x="7.2328143"
+       y="20.687361" />
+    <path
+       style="fill:#009cff;fill-opacity:1;stroke:none"
+       d="m 7.6983828,56.873207 0,-10.278474 4.4839922,-5.139237 4.483994,5.139237 8.967987,-15.417712 8.967986,10.278475 4.483992,-5.139237 4.483995,10.278474 0,10.278474 z"
+       id="path3799"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000080;stroke:none"
+       d="m 7.4492015,57.350787 0,-5.964057 4.5801135,0 4.580116,-5.964055 4.580115,5.964055 9.160226,-11.928112 9.160227,5.964057 4.580114,5.964055 0,5.964057 z"
+       id="path3815"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff -Nru qmapshack-1.8.1/src/icons/ToggleDocks.svg qmapshack-1.9.0/src/icons/ToggleDocks.svg
--- qmapshack-1.8.1/src/icons/ToggleDocks.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/ToggleDocks.svg	2017-07-01 14:40:11.000000000 +0000
@@ -0,0 +1,214 @@
+<?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="ToggleDocks.svg"
+   inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_touch/src/icons/32x32/ToggleDocks.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs3464" />
+  <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.006163"
+     inkscape:cy="5.2920227"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1059"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="1" />
+  <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:#ffffff;fill-opacity:1"
+       id="rect3473"
+       width="26.363636"
+       height="26.545456"
+       x="15.454544"
+       y="13.636365" />
+    <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="25.274717"
+       y="8.244812" />
+    <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="40.109055"
+       y="3.3254268" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1"
+       id="rect3342-3"
+       width="25.090485"
+       height="24.100075"
+       x="16.38044"
+       y="13.366172" />
+    <g
+       transform="matrix(0.77123403,0,0,0.77123403,-431.70501,-8.1537543)"
+       id="g3865"
+       inkscape:export-filename="/home/oeichler/dateien/cpp/MapRoom/icons/32x32/map.png"
+       inkscape:export-xdpi="82.136177"
+       inkscape:export-ydpi="82.136177">
+      <rect
+         y="28.345903"
+         x="580.99304"
+         height="33.188591"
+         width="33.129997"
+         id="rect3167"
+         style="fill:none;stroke:#000080;stroke-width:1.87165701;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3319"
+         d="m 585.16593,57.119256 c -0.37071,-0.152412 -0.77584,-0.328663 -0.90027,-0.391681 -0.22434,-0.113598 -0.22521,-0.115284 -0.1037,-0.198356 0.0674,-0.04608 0.17632,-0.08477 0.24202,-0.08608 0.0657,-9.37e-4 0.32235,-0.06997 0.57033,-0.15261 0.7605,-0.25358 1.15015,-0.299589 2.03222,-0.239952 0.44199,0.02988 0.83863,0.07203 0.88141,0.0938 0.0427,0.02173 0.11184,0.01264 0.15348,-0.01976 0.0648,-0.05086 0.0615,-0.07868 -0.0221,-0.192586 l -0.0978,-0.133248 0.38503,0.04693 c 0.66965,0.08149 1.82493,0.06332 1.85001,-0.02922 0.0126,-0.04665 -0.0474,-0.111078 -0.14054,-0.151092 -0.20747,-0.08917 -0.17568,-0.21515 0.0543,-0.21515 0.17027,0 0.17676,-0.0084 0.17825,-0.246912 9.4e-4,-0.179969 0.0343,-0.279592 0.1224,-0.367553 0.16565,-0.165357 0.21306,-0.151729 0.21306,0.06126 0,0.100681 0.0463,0.233518 0.10369,0.297566 0.057,0.0636 0.1037,0.150427 0.1037,0.192886 0,0.04243 0.07,0.185776 0.15554,0.318491 0.0856,0.132696 0.15555,0.281212 0.15555,0.329993 0,0.116829 0.15599,0.184999 0.78428,0.342863 1.12727,0.283216 1.57833,0.201849 2.48213,-0.44775 0.15197,-0.109242 0.60114,-0.268576 0.93326,-0.331107 0.18536,-0.03484 0.92031,-0.07568 1.63322,-0.09086 1.92011,-0.04056 2.11597,-0.05198 2.22945,-0.131431 0.057,-0.0399 0.20869,-0.09179 0.33702,-0.115425 0.12832,-0.0236 0.3692,-0.1032 0.53528,-0.176793 0.29326,-0.130027 0.30751,-0.130589 0.49256,-0.02023 0.10482,0.06266 0.3539,0.126374 0.55351,0.141735 0.22666,0.01751 0.43658,0.07643 0.55906,0.156796 0.14847,0.09745 0.24605,0.118365 0.40155,0.08608 0.11298,-0.0236 0.21696,-0.06585 0.23105,-0.09394 0.0141,-0.0281 0.10519,-0.0695 0.20245,-0.09198 0.0973,-0.02248 0.20737,-0.08627 0.24468,-0.141698 0.0567,-0.08411 0.14534,-0.09408 0.53666,-0.05994 0.33856,0.0295 0.5048,0.0178 0.59842,-0.04196 0.16368,-0.104465 0.71567,-0.09675 0.93079,0.01264 0.12791,0.06529 0.20674,0.06744 0.36314,0.0098 0.13267,-0.04899 0.24315,-0.05339 0.32897,-0.01264 0.073,0.03409 0.46433,0.04561 0.89932,0.02641 0.42356,-0.01883 0.80511,-0.03522 0.84788,-0.03681 0.17765,-0.0056 0.71099,0.13944 0.85549,0.233125 0.0856,0.05545 0.23756,0.101102 0.33778,0.101243 0.10023,1.5e-4 0.2693,0.05788 0.37571,0.1282 0.10641,0.07034 0.25189,0.127778 0.32328,0.127778 0.24652,0 0.12868,0.1143 -0.22016,0.213558 -0.56059,0.159512 -0.96965,0.379786 -0.98773,0.53187 -0.0145,0.121466 0.0102,0.13087 0.33701,0.127076 0.19392,-9.36e-4 0.51344,0.02089 0.71004,0.05123 0.46696,0.07222 0.41308,0.119639 -0.6128,0.54075 l -0.79248,0.325273 -10.85669,-9.37e-4 -10.85669,-9.36e-4 -0.67402,-0.27711 z m 3.81082,-3.938412 c 0,-0.03512 0.022,-0.06388 0.0488,-0.06388 0.0268,0 0.0632,0.02876 0.0808,0.06388 0.0177,0.03513 -0.005,0.06388 -0.0488,0.06388 -0.0444,0 -0.0809,-0.02875 -0.0809,-0.06388 z m -0.32443,-0.14491 c -0.18352,-0.175117 -0.45796,-0.650236 -0.44824,-0.775963 0.006,-0.07353 -0.003,-0.177009 -0.0194,-0.229752 -0.0164,-0.05283 -0.0398,-0.247905 -0.0521,-0.4337 -0.0126,-0.190712 -0.0558,-0.371646 -0.0991,-0.4155 -0.11862,-0.120051 -0.20104,-0.570555 -0.16452,-0.899087 0.0181,-0.162472 0.007,-0.418076 -0.0244,-0.567997 -0.0315,-0.149921 -0.0685,-0.656745 -0.0823,-1.126272 -0.0274,-0.935344 -0.0692,-1.08742 -0.35051,-1.277879 -0.3018,-0.204304 -0.38775,-0.324542 -0.60908,-0.852067 -0.12281,-0.292686 -0.28161,-0.628224 -0.35291,-0.745634 -0.1103,-0.181645 -0.12095,-0.237039 -0.0713,-0.371224 0.0321,-0.08674 0.0445,-0.225304 0.0278,-0.307907 -0.0338,-0.165985 0.0321,-0.353007 0.22464,-0.638331 0.11212,-0.166088 0.12482,-0.236609 0.1065,-0.591283 -0.015,-0.289117 -0.003,-0.402715 0.0427,-0.402715 0.0349,0 0.11769,-0.08299 0.18392,-0.184549 0.0662,-0.101524 0.17292,-0.204116 0.23708,-0.228038 0.0998,-0.03719 0.11665,-0.01995 0.11665,0.120613 0,0.10321 0.0289,0.164102 0.0778,0.164102 0.0437,0 0.0778,-0.05704 0.0778,-0.129877 0,-0.16324 0.1312,-0.230333 0.23758,-0.121465 0.0444,0.04552 0.21134,0.0873 0.37099,0.0932 0.22035,0.0084 0.32253,0.0458 0.42414,0.156487 0.0736,0.08018 0.22142,0.242809 0.32843,0.361343 0.13181,0.145978 0.24602,0.215525 0.35398,0.215525 0.207,0 0.43554,0.278467 0.5106,0.622164 0.0612,0.280641 0.23332,0.464525 0.43458,0.464525 0.0679,0 0.16389,0.05517 0.21336,0.122589 0.0541,0.07371 0.19677,0.140592 0.35801,0.16784 0.24507,0.0414 0.38456,0.133529 0.66987,0.442382 0.13523,0.146371 0.11243,0.287329 -0.11687,0.722405 -0.18106,0.343556 -0.21019,0.450325 -0.22781,0.835122 -0.0252,0.548553 -0.18488,1.033684 -0.34041,1.033684 -0.11506,0 -0.48633,0.263931 -0.55003,0.390988 -0.0211,0.04215 -0.0353,0.175295 -0.0317,0.295955 0.005,0.157958 -0.051,0.326518 -0.1993,0.601764 -0.11329,0.210289 -0.20599,0.425654 -0.20599,0.478594 0,0.07081 -0.0473,0.09123 -0.17869,0.07727 -0.23407,-0.02482 -0.26107,0.01995 -0.15889,0.263518 0.10076,0.240196 0.0515,0.349963 -0.18291,0.407773 -0.10205,0.0251 -0.17228,0.09348 -0.20495,0.19948 -0.0274,0.08861 -0.0853,0.16118 -0.12877,0.16118 -0.0924,0 -0.10065,0.08655 -0.025,0.260643 0.0404,0.0931 0.0315,0.182769 -0.0353,0.356538 -0.0877,0.227907 -0.0872,0.234313 0.0281,0.349475 0.1057,0.105599 0.11163,0.1393 0.059,0.335969 -0.0322,0.120192 -0.0443,0.288415 -0.027,0.37366 0.0413,0.203002 -0.0767,0.338114 -0.19584,0.224348 z m 1.77617,-5.032857 c 0,-0.03512 -0.0233,-0.06388 -0.0519,-0.06388 -0.0285,0 -0.0519,0.02876 -0.0519,0.06388 0,0.03513 0.0233,0.06388 0.0519,0.06388 0.0285,0 0.0519,-0.02876 0.0519,-0.06388 z m 22.13903,3.909564 c 0,-0.05236 0.22813,-0.204126 0.30056,-0.199902 0.0523,0.0028 -0.1991,0.253563 -0.25446,0.253563 -0.0253,0 -0.0461,-0.02417 -0.0461,-0.05367 z m -1.94296,-0.519001 c -0.0186,-0.03719 0.004,-0.08524 0.0495,-0.106854 0.11406,-0.05405 0.14954,0.0056 0.0588,0.09829 -0.0511,0.05236 -0.085,0.05508 -0.10823,0.0084 z m 3.32747,-0.543972 c 0.085,-0.144002 0.17093,-0.209268 0.17093,-0.129887 0,0.04327 -0.20024,0.287647 -0.23574,0.287647 -0.0156,0 0.0136,-0.07109 0.0648,-0.157789 z m -3.44159,-0.165751 c -0.0607,-0.02613 -0.10856,-0.154033 -0.1445,-0.385218 -0.0508,-0.326734 -0.0617,-0.34484 -0.19638,-0.325413 -0.10381,0.01489 -0.14259,-0.0075 -0.14259,-0.08318 0,-0.05873 -0.081,-0.145435 -0.18617,-0.19963 -0.1554,-0.07999 -0.23469,-0.08327 -0.4796,-0.01967 -0.16138,0.04196 -0.37057,0.129746 -0.46488,0.19505 -0.0943,0.06528 -0.24087,0.118796 -0.32572,0.118796 -0.0848,0 -0.23928,0.04384 -0.34322,0.09731 -0.20431,0.105308 -0.33748,0.04281 -0.23608,-0.110647 0.03,-0.04552 0.065,-0.425448 0.0778,-0.84447 0.0222,-0.731041 0.0287,-0.76729 0.16002,-0.896389 0.0753,-0.074 0.27648,-0.185636 0.44716,-0.248092 0.20851,-0.07624 0.34458,-0.17019 0.41484,-0.286186 0.0575,-0.09492 0.12576,-0.197325 0.15168,-0.227504 0.0259,-0.03016 0.12926,-0.150877 0.22967,-0.268221 0.17056,-0.199339 0.19332,-0.20834 0.34638,-0.137051 0.13636,0.0635 0.17128,0.06013 0.20836,-0.01948 0.11889,-0.255295 0.20117,-0.330555 0.39672,-0.362898 0.24316,-0.04018 0.31152,0.03662 0.2201,0.247165 -0.0558,0.128622 -0.0397,0.16591 0.16611,0.386174 0.13228,0.1415 0.2713,0.236534 0.33133,0.226493 0.11973,-0.02005 0.27927,-0.381182 0.28295,-0.640532 0.003,-0.193926 0.10618,-0.248242 0.10618,-0.05573 0,0.06603 0.0321,0.152759 0.0711,0.192791 0.0392,0.04 0.083,0.203545 0.0977,0.363367 0.0146,0.15984 0.0722,0.353559 0.12783,0.430468 0.0557,0.0769 0.17478,0.317779 0.26462,0.535252 0.17496,0.423527 0.17884,0.619981 0.02,1.010904 -0.11575,0.284893 -0.8346,1.206169 -0.99048,1.269374 -0.17031,0.06894 -0.49192,0.08861 -0.61095,0.03719 z m -12.92294,-0.65594 c -0.0308,-0.03775 -0.0558,-0.133679 -0.0558,-0.212874 0,-0.168364 -0.0855,-0.430515 -0.22005,-0.675122 -0.0525,-0.09548 -0.10993,-0.325572 -0.12759,-0.511405 -0.0177,-0.185814 -0.10017,-0.524817 -0.18338,-0.753343 -0.16391,-0.450194 -0.16584,-0.72322 -0.007,-1.100055 0.14446,-0.344418 -0.003,-1.135976 -0.29562,-1.592258 -0.16629,-0.258845 -0.1709,-0.32043 -0.0649,-0.865854 0.0362,-0.185973 -0.14727,-0.405066 -0.33908,-0.405066 -0.10235,0 -0.17641,-0.05039 -0.23452,-0.159803 -0.0982,-0.184746 -0.22641,-0.197765 -0.52325,-0.05311 -0.11407,0.05545 -0.32405,0.106301 -0.46663,0.112614 -0.14258,0.0075 -0.31937,0.03344 -0.39287,0.06013 -0.10918,0.03962 -0.17562,0.0056 -0.36294,-0.185205 -0.12611,-0.128481 -0.25262,-0.29766 -0.28114,-0.375824 -0.0285,-0.07821 -0.12768,-0.259463 -0.22035,-0.402902 -0.18127,-0.280538 -0.2046,-0.462577 -0.10948,-0.854005 0.0418,-0.172176 0.0436,-0.317995 0.006,-0.500849 -0.0498,-0.242022 -0.0398,-0.285567 0.16132,-0.704608 0.12237,-0.254864 0.29236,-0.510599 0.39591,-0.595582 0.11748,-0.09647 0.20518,-0.237639 0.24871,-0.400514 0.0369,-0.138307 0.15283,-0.348202 0.25743,-0.466333 0.15365,-0.173534 0.21905,-0.207684 0.34037,-0.177758 0.0961,0.0237 0.23671,-0.01124 0.39067,-0.0952 0.15106,-0.08317 0.40246,-0.145434 0.67608,-0.167717 l 0.43559,-0.03541 -0.0307,0.232853 c -0.0338,0.256156 0.0498,0.365277 0.3442,0.449725 0.0812,0.02332 0.21227,0.101244 0.2911,0.173019 0.1982,0.180663 0.48371,0.193794 0.51147,0.0236 0.0331,-0.202917 0.092,-0.209689 0.46881,-0.05395 0.28748,0.118936 0.41908,0.13929 0.69457,0.107556 0.18693,-0.02164 0.36516,-0.05845 0.39605,-0.08186 0.0309,-0.0236 0.0715,-0.223748 0.0902,-0.444921 0.0373,-0.44004 -0.0126,-0.548159 -0.21071,-0.456226 -0.0594,0.02754 -0.16268,0.02501 -0.22947,-0.0056 -0.0668,-0.03072 -0.14395,-0.03878 -0.17146,-0.0178 -0.096,0.07315 -0.28605,-0.03606 -0.34631,-0.199142 -0.0865,-0.234099 -0.0763,-0.286205 0.0559,-0.28584 0.0641,1.5e-4 0.22759,-0.04871 0.36317,-0.108689 0.20455,-0.09039 0.27579,-0.0959 0.41847,-0.03231 0.18599,0.08299 0.44398,0.09984 0.57512,0.03775 0.15192,-0.07194 0.0882,-0.278121 -0.15002,-0.485084 -0.18624,-0.161854 -0.22634,-0.229584 -0.20319,-0.343294 0.0159,-0.07793 0.003,-0.161938 -0.0304,-0.186741 -0.0822,-0.06266 -0.36402,0.09123 -0.36402,0.198712 0,0.117943 -0.085,0.112473 -0.12244,-0.0075 -0.0172,-0.05536 -0.0947,-0.0959 -0.18278,-0.0959 -0.11939,0 -0.17801,0.05002 -0.26716,0.227842 -0.0628,0.125249 -0.12055,0.319474 -0.1283,0.43147 -0.0108,0.155822 -0.0367,0.200323 -0.11037,0.189495 -0.053,-0.0084 -0.16236,0.01826 -0.24313,0.05788 -0.13409,0.06585 -0.14381,0.09189 -0.11201,0.30092 l 0.0349,0.228881 -0.10879,-0.121325 c -0.0598,-0.06688 -0.13637,-0.234857 -0.17008,-0.373548 -0.0444,-0.182816 -0.11804,-0.296367 -0.26767,-0.412812 -0.11353,-0.08833 -0.25346,-0.2147 -0.31098,-0.280763 -0.15123,-0.173702 -0.29243,-0.156356 -0.29243,0.03597 0,0.0858 0.0232,0.173712 0.0515,0.195321 0.0283,0.02164 0.0758,0.0952 0.10553,0.163587 0.0883,0.203385 -0.0308,0.146708 -0.23414,-0.11149 -0.17683,-0.224489 -0.1939,-0.232141 -0.35615,-0.159813 -0.0937,0.04187 -0.24459,0.07596 -0.33524,0.07596 -0.0907,0 -0.16483,0.02763 -0.16483,0.06135 0,0.03381 -0.0933,0.17537 -0.20739,0.314613 -0.11407,0.1393 -0.20739,0.294091 -0.20739,0.344137 0,0.232056 -0.4296,0.428557 -0.63938,0.292452 -0.15155,-0.09829 -0.19389,-0.189598 -0.15652,-0.337355 0.0172,-0.06809 0.0349,-0.211891 0.0391,-0.319615 l 0.007,-0.195874 0.3601,-0.0192 c 0.20721,-0.01124 0.37686,-0.0517 0.39961,-0.09591 0.0679,-0.131562 0.0449,-0.445033 -0.0413,-0.562424 -0.0765,-0.104184 -0.07,-0.120192 0.0907,-0.221641 0.0952,-0.06023 0.30758,-0.234819 0.47186,-0.388141 0.16429,-0.153349 0.32577,-0.278795 0.35885,-0.278795 0.0331,0 0.097,-0.04018 0.14201,-0.08936 0.0612,-0.06697 0.14693,-0.07681 0.34109,-0.03971 0.14258,0.02735 0.31481,0.0236 0.38274,-0.0084 0.068,-0.03175 0.1659,-0.04131 0.21771,-0.02089 0.10617,0.04159 0.30688,-0.16856 0.30688,-0.321254 0,-0.06079 0.0496,-0.0959 0.13567,-0.0959 0.11013,0 0.13056,-0.02398 0.10856,-0.127778 -0.0321,-0.151476 0.0516,-0.236178 0.1336,-0.135075 0.0895,0.110366 0.17761,0.08439 0.20855,-0.06154 0.017,-0.08018 0.0655,-0.127928 0.1227,-0.120482 0.17844,0.02304 0.22419,-0.0028 0.22419,-0.126092 0,-0.155794 -0.18549,-0.234136 -0.29326,-0.123854 -0.0676,0.06922 -0.0928,0.06276 -0.1533,-0.03934 -0.0398,-0.06716 -0.059,-0.173937 -0.0427,-0.237302 0.0164,-0.0635 0.007,-0.115283 -0.0217,-0.115283 -0.0869,0 -0.3704,0.325319 -0.3704,0.424942 0,0.0517 -0.0233,0.07624 -0.0519,0.05451 -0.0938,-0.07147 -0.0542,-0.24856 0.0865,-0.386895 0.0917,-0.09011 0.12721,-0.171801 0.10532,-0.242107 -0.0566,-0.181561 -0.24271,-0.117391 -0.48039,0.165564 -0.22154,0.263743 -0.29229,0.504248 -0.17468,0.593867 0.037,0.02819 0.0302,0.0769 -0.0206,0.147608 -0.0417,0.05817 -0.0842,0.163034 -0.0946,0.233358 -0.023,0.156244 -0.22535,0.206908 -0.26881,0.06744 -0.019,-0.06079 -0.003,-0.09928 0.0422,-0.09928 0.0402,0 0.0882,-0.03007 0.10653,-0.06669 0.0428,-0.08552 -0.0748,-0.263744 -0.14086,-0.213436 -0.0275,0.02089 -0.12399,0.04608 -0.21449,0.05601 -0.0905,0.0098 -0.21382,0.03793 -0.27405,0.06238 -0.0864,0.03494 -0.11635,0.01264 -0.14188,-0.104755 -0.0566,-0.260335 -0.0392,-0.29722 0.22332,-0.473311 0.14139,-0.09492 0.35211,-0.311476 0.46827,-0.48131 0.1797,-0.262751 0.26315,-0.327792 0.55952,-0.436154 0.2816,-0.10292 0.38806,-0.114853 0.55573,-0.06191 0.11406,0.03606 0.3357,0.10307 0.49255,0.149172 0.33067,0.09717 0.57032,0.207788 0.57032,0.263322 0,0.02136 -0.11017,0.02932 -0.24483,0.01752 -0.2877,-0.02501 -0.34401,0.08524 -0.16475,0.322482 0.0886,0.117241 0.14598,0.139992 0.2738,0.10882 0.0889,-0.02173 0.19671,-0.0945 0.23947,-0.161732 0.0427,-0.06716 0.17111,-0.141791 0.28517,-0.165732 0.11407,-0.02388 0.26354,-0.08701 0.33217,-0.140283 0.0713,-0.05536 0.29243,-0.108258 0.51617,-0.123704 0.21528,-0.01489 0.42152,-0.05788 0.45834,-0.09548 0.0477,-0.04889 0.13329,-0.04786 0.29746,0.0028 0.12679,0.03943 0.25519,0.07156 0.28534,0.07156 0.0853,0 0.0644,-0.178761 -0.0283,-0.242753 -0.0913,-0.06294 -0.0819,-0.275452 0.0138,-0.314773 0.0882,-0.03606 0.38268,0.522486 0.36741,0.696938 -0.0195,0.223711 0.17422,0.196557 0.26508,-0.03709 0.0669,-0.172279 0.0634,-0.1937 -0.0512,-0.303158 -0.10476,-0.100119 -0.11157,-0.127216 -0.0454,-0.181196 0.10181,-0.08299 0.34363,-0.08252 0.47005,7.03e-4 0.12703,0.08383 0.13785,-0.03381 0.0111,-0.121325 -0.19235,-0.132687 0.30448,-0.452564 0.71131,-0.457922 0.0998,-0.0019 0.22389,-0.04196 0.27576,-0.09058 0.0688,-0.06435 0.13878,-0.0724 0.2589,-0.02988 0.0905,0.03203 0.24641,0.05873 0.34641,0.0591 0.1,4.59e-4 0.21681,0.02988 0.25958,0.06519 0.0678,0.05592 0.0662,0.07259 -0.013,0.130027 -0.15004,0.109102 -0.10285,0.191143 0.10369,0.1804 0.10694,-0.0056 0.5094,0.01264 0.89438,0.04 0.56109,0.04018 0.72464,0.07371 0.82441,0.16916 0.10457,0.09998 0.17918,0.112474 0.46663,0.07821 0.18819,-0.02248 0.36433,-0.06604 0.39142,-0.09661 0.0754,-0.08552 0.43985,-0.06669 0.77195,0.04 0.16422,0.05283 0.41485,0.0959 0.55695,0.0959 0.14211,0 0.34446,0.0444 0.44966,0.09857 0.13941,0.07194 0.38149,0.09913 0.89272,0.100672 0.50314,9.36e-4 0.82375,0.03709 1.13415,0.125399 0.45221,0.128762 0.69115,0.244851 0.51187,0.248635 -0.13477,0.0028 -0.16783,0.178977 -0.061,0.324598 0.0892,0.121466 0.0884,0.131573 -0.0182,0.271621 -0.0765,0.1004 -0.17691,0.148732 -0.32418,0.155982 -0.39394,0.01939 -0.46396,0.233583 -0.17827,0.545414 0.1489,0.162519 0.18147,0.242809 0.18147,0.447328 0,0.137052 -0.0216,0.239662 -0.0479,0.227954 -0.0792,-0.03522 -0.52245,-0.567407 -0.52245,-0.627213 0,-0.03044 0.0276,-0.202552 0.0611,-0.38223 0.0529,-0.282842 0.0498,-0.34069 -0.0233,-0.43088 -0.0721,-0.08889 -0.097,-0.09142 -0.17003,-0.01667 -0.0489,0.05011 -0.17233,0.07971 -0.28826,0.0695 -0.18569,-0.01658 -0.20518,-0.0028 -0.232,0.162678 l -0.0293,0.180728 -0.45247,-0.02192 c -0.48959,-0.0236 -0.51717,-0.0084 -0.6158,0.341486 -0.0297,0.105458 -0.07,0.240159 -0.0895,0.299299 -0.0421,0.127779 0.20003,0.307963 0.41368,0.307963 0.20282,0 0.4407,0.174611 0.4407,0.323502 0,0.07062 0.0352,0.194581 0.0781,0.275358 0.0629,0.118375 0.0681,0.211937 0.0265,0.482125 -0.064,0.416268 -0.0826,0.453182 -0.22689,0.453182 -0.14812,0 -0.24062,0.114019 -0.24062,0.296658 0,0.07877 -0.0233,0.161029 -0.0519,0.182769 -0.0906,0.06912 -0.0567,0.165282 0.12962,0.36879 0.17806,0.194337 0.23169,0.384431 0.13027,0.461705 -0.0281,0.02145 -0.089,-0.07756 -0.13524,-0.219964 -0.0463,-0.142428 -0.11384,-0.258976 -0.15024,-0.258976 -0.0364,0 -0.10439,-0.07194 -0.1511,-0.159793 -0.0538,-0.101234 -0.13334,-0.159803 -0.21706,-0.159803 -0.0727,0 -0.16613,-0.04196 -0.2077,-0.0931 -0.0974,-0.120191 -0.1839,-0.07587 -0.33096,0.169348 l -0.11863,0.197821 0.1237,0.117241 c 0.0681,0.06444 0.17702,0.117954 0.24218,0.118656 0.10383,0.0019 0.11135,0.0178 0.0609,0.134242 -0.0317,0.07306 -0.0439,0.177383 -0.0268,0.231841 0.0169,0.05433 0.005,0.138166 -0.0278,0.18601 -0.0672,0.09984 0.0126,0.158107 0.18421,0.134522 0.074,-0.0098 0.13162,0.06332 0.21261,0.271256 0.10783,0.276763 0.10852,0.294353 0.0234,0.592332 -0.0937,0.328054 -0.28408,0.624618 -0.40097,0.624618 -0.0392,0 -0.14589,0.04758 -0.23703,0.105729 -0.0912,0.05817 -0.2652,0.100963 -0.38678,0.09535 -0.19783,-0.0098 -0.23188,0.01124 -0.32407,0.197971 -0.0567,0.114582 -0.1031,0.22891 -0.10319,0.254096 -1.1e-4,0.02529 0.10255,0.188456 0.22815,0.362795 0.12559,0.17434 0.24518,0.411548 0.26578,0.527122 0.0332,0.186451 0.0179,0.230249 -0.13566,0.388309 l -0.17309,0.178152 -0.20934,-0.248232 c -0.26975,-0.319821 -0.40761,-0.408654 -0.48539,-0.312759 -0.0564,0.0695 -0.10513,-0.03091 -0.23475,-0.482837 -0.0261,-0.09085 -0.0667,-0.107987 -0.18212,-0.07671 -0.13191,0.03578 -0.15188,0.02023 -0.17787,-0.138728 -0.0161,-0.09843 -0.0951,-0.270609 -0.1755,-0.382624 -0.0804,-0.112052 -0.16956,-0.250302 -0.19808,-0.307316 -0.0412,-0.08233 -0.0982,-0.0945 -0.27707,-0.05882 -0.12387,0.02454 -0.2522,0.08608 -0.28516,0.13662 -0.033,0.05058 -0.21159,0.293895 -0.39695,0.540863 -0.32562,0.433859 -0.33713,0.460638 -0.34062,0.792598 -0.004,0.345354 -0.10418,0.685538 -0.19196,0.649449 -0.0671,-0.02754 -0.49593,-1.249958 -0.53238,-1.517692 -0.0565,-0.415032 -0.11239,-0.518504 -0.25608,-0.474032 -0.0978,0.03035 -0.13846,0.01124 -0.16512,-0.07849 -0.0195,-0.06529 -0.12686,-0.216677 -0.23865,-0.336503 -0.19445,-0.208406 -0.22199,-0.218175 -0.63524,-0.225481 -0.32974,-0.0056 -0.45534,-0.03372 -0.53067,-0.117804 -0.0556,-0.06219 -0.18168,-0.110085 -0.28905,-0.110085 -0.15342,0 -0.23119,-0.05039 -0.40092,-0.259622 -0.14251,-0.175707 -0.24726,-0.253187 -0.32405,-0.239718 -0.19277,0.03381 -0.15938,0.249272 0.10467,0.675122 0.19328,0.311738 0.27772,0.399531 0.38433,0.399531 0.0752,0 0.16393,-0.04056 0.1973,-0.0902 0.0512,-0.07606 0.0925,-0.06463 0.26558,0.07531 0.11271,0.09095 0.20492,0.201803 0.20492,0.246294 0,0.186432 -0.23567,0.5505 -0.45953,0.709891 -0.13222,0.09408 -0.25528,0.197756 -0.27345,0.230267 -0.0459,0.08214 -0.78813,0.481844 -0.83341,0.448855 -0.0203,-0.0147 -0.0523,-0.133679 -0.0711,-0.264333 -0.0364,-0.252148 -0.17111,-0.568916 -0.36822,-0.865629 -0.066,-0.09942 -0.12003,-0.226109 -0.12003,-0.281625 0,-0.140273 -0.4704,-0.975948 -0.54932,-0.975948 -0.0354,0 -0.10247,-0.01808 -0.14903,-0.04 -0.12469,-0.05901 -0.0581,0.224141 0.18687,0.793722 0.11022,0.256316 0.20039,0.518523 0.20039,0.582665 0,0.06416 0.0435,0.185252 0.0966,0.269092 0.0531,0.08383 0.1127,0.215993 0.13243,0.293651 0.0197,0.07765 0.12801,0.231176 0.24058,0.341102 0.11259,0.109944 0.21842,0.267199 0.23516,0.349485 0.0625,0.306698 0.16895,0.356594 0.53601,0.251014 0.18133,-0.05208 0.34135,-0.08046 0.35561,-0.06276 0.0143,0.0177 -0.0504,0.247839 -0.14372,0.511667 -0.11725,0.331567 -0.24365,0.565347 -0.40932,0.757071 -0.31276,0.36197 -0.60149,0.801252 -0.70851,1.077968 -0.074,0.191434 -0.0773,0.277091 -0.024,0.632721 0.11833,0.790827 0.12312,1.124736 0.0177,1.236254 -0.0523,0.05536 -0.20581,0.219505 -0.3411,0.36479 l -0.24599,0.264174 0.0323,0.337927 c 0.0314,0.329684 0.0282,0.340437 -0.12991,0.441286 -0.1104,0.07034 -0.16213,0.150334 -0.16213,0.250574 0,0.186348 -0.26249,0.678579 -0.49753,0.933013 -0.11958,0.129464 -0.23612,0.195461 -0.3468,0.196472 -0.0917,7.03e-4 -0.2524,0.02613 -0.35713,0.0562 -0.12439,0.03569 -0.20979,0.03072 -0.24628,-0.01433 z m 1.08976,-2.639542 c 0.0601,-0.08926 0.0564,-0.100119 -0.0282,-0.0799 -0.0538,0.01264 -0.10746,0.05929 -0.11933,0.103201 -0.0308,0.114019 0.0654,0.09885 0.14756,-0.02332 z m 0.77275,-0.719305 c 0,-0.09661 -0.0329,-0.231251 -0.0731,-0.299046 -0.0686,-0.115705 -0.0754,-0.10854 -0.10958,0.116267 -0.0238,0.156553 -0.0144,0.272351 0.0271,0.334096 0.0865,0.128481 0.15555,0.06126 0.15555,-0.151373 z m -0.72198,-0.537397 c -0.007,-0.07643 -0.0775,-0.06163 -0.0998,0.02079 -0.0114,0.04215 0.007,0.06519 0.0415,0.05114 0.0342,-0.01405 0.0605,-0.04646 0.0583,-0.07194 z m 0.3072,-0.161414 c 0,-0.0281 -0.0215,-0.07849 -0.0478,-0.111911 -0.0263,-0.03344 -0.0682,-0.159447 -0.0931,-0.280107 -0.0615,-0.297669 -0.17017,-0.333347 -0.17017,-0.05592 0,0.240506 0.12238,0.498966 0.23625,0.498966 0.0411,0 0.0748,-0.02304 0.0748,-0.05114 z m 0.30306,-1.03462 c 0.0405,-0.143355 0.0374,-0.211272 -0.0125,-0.272829 -0.0366,-0.04505 -0.0771,-0.121466 -0.0902,-0.169741 -0.0346,-0.128059 -0.35587,-0.160533 -0.35587,-0.03597 0,0.07231 0.0341,0.08589 0.13638,0.05433 0.075,-0.02314 0.12676,-0.01658 0.115,0.0147 -0.0118,0.03128 -0.0528,0.134241 -0.0914,0.228684 -0.0899,0.220527 -0.0417,0.371647 0.11844,0.371647 0.0934,0 0.14017,-0.04955 0.18013,-0.190853 z m 0.24467,-0.94502 c -0.017,-0.02089 -0.0576,-0.0056 -0.0901,0.03466 -0.0443,0.05461 -0.0409,0.10026 0.0138,0.182067 0.0676,0.101094 0.0742,0.09843 0.0901,-0.03466 0.009,-0.07924 0.003,-0.161058 -0.0138,-0.182076 z m -2.47798,-1.369119 c -0.0321,-0.118515 -0.14367,-0.138175 -0.14367,-0.02529 0,0.05564 0.0369,0.101243 0.0821,0.101243 0.0452,0 0.0728,-0.03409 0.0616,-0.07596 z m 2.00802,-1.522159 c 0.0177,-0.03513 0.007,-0.06388 -0.0229,-0.06388 -0.0302,0 -0.0549,0.02875 -0.0549,0.06388 0,0.03522 0.0103,0.06388 0.0229,0.06388 0.0126,0 0.0373,-0.02875 0.0549,-0.06388 z m 2.06968,-2.148267 c 0.0901,-0.04271 0.10921,-0.320579 0.0323,-0.470444 -0.0298,-0.05798 -0.0292,-0.121878 0.002,-0.16768 0.0663,-0.09843 0.009,-0.268258 -0.10551,-0.313096 -0.0506,-0.01976 -0.13197,-0.09039 -0.18074,-0.156824 -0.0834,-0.113738 -0.0835,-0.130589 -6.3e-4,-0.286345 0.071,-0.13353 0.0756,-0.183988 0.0237,-0.261093 -0.0913,-0.135637 -0.25124,-0.118506 -0.4499,0.04833 -0.22211,0.186413 -0.22739,0.413253 -0.0166,0.709367 0.11177,0.156946 0.15555,0.28376 0.15555,0.450616 0,0.193382 0.0281,0.253393 0.1685,0.35887 0.17976,0.135084 0.24167,0.149846 0.37166,0.08833 z m -1.08457,-0.344745 c 0.0177,-0.03513 0.007,-0.06388 -0.0229,-0.06388 -0.0302,0 -0.0549,0.02875 -0.0549,0.06388 0,0.03522 0.0103,0.06388 0.0229,0.06388 0.0126,0 0.0373,-0.02875 0.0549,-0.06388 z m 3.51543,-0.606391 c 0.006,-0.03466 -0.0306,-0.07268 -0.0805,-0.08449 -0.0568,-0.01405 -0.0907,0.01798 -0.0907,0.08364 0,0.111219 0.15323,0.112062 0.17125,7.03e-4 z m -1.84005,-0.432351 c -0.0121,-0.15408 -0.0416,-0.20775 -0.11429,-0.20775 -0.054,0 -0.1218,0.04646 -0.15083,0.10321 -0.0797,0.155635 -0.007,0.312309 0.14683,0.312309 0.12055,0 0.13284,-0.02164 0.11829,-0.207741 z m 1.40573,-0.138175 c 0.0434,-0.06444 0.0446,-0.102498 0.005,-0.133399 -0.0601,-0.0458 -0.20765,0.07315 -0.20765,0.167456 0,0.08833 0.13655,0.06547 0.20357,-0.0341 z m -3.21771,-0.392506 c 0.0164,-0.104193 0.007,-0.108961 -0.0648,-0.03484 -0.0991,0.101383 -0.11143,0.219908 -0.019,0.181936 0.0356,-0.01461 0.0733,-0.08083 0.0838,-0.147111 z m 4.01737,0.0019 c -0.0161,-0.05152 -0.05,-0.0938 -0.0755,-0.0938 -0.0532,0 -0.0626,0.150408 -0.0132,0.211328 0.0553,0.06809 0.11983,-0.01723 0.0886,-0.117531 z m 0.91516,0.06603 c 0,-0.05264 -0.022,-0.0959 -0.0488,-0.0959 -0.0654,0 -0.1122,0.09984 -0.0708,0.150886 0.0584,0.07203 0.11957,0.04384 0.11957,-0.05508 z m 1.13796,-0.63569 c 0.0877,-0.115143 0.11031,-0.199282 0.0858,-0.319624 -0.046,-0.225996 -0.18223,-0.207647 -0.22073,0.02979 -0.0172,0.106151 -0.0516,0.208574 -0.0765,0.227504 -0.0707,0.05395 -0.0528,0.218625 0.0236,0.218625 0.0379,0 0.12231,-0.07034 0.18781,-0.156272 z m -6.73753,-0.900472 c 0,-0.102077 -0.13779,-0.200988 -0.19011,-0.13648 -0.0166,0.02032 -0.0163,0.08149 6.3e-4,0.135777 0.0397,0.127788 0.1895,0.12835 0.1895,7.03e-4 z m 1.60728,-0.06191 c 0,-0.05283 -0.022,-0.0959 -0.0488,-0.0959 -0.0654,0 -0.1122,0.09984 -0.0708,0.150895 0.0584,0.07203 0.11957,0.04384 0.11957,-0.05508 z m -1.9415,-0.357681 c 0.0534,-0.106573 -0.0668,-0.228806 -0.13827,-0.14062 -0.0598,0.07371 -0.0223,0.21012 0.0577,0.21012 0.0251,0 0.0614,-0.03128 0.0806,-0.0695 z m 1.44879,13.402175 c -0.0141,-0.05536 -0.0373,-0.145566 -0.0513,-0.200529 -0.0141,-0.05507 0.0115,-0.188399 0.057,-0.296498 0.0496,-0.118375 0.0706,-0.269888 0.0525,-0.380826 -0.0222,-0.137192 -0.003,-0.212527 0.0758,-0.294784 0.0582,-0.06079 0.18526,-0.208687 0.28249,-0.328626 0.26477,-0.32664 0.26762,-0.154276 0.0126,0.763131 -0.15951,0.573889 -0.24697,0.802808 -0.31241,0.81785 -0.05,0.01124 -0.10248,-0.02445 -0.11666,-0.07971 z m 10.90804,-2.561791 c -0.0821,-0.05508 -0.14797,-0.166565 -0.16677,-0.282355 -0.0208,-0.12834 -0.0843,-0.225378 -0.19298,-0.294644 -0.15581,-0.09928 -0.15852,-0.107987 -0.0715,-0.226483 0.11378,-0.155007 0.15932,-0.154024 0.5174,0.01124 0.33474,0.154408 0.64579,0.462343 0.64579,0.639295 0,0.140443 -0.0201,0.146653 -0.16516,0.05096 -0.0857,-0.05657 -0.13525,-0.04412 -0.25374,0.06388 -0.17154,0.156366 -0.14199,0.152769 -0.31306,0.03822 z m -3.31217,-0.09576 c -0.0665,-0.05292 -0.0646,-0.06219 0.013,-0.06294 0.0499,-4.78e-4 0.0907,0.02782 0.0907,0.06294 0,0.07793 -0.006,0.07793 -0.10369,0 z M 607.1295,45.32634 c -0.16672,-0.22002 -0.45367,-0.883612 -0.40698,-0.94116 0.0595,-0.07325 0.34664,0.19326 0.3959,0.367468 0.0274,0.09675 0.098,0.226877 0.15702,0.289165 0.11319,0.119498 0.14399,0.368958 0.054,0.437511 -0.0293,0.02229 -0.11928,-0.04646 -0.19996,-0.152984 z m 1.05053,-0.181392 c -0.12929,-0.02004 -0.18006,-0.07484 -0.25212,-0.271874 -0.0912,-0.249394 -0.0752,-0.385659 0.0453,-0.385659 0.0362,0 0.20946,-0.160186 0.38495,-0.355985 0.17549,-0.195798 0.33698,-0.342347 0.35887,-0.325666 0.0718,0.05461 0.0298,0.777359 -0.057,0.984622 -0.0467,0.111209 -0.0847,0.24665 -0.0847,0.301135 0,0.0997 -0.0521,0.106713 -0.39521,0.05339 z m 0.84309,-0.11416 c 0.0164,-0.05283 0.0507,-0.0959 0.0761,-0.0959 0.0254,0 0.0463,0.04309 0.0463,0.0959 0,0.05264 -0.0343,0.0959 -0.0761,0.0959 -0.0464,0 -0.0645,-0.03747 -0.0463,-0.0959 z m 1.44457,-0.0959 c -0.0177,-0.03512 -0.007,-0.06407 0.0229,-0.06407 0.0302,0 0.0549,0.02875 0.0549,0.06407 0,0.03513 -0.0103,0.06388 -0.0229,0.06388 -0.0126,0 -0.0373,-0.02876 -0.0549,-0.06388 z m -3.53102,-0.868926 c -0.0878,-0.25892 -0.0795,-0.366813 0.0221,-0.288996 0.0836,0.06407 0.17542,0.518673 0.10479,0.518673 -0.027,0 -0.0841,-0.103341 -0.12687,-0.229677 z m -2.40557,-0.57313 c 0,-0.05489 0.0233,-0.08186 0.0519,-0.06023 0.0285,0.02173 0.0519,0.0666 0.0519,0.0997 0,0.03316 -0.0233,0.06023 -0.0519,0.06023 -0.0285,0 -0.0519,-0.04477 -0.0519,-0.0997 z m 4.9774,0.0028 c 0,-0.05283 0.0351,-0.09591 0.0778,-0.09591 0.0427,0 0.0778,0.04327 0.0778,0.09591 0,0.05264 -0.0351,0.0959 -0.0778,0.0959 -0.0427,0 -0.0778,-0.04327 -0.0778,-0.0959 z M 585.8918,43.01621 c 0.0177,-0.03522 0.0424,-0.06388 0.0549,-0.06388 0.0126,0 0.0229,0.02875 0.0229,0.06388 0,0.03513 -0.0247,0.06388 -0.0549,0.06388 -0.0302,0 -0.0405,-0.02875 -0.0229,-0.06388 z m -0.12962,-0.319708 c -0.0713,-0.06884 -0.21128,-0.157199 -0.31109,-0.196436 -0.0998,-0.03934 -0.2315,-0.144357 -0.29266,-0.23362 -0.0907,-0.132275 -0.16247,-0.164646 -0.38886,-0.174949 -0.15271,-0.0066 -0.34766,-0.06154 -0.43321,-0.121175 -0.46299,-0.323212 -0.4655,-0.326406 -0.49426,-0.629536 -0.0152,-0.160158 -0.0878,-0.402443 -0.16125,-0.538399 -0.2507,-0.463822 -0.35553,-0.709638 -0.35553,-0.833792 0,-0.06828 -0.0336,-0.179903 -0.0746,-0.248148 -0.0637,-0.105879 -0.0902,-0.112333 -0.18147,-0.04365 -0.0971,0.07306 -0.10685,0.06547 -0.10685,-0.08299 0,-0.09464 -0.0578,-0.229443 -0.13723,-0.320223 -0.10387,-0.118656 -0.14348,-0.236965 -0.16292,-0.486462 -0.0277,-0.354843 0.0414,-0.584754 0.30412,-1.012628 0.0756,-0.123011 0.17463,-0.313555 0.22017,-0.42334 0.0455,-0.109813 0.13243,-0.215646 0.19308,-0.235185 0.14958,-0.04814 0.11409,-0.270178 -0.0422,-0.263387 -0.10413,0.0047 -0.11171,-0.01808 -0.0858,-0.255698 0.0156,-0.143374 0.0383,-0.322097 0.0506,-0.397179 0.0122,-0.07512 -0.0126,-0.172092 -0.0551,-0.215562 -0.0425,-0.04337 -0.0772,-0.171774 -0.0772,-0.285062 0,-0.254068 -0.10986,-0.378268 -0.41479,-0.468955 -0.31546,-0.0938 -0.96192,0.0075 -1.15151,0.179285 -0.0772,0.07025 -0.17796,0.127778 -0.22376,0.127778 -0.15937,0 -0.38448,-0.195939 -0.38676,-0.336643 -9.3e-4,-0.06969 0.30225,-0.224882 0.52545,-0.268773 0.10406,-0.02051 0.21962,-0.08243 0.25678,-0.137614 0.0568,-0.08439 0.0515,-0.112052 -0.0337,-0.174096 -0.089,-0.06491 -0.073,-0.07755 0.13207,-0.105739 0.18561,-0.02538 0.23644,-0.05882 0.24857,-0.163503 0.0167,-0.143926 0.3332,-0.301856 0.82344,-0.410911 0.28125,-0.06266 1.2024,0.05039 1.47616,0.18114 0.0755,0.03606 0.14824,0.05199 0.16165,0.03541 0.0134,-0.01658 0.16822,-0.05854 0.34403,-0.09348 0.39149,-0.07784 1.12011,0.01939 1.2523,0.166818 0.12957,0.144573 0.63748,0.105449 0.6616,-0.05095 0.0134,-0.08655 -0.0182,-0.111912 -0.13903,-0.111912 -0.18982,0 -0.26176,-0.107556 -0.0984,-0.147129 l 0.11742,-0.02847 -0.11307,-0.04636 c -0.0622,-0.02538 -0.12561,-0.08664 -0.14095,-0.135928 -0.0153,-0.04927 -0.0927,-0.09039 -0.17209,-0.09151 -0.13993,-9.37e-4 -0.14113,-0.0056 -0.0405,-0.09871 0.11846,-0.110507 0.3975,-0.07568 0.65271,0.08121 0.0861,0.05292 0.238,0.09914 0.33749,0.102639 0.15144,0.0056 0.1784,0.02763 0.16567,0.137332 -0.0122,0.104887 -0.0594,0.135085 -0.23556,0.150736 -0.25093,0.02248 -0.27714,0.09142 -0.0916,0.24117 0.1043,0.0842 0.20012,0.09534 0.50551,0.05826 0.42115,-0.05095 0.50645,-0.106151 0.50645,-0.32693 0,-0.138316 0.0319,-0.170106 0.14258,-0.142184 0.0214,0.0056 0.0315,0.06322 0.0226,0.12834 -0.009,0.06519 0.0214,0.164945 0.0674,0.221688 0.13981,0.172372 0.0692,0.281315 -0.31036,0.478696 -0.59436,0.309097 -0.68049,0.366261 -0.85516,0.567426 -0.10667,0.122861 -0.15558,0.228741 -0.13548,0.293314 0.0173,0.05564 0.0315,0.126233 0.0315,0.15703 0,0.03072 0.15078,0.148507 0.33508,0.26158 0.31647,0.194188 0.33473,0.217567 0.32854,0.420568 -0.004,0.118225 0.0182,0.245525 0.0485,0.282889 0.0914,0.112754 0.27024,-0.0056 0.34572,-0.22757 0.075,-0.221379 0.52184,-0.590946 0.5783,-0.478332 0.0353,0.07034 0.12662,0.01517 0.12662,-0.07643 0,-0.03466 -0.0409,-0.05451 -0.0907,-0.04421 -0.13851,0.02866 -0.13984,-0.215637 -0.003,-0.480607 0.0996,-0.19223 0.14973,-0.230773 0.30334,-0.23304 0.21322,-0.0028 0.30849,0.08945 0.30849,0.299748 0,0.189608 0.12709,0.250209 0.32828,0.1566 0.0866,-0.04028 0.16555,-0.06332 0.17546,-0.05095 0.01,0.01264 0.0246,0.125671 0.0327,0.252035 0.0103,0.160955 0.0572,0.271115 0.15672,0.367581 0.1845,0.17893 0.16478,0.381116 -0.0451,0.462034 -0.0856,0.03297 -0.33236,0.07971 -0.54846,0.104053 -0.28413,0.03175 -0.43861,0.08411 -0.55797,0.188933 -0.18636,0.163596 -0.17893,0.261017 0.0164,0.21499 0.11233,-0.02641 0.13086,-0.0084 0.13086,0.132696 0,0.08982 0.0233,0.181262 0.0519,0.203002 0.10142,0.07727 0.0498,0.161591 -0.0753,0.122861 -0.19831,-0.06135 -0.63263,0.145874 -0.75699,0.361212 -0.0594,0.102779 -0.16139,0.203338 -0.22678,0.22357 -0.14723,0.04561 -0.58425,0.590252 -0.60836,0.758251 -0.01,0.068 -0.14604,0.232609 -0.30285,0.365923 -0.42684,0.362823 -0.53499,0.539542 -0.49936,0.815977 0.0162,0.125811 0.007,0.271845 -0.0199,0.324589 -0.038,0.0739 -0.0497,0.05461 -0.0502,-0.08411 -9.3e-4,-0.321161 -0.08,-0.414311 -0.38986,-0.462043 -0.20323,-0.03128 -0.30916,-0.02004 -0.3669,0.03906 -0.0454,0.04646 -0.18122,0.07671 -0.30832,0.06856 -0.2218,-0.01414 -0.5969,0.159681 -0.67327,0.312018 -0.0185,0.03681 -0.0784,0.25995 -0.13304,0.495697 -0.10608,0.457341 -0.0783,0.7426 0.0964,0.989202 0.12222,0.172495 0.45333,0.148048 0.60994,-0.04505 0.07,-0.08636 0.12727,-0.186966 0.12727,-0.22372 0,-0.03681 0.0467,-0.06688 0.10369,-0.06688 0.12664,0 0.12664,0.02838 0,0.351573 -0.17291,0.441371 -0.13919,0.518683 0.21217,0.486331 0.18411,-0.01695 0.24968,0.105317 0.1935,0.36065 -0.053,0.241198 -0.0754,0.248354 -0.25012,0.07971 z M 583.9475,38.22576 c 0,-0.03316 -0.0233,-0.07793 -0.0519,-0.09969 -0.0285,-0.02173 -0.0519,0.0056 -0.0519,0.06013 0,0.05489 0.0233,0.0997 0.0519,0.0997 0.0285,0 0.0519,-0.02707 0.0519,-0.06023 z m 3.36305,-0.123142 c 0.1037,-0.06575 0.2583,-0.145397 0.34357,-0.177103 0.20052,-0.07456 0.2438,-0.278758 0.0591,-0.278758 -0.0718,0 -0.16097,-0.05292 -0.19823,-0.117531 -0.0373,-0.06472 -0.13191,-0.137042 -0.21033,-0.16103 -0.0808,-0.02454 -0.14258,-0.08748 -0.14258,-0.144938 0,-0.05573 -0.0572,-0.18528 -0.1272,-0.287788 -0.12099,-0.17729 -0.12984,-0.180325 -0.18107,-0.06238 -0.0296,0.06828 -0.13571,0.157377 -0.23574,0.198084 -0.10002,0.04074 -0.18185,0.100541 -0.18185,0.132977 0,0.03241 -6.3e-4,0.08065 -0.002,0.106863 -9.4e-4,0.02641 0.07,0.06238 0.15811,0.0799 l 0.16017,0.03203 -0.1322,0.220171 c -0.14715,0.245066 -0.17601,0.514935 -0.0551,0.514935 0.0425,0 0.1348,-0.112614 0.20529,-0.250321 0.0705,-0.137604 0.14995,-0.266919 0.17659,-0.287207 0.0737,-0.0562 0.12436,0.281334 0.0572,0.381032 -0.0628,0.09338 -0.0265,0.220433 0.063,0.220433 0.0301,0 0.13953,-0.05376 0.24322,-0.119499 z m -1.10586,-1.350779 c 0.0391,0 0.0954,-0.107847 0.12509,-0.239737 0.0847,-0.375908 0.0743,-0.419491 -0.0877,-0.369351 -0.19454,0.06013 -0.26011,0.138315 -0.29892,0.356228 -0.0394,0.220705 0.007,0.339463 0.11369,0.289165 0.0422,-0.01995 0.10876,-0.03625 0.14786,-0.03625 z m 0.38705,0 c 0,-0.03522 -0.0103,-0.06388 -0.0229,-0.06388 -0.0126,0 -0.0373,0.02876 -0.0549,0.06388 -0.0177,0.03513 -0.007,0.06388 0.0229,0.06388 0.0302,0 0.0549,-0.02876 0.0549,-0.06388 z m 1.91139,-0.09914 c 0.0164,-0.104343 0.007,-0.10897 -0.0648,-0.03484 -0.0991,0.101383 -0.11144,0.219908 -0.019,0.181936 0.0356,-0.01461 0.0733,-0.08083 0.0838,-0.147111 z m 0.62916,-0.344567 c 0,-0.03316 -0.0233,-0.07793 -0.0519,-0.0997 -0.0285,-0.02164 -0.0519,0.0056 -0.0519,0.06023 0,0.05489 0.0233,0.09969 0.0519,0.09969 0.0285,0 0.0519,-0.02707 0.0519,-0.06013 z m -2.43685,-0.131572 c 0,-0.03513 -0.0233,-0.06388 -0.0519,-0.06388 -0.0285,0 -0.0519,0.02875 -0.0519,0.06388 0,0.03522 0.0233,0.06388 0.0519,0.06388 0.0285,0 0.0519,-0.02876 0.0519,-0.06388 z m -1.11472,-0.255679 c 0,-0.04693 -0.0292,-0.09717 -0.0648,-0.111912 -0.0385,-0.01583 -0.0648,0.02951 -0.0648,0.111912 0,0.08243 0.0263,0.127638 0.0648,0.111912 0.0356,-0.01461 0.0648,-0.065 0.0648,-0.111912 z m 0.74157,-0.231579 c 0.008,-0.07521 -0.0184,-0.151832 -0.0611,-0.171979 -0.0809,-0.03831 -0.1497,0.03934 -0.20556,0.231981 -0.028,0.09647 -0.01,0.112614 0.10861,0.09591 0.0989,-0.01405 0.14706,-0.06154 0.15797,-0.155879 z m 0.3213,0.07175 c 0,-0.0532 -0.0461,-0.0959 -0.10369,-0.0959 -0.0576,0 -0.10369,0.04252 -0.10369,0.0959 0,0.0532 0.0461,0.09591 0.10369,0.09591 0.0576,0 0.10369,-0.04271 0.10369,-0.09591 z m -0.77772,-0.351574 c 0,-0.03512 -0.0336,-0.06388 -0.0747,-0.06388 -0.041,0 -0.0891,0.02876 -0.10676,0.06388 -0.0177,0.03522 0.016,0.06388 0.0747,0.06388 0.0587,0 0.10675,-0.02875 0.10675,-0.06388 z m -0.25582,-0.194028 c 0.11928,-0.07868 0.1318,-0.242537 0.0225,-0.294241 -0.0427,-0.02023 -0.0778,-0.09207 -0.0778,-0.159812 0,-0.06763 0.035,-0.139571 0.0778,-0.159803 0.12696,-0.06013 0.0963,-0.278936 -0.0389,-0.277934 -0.21931,9.37e-4 -0.34998,0.07568 -0.34998,0.198347 0,0.0858 0.0372,0.120332 0.12961,0.120332 0.0713,0 0.12963,0.02875 0.12963,0.06388 0,0.03512 -0.0249,0.06388 -0.0554,0.06388 -0.0306,0 -0.0415,0.05376 -0.0244,0.120342 0.0195,0.07596 0.002,0.134101 -0.0483,0.157798 -0.0437,0.02061 -0.0793,0.08158 -0.0793,0.135366 0,0.113035 0.1659,0.129745 0.3145,0.03175 z m 0.87799,-0.0296 c 0,-0.05283 -0.0227,-0.0959 -0.0506,-0.0959 -0.0285,0 -0.0369,-0.08355 -0.0195,-0.191771 0.0246,-0.151326 0.013,-0.191762 -0.0548,-0.191762 -0.10881,0 -0.16697,0.177272 -0.0895,0.272773 0.0323,0.0399 0.0587,0.124126 0.0587,0.187472 0,0.06332 0.0351,0.115143 0.0778,0.115143 0.0427,0 0.0778,-0.04327 0.0778,-0.0959 z m 0.21398,-0.07128 c 0.0509,-0.05676 0.16026,-0.107425 0.24307,-0.112623 0.18542,-0.01124 0.3472,-0.160608 0.27322,-0.25182 -0.0346,-0.04252 -0.0763,-0.03887 -0.12525,0.01124 -0.0404,0.04131 -0.11075,0.05742 -0.1564,0.03578 -0.0926,-0.04365 -0.38931,0.212939 -0.39389,0.340699 -0.004,0.108118 0.0483,0.100531 0.15925,-0.02332 z m 22.288,6.939213 c 0,-0.0725 0.0223,-0.114581 0.0496,-0.0938 0.0273,0.02079 0.0365,0.07999 0.0204,0.131572 -0.0411,0.132124 -0.0699,0.116538 -0.0699,-0.03775 z M 587.51528,41.69429 c 0.0374,-0.01836 0.0822,-0.01611 0.0994,0.0056 0.0172,0.02135 -0.0134,0.03634 -0.0681,0.03353 -0.0604,-0.0028 -0.0727,-0.01808 -0.0313,-0.03859 z m 22.48313,-2.518517 c -0.0141,-0.0281 0.0449,-0.140133 0.13107,-0.248926 0.0862,-0.10869 0.15949,-0.261421 0.16287,-0.339304 0.005,-0.11192 0.0144,-0.101383 0.0457,0.05011 0.0786,0.381097 0.0627,0.443927 -0.13107,0.518729 -0.10059,0.03878 -0.19446,0.04758 -0.20858,0.01939 z m 0.0804,-1.337123 c 0,-0.08093 0.10595,-0.08093 0.2074,0 0.0606,0.04833 0.0463,0.06219 -0.0648,0.06294 -0.0785,4.78e-4 -0.14259,-0.02782 -0.14259,-0.06294 z M 589.9108,37.087546 c 0.003,-0.151364 0.0932,-0.218597 0.2,-0.14816 0.15747,0.103903 0.1362,0.196116 -0.0453,0.196116 -0.0856,0 -0.15518,-0.02145 -0.15475,-0.04786 z m 5.39139,-0.560251 c 0,-0.0532 0.0281,-0.152301 0.0625,-0.22018 0.0534,-0.105308 0.042,-0.146886 -0.0772,-0.28316 -0.0856,-0.09773 -0.12778,-0.198319 -0.10883,-0.259239 0.0429,-0.138035 0.17543,-0.125109 0.17543,0.01686 0,0.06407 0.0694,0.229453 0.15409,0.367553 0.21275,0.346647 0.20613,0.474847 -0.0245,0.474847 -0.12746,0 -0.18147,-0.02875 -0.18147,-0.09676 z m -0.51848,-0.143908 c 0,-0.120473 0.0921,-0.270722 0.16591,-0.270722 0.0864,0 0.0369,0.25418 -0.0622,0.319615 -0.0862,0.05685 -0.10369,0.04861 -0.10369,-0.04889 z m -3.25421,-1.231899 c -0.13634,-0.06753 -0.2196,-0.297838 -0.2196,-0.607459 0,-0.177252 0.0289,-0.236337 0.15479,-0.316617 0.18085,-0.115275 0.26627,-0.402744 0.14464,-0.486668 -0.0473,-0.0326 -0.0691,-0.112474 -0.0552,-0.202168 0.0136,-0.08758 -0.0186,-0.211497 -0.0785,-0.302783 -0.0828,-0.126233 -0.15016,-0.154998 -0.3667,-0.157002 -0.32396,-0.0028 -0.37398,-0.116689 -0.0731,-0.166266 0.12017,-0.01976 0.26067,-0.08299 0.31223,-0.140554 0.0568,-0.06332 0.22649,-0.118656 0.42962,-0.140283 1.70139,-0.180784 2.24813,-0.195068 2.52248,-0.06603 0.22261,0.104896 0.22729,0.112333 0.12427,0.201363 -0.0621,0.05367 -0.12045,0.195798 -0.13894,0.338432 -0.0253,0.195105 -0.0684,0.270244 -0.20841,0.363188 -0.099,0.06575 -0.16545,0.152675 -0.15135,0.197972 0.0161,0.0517 -0.021,0.08074 -0.10285,0.08074 -0.0919,0 -0.12798,0.03484 -0.12798,0.123564 0,0.132696 -0.053,0.162294 -0.41479,0.231176 -0.12832,0.02445 -0.29857,0.101374 -0.37832,0.170958 -0.0798,0.0695 -0.23803,0.141913 -0.35172,0.160721 -0.16129,0.0267 -0.26041,0.103201 -0.45124,0.348118 -0.13449,0.172681 -0.25232,0.341354 -0.26182,0.37484 -0.0212,0.07456 -0.15063,0.07231 -0.30752,-0.0056 z m -2.03517,-0.38327 c -0.0554,-0.127779 -0.0446,-0.160637 0.0989,-0.299102 0.0886,-0.08552 0.16122,-0.191209 0.16122,-0.234792 0,-0.149303 -0.2986,-0.358964 -0.51126,-0.358964 -0.17688,0 -0.21815,0.02876 -0.3069,0.214251 -0.0564,0.117812 -0.15201,0.230202 -0.21251,0.249703 -0.14507,0.04674 -0.13892,-9.37e-4 0.0196,-0.155747 0.12955,-0.125681 0.17563,-0.308207 0.0778,-0.308207 -0.0285,0 -0.0519,-0.04393 -0.0519,-0.09787 0,-0.131712 0.15509,-0.198224 0.20946,-0.08973 0.0355,0.07091 0.0614,0.0666 0.14246,-0.02388 0.12107,-0.135075 0.58939,-0.11135 0.7264,0.0369 0.0485,0.05255 0.14075,0.115143 0.20491,0.13929 0.077,0.02894 0.11666,0.09395 0.11666,0.191546 0,0.08158 0.0522,0.191349 0.11665,0.245282 0.0918,0.07681 0.10332,0.114581 0.054,0.177684 -0.0502,0.06416 -0.0784,0.06388 -0.14191,-0.0019 -0.13365,-0.13677 -0.24969,-0.0326 -0.21026,0.188793 0.0257,0.144526 0.0156,0.191817 -0.0412,0.191817 -0.0414,0 -0.14617,0.01752 -0.23265,0.03878 -0.12799,0.03157 -0.16884,0.01264 -0.21955,-0.104756 z m 4.47277,-0.04028 c -0.12911,-0.06416 -0.0598,-0.132828 0.17387,-0.172382 0.30517,-0.0517 0.40628,0.02164 0.17324,0.12539 -0.19663,0.08758 -0.25071,0.09492 -0.34711,0.04693 z m -5.58608,-0.08645 c 0.0179,-0.03578 0.0543,-0.04843 0.0808,-0.02819 0.0719,0.05479 0.0585,0.0931 -0.0325,0.0931 -0.0444,0 -0.0662,-0.02922 -0.0482,-0.065 z m 23.20139,-0.126795 c -0.0632,-0.05039 -0.0566,-0.06219 0.0358,-0.06304 0.0625,-4.77e-4 0.12802,0.02782 0.14564,0.06304 0.0408,0.08149 -0.0793,0.08149 -0.18146,0 z m -11.51023,-0.84875 c 0,-0.114581 0.14993,-0.365802 0.21837,-0.365802 0.0313,0 0.0183,0.05264 -0.0289,0.11697 -0.0472,0.06435 -0.0858,0.164982 -0.0858,0.223739 0,0.05882 -0.0233,0.106853 -0.0519,0.106853 -0.0285,0 -0.0519,-0.03681 -0.0519,-0.08168 z m -12.05462,-0.04618 c -0.0177,-0.03513 0.006,-0.06388 0.0519,-0.06388 0.0461,0 0.0695,0.02875 0.0519,0.06388 -0.0177,0.03522 -0.041,0.06388 -0.0519,0.06388 -0.0109,0 -0.0342,-0.02876 -0.0519,-0.06388 z m 1.63321,-0.671198 c -0.0355,-0.05283 -0.13168,-0.09591 -0.21374,-0.09591 -0.0821,0 -0.1492,-0.02819 -0.1492,-0.06266 0,-0.09829 0.22352,-0.142634 0.3708,-0.07362 0.0963,0.04524 0.15344,0.0399 0.20537,-0.01911 0.0968,-0.109954 1.23118,-0.262722 1.30204,-0.17537 0.0356,0.04393 -0.0289,0.07971 -0.19986,0.110788 -0.1389,0.02529 -0.42699,0.1282 -0.64021,0.228797 -0.43787,0.20672 -0.58217,0.22534 -0.6752,0.0872 z m 7.3624,-0.0251 c 0,-0.07053 0.13452,-0.139299 0.17498,-0.08945 0.0163,0.02004 0.0172,0.06126 0.002,0.09142 -0.0364,0.07259 -0.177,0.0709 -0.177,-9.36e-4 z"
+         style="fill:#000080" />
+    </g>
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1.05488765px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3336-3"
+       width="28.194271"
+       height="28.194271"
+       x="3.3843925"
+       y="20.273464" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000099;stroke-width:2.09308934;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 10.797033,27.568084 c 0,0 4.347909,-5.416046 9.831719,-4.738176 9.36354,1.157455 4.38282,13.029985 4.38282,13.029985 0,0 -6.76125,-4.02388 -11.72699,-0.947635 -5.3800392,3.332895 -0.71874,8.766027 -0.71073,8.765626"
+       id="path4334"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscsc" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2789689"
+       sodipodi:start="0"
+       d="m 14.718975,27.952021 a 3.8901863,3.8901863 0 0 1 -3.886086,3.890184 3.8901863,3.8901863 0 0 1 -3.8942779,-3.881983 3.8901863,3.8901863 0 0 1 3.8778759,-3.898368 3.8901863,3.8901863 0 0 1 3.902453,3.873764"
+       sodipodi:ry="3.8901863"
+       sodipodi:rx="3.8901863"
+       sodipodi:cy="27.952021"
+       sodipodi:cx="10.828789"
+       id="path3339"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2789689"
+       sodipodi:start="0"
+       d="m 29.095747,38.776886 a 3.8901863,3.8901863 0 0 1 -3.886086,3.890184 3.8901863,3.8901863 0 0 1 -3.894278,-3.881983 3.8901863,3.8901863 0 0 1 3.877876,-3.898368 3.8901863,3.8901863 0 0 1 3.902453,3.873764"
+       sodipodi:ry="3.8901863"
+       sodipodi:rx="3.8901863"
+       sodipodi:cy="38.776886"
+       sodipodi:cx="25.205561"
+       id="path3341"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2789689"
+       sodipodi:start="0"
+       d="m 16.664066,43.512768 a 3.8901863,3.8901863 0 0 1 -3.886085,3.890184 3.8901863,3.8901863 0 0 1 -3.8942787,-3.881983 3.8901863,3.8901863 0 0 1 3.8778757,-3.898368 3.8901863,3.8901863 0 0 1 3.902454,3.873764"
+       sodipodi:ry="3.8901863"
+       sodipodi:rx="3.8901863"
+       sodipodi:cy="43.512768"
+       sodipodi:cx="12.77388"
+       id="path3343"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1.07522762px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3336-3-6"
+       width="28.737904"
+       height="28.737904"
+       x="20.998972"
+       y="26.217489" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:1.49735808;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 47.729405,39.538724 c 0,0 -7.486793,0.49912 -11.479743,2.994717 -3.41237,2.132736 7.35042,2.132835 5.490311,3.992955 -1.860111,1.860117 -14.163041,1.205123 -16.400751,2.588133 -1.00074,0.618458 -2.4956,2.495597 -2.4956,2.495597"
+       id="path3078"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc" />
+    <g
+       id="g3015"
+       transform="matrix(0.49911936,0,0,0.49911936,20.679212,-468.55372)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3763"
+         d="m 27.270471,996.11501 25.339695,10.78739 -28.507157,10.7873 3.167462,-21.57469"
+         style="fill:#008000;stroke:#008000;stroke-width:1.34993112;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 20.720056,1034.6463 3.609174,-39.39147 3.609174,0 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.71901649px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+    <rect
+       style="fill:none;stroke:none"
+       id="rect3769"
+       width="19.964775"
+       height="19.964775"
+       x="21.997194"
+       y="28.017811" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1"
+       id="rect3342"
+       width="26.131607"
+       height="25.100101"
+       x="12.50103"
+       y="35.176338" />
+    <rect
+       style="fill:#ffffff;stroke:#000080;stroke-width:0.64200455"
+       id="rect3797"
+       width="25.68018"
+       height="25.68018"
+       x="12.760078"
+       y="35.357586" />
+    <path
+       style="fill:#009cff;fill-opacity:1;stroke:none"
+       d="m 13.084912,60.604322 0,-7.171256 3.12846,-3.585627 3.12847,3.585627 6.25693,-10.756883 6.25693,7.171256 3.12847,-3.585628 3.12847,7.171255 0,7.171256 z"
+       id="path3799"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000080;stroke:none"
+       d="m 12.911052,60.937527 0,-4.161101 3.19553,0 3.19553,-4.1611 3.19553,4.1611 6.39106,-8.322202 6.39106,4.161102 3.19553,4.1611 0,4.161101 z"
+       id="path3815"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff -Nru qmapshack-1.8.1/src/icons/ToggleGis.svg qmapshack-1.9.0/src/icons/ToggleGis.svg
--- qmapshack-1.8.1/src/icons/ToggleGis.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/ToggleGis.svg	2017-07-01 14:40:11.000000000 +0000
@@ -0,0 +1,125 @@
+<?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="ToggleGis.svg"
+   inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_touch/src/icons/48x48/ToggleGis.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="4.4096682"
+     inkscape:cy="34.818224"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     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.12671447px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3336"
+       width="30.114006"
+       height="30.114006"
+       x="21.06686"
+       y="11.871966" />
+    <rect
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.12671447px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3338"
+       width="20.690577"
+       height="20.690577"
+       x="35.816578"
+       y="5.9311075" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1.54111087px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3336-3"
+       width="41.189693"
+       height="41.189693"
+       x="3.9911385"
+       y="18.45553" />
+    <path
+       style="fill:none;stroke:#000080;stroke-width:2.14614534;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 42.303546,37.548698 c 0,0 -10.730727,0.715382 -16.453779,4.292291 -4.890909,3.056826 10.535269,3.056968 7.869198,5.723055 -2.66607,2.666084 -20.29971,1.727289 -23.506998,3.70954 -1.4343443,0.886429 -3.5769101,3.576909 -3.5769101,3.576909"
+       id="path3078"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc" />
+    <g
+       id="g3015"
+       transform="matrix(0.7153818,0,0,0.7153818,3.5328241,-690.69412)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3763"
+         d="m 27.270471,996.11501 25.339695,10.78739 -28.507157,10.7873 3.167462,-21.57469"
+         style="fill:#008000;stroke:#008000;stroke-width:1.34993112;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 20.720056,1034.6463 3.609174,-39.39147 3.609174,0 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.71901649px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+    <rect
+       style="fill:none;stroke:none"
+       id="rect3769"
+       width="28.615273"
+       height="28.615273"
+       x="5.4218798"
+       y="21.03591" />
+    <flowRoot
+       transform="translate(-47.854615,-997.38718)"
+       xml:space="preserve"
+       id="flowRoot3859"
+       style="font-style:normal;font-weight:normal;font-size:12px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><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 -Nru qmapshack-1.8.1/src/icons/ToggleMaps.svg qmapshack-1.9.0/src/icons/ToggleMaps.svg
--- qmapshack-1.8.1/src/icons/ToggleMaps.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/ToggleMaps.svg	2017-07-01 14:40:11.000000000 +0000
@@ -0,0 +1,99 @@
+<?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="ToggleMaps.svg"
+   inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_touch/src/icons/48x48/ToggleMaps.png"
+   inkscape:export-xdpi="67.5"
+   inkscape:export-ydpi="67.5">
+  <defs
+     id="defs3464" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-104.36364"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <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-opacity:1"
+       id="rect3342"
+       width="37.454121"
+       height="35.975674"
+       x="6.8615112"
+       y="20.427578" />
+    <g
+       transform="matrix(1.1054005,0,0,1.1054005,-634.78716,-11.160968)"
+       id="g3865"
+       inkscape:export-filename="/home/oeichler/dateien/cpp/MapRoom/icons/32x32/map.png"
+       inkscape:export-xdpi="82.136177"
+       inkscape:export-ydpi="82.136177">
+      <rect
+         y="28.345903"
+         x="580.99304"
+         height="33.188591"
+         width="33.129997"
+         id="rect3167"
+         style="fill:none;stroke:#000080;stroke-width:1.87165701;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3319"
+         d="m 585.16593,57.119256 c -0.37071,-0.152412 -0.77584,-0.328663 -0.90027,-0.391681 -0.22434,-0.113598 -0.22521,-0.115284 -0.1037,-0.198356 0.0674,-0.04608 0.17632,-0.08477 0.24202,-0.08608 0.0657,-9.37e-4 0.32235,-0.06997 0.57033,-0.15261 0.7605,-0.25358 1.15015,-0.299589 2.03222,-0.239952 0.44199,0.02988 0.83863,0.07203 0.88141,0.0938 0.0427,0.02173 0.11184,0.01264 0.15348,-0.01976 0.0648,-0.05086 0.0615,-0.07868 -0.0221,-0.192586 l -0.0978,-0.133248 0.38503,0.04693 c 0.66965,0.08149 1.82493,0.06332 1.85001,-0.02922 0.0126,-0.04665 -0.0474,-0.111078 -0.14054,-0.151092 -0.20747,-0.08917 -0.17568,-0.21515 0.0543,-0.21515 0.17027,0 0.17676,-0.0084 0.17825,-0.246912 9.4e-4,-0.179969 0.0343,-0.279592 0.1224,-0.367553 0.16565,-0.165357 0.21306,-0.151729 0.21306,0.06126 0,0.100681 0.0463,0.233518 0.10369,0.297566 0.057,0.0636 0.1037,0.150427 0.1037,0.192886 0,0.04243 0.07,0.185776 0.15554,0.318491 0.0856,0.132696 0.15555,0.281212 0.15555,0.329993 0,0.116829 0.15599,0.184999 0.78428,0.342863 1.12727,0.283216 1.57833,0.201849 2.48213,-0.44775 0.15197,-0.109242 0.60114,-0.268576 0.93326,-0.331107 0.18536,-0.03484 0.92031,-0.07568 1.63322,-0.09086 1.92011,-0.04056 2.11597,-0.05198 2.22945,-0.131431 0.057,-0.0399 0.20869,-0.09179 0.33702,-0.115425 0.12832,-0.0236 0.3692,-0.1032 0.53528,-0.176793 0.29326,-0.130027 0.30751,-0.130589 0.49256,-0.02023 0.10482,0.06266 0.3539,0.126374 0.55351,0.141735 0.22666,0.01751 0.43658,0.07643 0.55906,0.156796 0.14847,0.09745 0.24605,0.118365 0.40155,0.08608 0.11298,-0.0236 0.21696,-0.06585 0.23105,-0.09394 0.0141,-0.0281 0.10519,-0.0695 0.20245,-0.09198 0.0973,-0.02248 0.20737,-0.08627 0.24468,-0.141698 0.0567,-0.08411 0.14534,-0.09408 0.53666,-0.05994 0.33856,0.0295 0.5048,0.0178 0.59842,-0.04196 0.16368,-0.104465 0.71567,-0.09675 0.93079,0.01264 0.12791,0.06529 0.20674,0.06744 0.36314,0.0098 0.13267,-0.04899 0.24315,-0.05339 0.32897,-0.01264 0.073,0.03409 0.46433,0.04561 0.89932,0.02641 0.42356,-0.01883 0.80511,-0.03522 0.84788,-0.03681 0.17765,-0.0056 0.71099,0.13944 0.85549,0.233125 0.0856,0.05545 0.23756,0.101102 0.33778,0.101243 0.10023,1.5e-4 0.2693,0.05788 0.37571,0.1282 0.10641,0.07034 0.25189,0.127778 0.32328,0.127778 0.24652,0 0.12868,0.1143 -0.22016,0.213558 -0.56059,0.159512 -0.96965,0.379786 -0.98773,0.53187 -0.0145,0.121466 0.0102,0.13087 0.33701,0.127076 0.19392,-9.36e-4 0.51344,0.02089 0.71004,0.05123 0.46696,0.07222 0.41308,0.119639 -0.6128,0.54075 l -0.79248,0.325273 -10.85669,-9.37e-4 -10.85669,-9.36e-4 -0.67402,-0.27711 z m 3.81082,-3.938412 c 0,-0.03512 0.022,-0.06388 0.0488,-0.06388 0.0268,0 0.0632,0.02876 0.0808,0.06388 0.0177,0.03513 -0.005,0.06388 -0.0488,0.06388 -0.0444,0 -0.0809,-0.02875 -0.0809,-0.06388 z m -0.32443,-0.14491 c -0.18352,-0.175117 -0.45796,-0.650236 -0.44824,-0.775963 0.006,-0.07353 -0.003,-0.177009 -0.0194,-0.229752 -0.0164,-0.05283 -0.0398,-0.247905 -0.0521,-0.4337 -0.0126,-0.190712 -0.0558,-0.371646 -0.0991,-0.4155 -0.11862,-0.120051 -0.20104,-0.570555 -0.16452,-0.899087 0.0181,-0.162472 0.007,-0.418076 -0.0244,-0.567997 -0.0315,-0.149921 -0.0685,-0.656745 -0.0823,-1.126272 -0.0274,-0.935344 -0.0692,-1.08742 -0.35051,-1.277879 -0.3018,-0.204304 -0.38775,-0.324542 -0.60908,-0.852067 -0.12281,-0.292686 -0.28161,-0.628224 -0.35291,-0.745634 -0.1103,-0.181645 -0.12095,-0.237039 -0.0713,-0.371224 0.0321,-0.08674 0.0445,-0.225304 0.0278,-0.307907 -0.0338,-0.165985 0.0321,-0.353007 0.22464,-0.638331 0.11212,-0.166088 0.12482,-0.236609 0.1065,-0.591283 -0.015,-0.289117 -0.003,-0.402715 0.0427,-0.402715 0.0349,0 0.11769,-0.08299 0.18392,-0.184549 0.0662,-0.101524 0.17292,-0.204116 0.23708,-0.228038 0.0998,-0.03719 0.11665,-0.01995 0.11665,0.120613 0,0.10321 0.0289,0.164102 0.0778,0.164102 0.0437,0 0.0778,-0.05704 0.0778,-0.129877 0,-0.16324 0.1312,-0.230333 0.23758,-0.121465 0.0444,0.04552 0.21134,0.0873 0.37099,0.0932 0.22035,0.0084 0.32253,0.0458 0.42414,0.156487 0.0736,0.08018 0.22142,0.242809 0.32843,0.361343 0.13181,0.145978 0.24602,0.215525 0.35398,0.215525 0.207,0 0.43554,0.278467 0.5106,0.622164 0.0612,0.280641 0.23332,0.464525 0.43458,0.464525 0.0679,0 0.16389,0.05517 0.21336,0.122589 0.0541,0.07371 0.19677,0.140592 0.35801,0.16784 0.24507,0.0414 0.38456,0.133529 0.66987,0.442382 0.13523,0.146371 0.11243,0.287329 -0.11687,0.722405 -0.18106,0.343556 -0.21019,0.450325 -0.22781,0.835122 -0.0252,0.548553 -0.18488,1.033684 -0.34041,1.033684 -0.11506,0 -0.48633,0.263931 -0.55003,0.390988 -0.0211,0.04215 -0.0353,0.175295 -0.0317,0.295955 0.005,0.157958 -0.051,0.326518 -0.1993,0.601764 -0.11329,0.210289 -0.20599,0.425654 -0.20599,0.478594 0,0.07081 -0.0473,0.09123 -0.17869,0.07727 -0.23407,-0.02482 -0.26107,0.01995 -0.15889,0.263518 0.10076,0.240196 0.0515,0.349963 -0.18291,0.407773 -0.10205,0.0251 -0.17228,0.09348 -0.20495,0.19948 -0.0274,0.08861 -0.0853,0.16118 -0.12877,0.16118 -0.0924,0 -0.10065,0.08655 -0.025,0.260643 0.0404,0.0931 0.0315,0.182769 -0.0353,0.356538 -0.0877,0.227907 -0.0872,0.234313 0.0281,0.349475 0.1057,0.105599 0.11163,0.1393 0.059,0.335969 -0.0322,0.120192 -0.0443,0.288415 -0.027,0.37366 0.0413,0.203002 -0.0767,0.338114 -0.19584,0.224348 z m 1.77617,-5.032857 c 0,-0.03512 -0.0233,-0.06388 -0.0519,-0.06388 -0.0285,0 -0.0519,0.02876 -0.0519,0.06388 0,0.03513 0.0233,0.06388 0.0519,0.06388 0.0285,0 0.0519,-0.02876 0.0519,-0.06388 z m 22.13903,3.909564 c 0,-0.05236 0.22813,-0.204126 0.30056,-0.199902 0.0523,0.0028 -0.1991,0.253563 -0.25446,0.253563 -0.0253,0 -0.0461,-0.02417 -0.0461,-0.05367 z m -1.94296,-0.519001 c -0.0186,-0.03719 0.004,-0.08524 0.0495,-0.106854 0.11406,-0.05405 0.14954,0.0056 0.0588,0.09829 -0.0511,0.05236 -0.085,0.05508 -0.10823,0.0084 z m 3.32747,-0.543972 c 0.085,-0.144002 0.17093,-0.209268 0.17093,-0.129887 0,0.04327 -0.20024,0.287647 -0.23574,0.287647 -0.0156,0 0.0136,-0.07109 0.0648,-0.157789 z m -3.44159,-0.165751 c -0.0607,-0.02613 -0.10856,-0.154033 -0.1445,-0.385218 -0.0508,-0.326734 -0.0617,-0.34484 -0.19638,-0.325413 -0.10381,0.01489 -0.14259,-0.0075 -0.14259,-0.08318 0,-0.05873 -0.081,-0.145435 -0.18617,-0.19963 -0.1554,-0.07999 -0.23469,-0.08327 -0.4796,-0.01967 -0.16138,0.04196 -0.37057,0.129746 -0.46488,0.19505 -0.0943,0.06528 -0.24087,0.118796 -0.32572,0.118796 -0.0848,0 -0.23928,0.04384 -0.34322,0.09731 -0.20431,0.105308 -0.33748,0.04281 -0.23608,-0.110647 0.03,-0.04552 0.065,-0.425448 0.0778,-0.84447 0.0222,-0.731041 0.0287,-0.76729 0.16002,-0.896389 0.0753,-0.074 0.27648,-0.185636 0.44716,-0.248092 0.20851,-0.07624 0.34458,-0.17019 0.41484,-0.286186 0.0575,-0.09492 0.12576,-0.197325 0.15168,-0.227504 0.0259,-0.03016 0.12926,-0.150877 0.22967,-0.268221 0.17056,-0.199339 0.19332,-0.20834 0.34638,-0.137051 0.13636,0.0635 0.17128,0.06013 0.20836,-0.01948 0.11889,-0.255295 0.20117,-0.330555 0.39672,-0.362898 0.24316,-0.04018 0.31152,0.03662 0.2201,0.247165 -0.0558,0.128622 -0.0397,0.16591 0.16611,0.386174 0.13228,0.1415 0.2713,0.236534 0.33133,0.226493 0.11973,-0.02005 0.27927,-0.381182 0.28295,-0.640532 0.003,-0.193926 0.10618,-0.248242 0.10618,-0.05573 0,0.06603 0.0321,0.152759 0.0711,0.192791 0.0392,0.04 0.083,0.203545 0.0977,0.363367 0.0146,0.15984 0.0722,0.353559 0.12783,0.430468 0.0557,0.0769 0.17478,0.317779 0.26462,0.535252 0.17496,0.423527 0.17884,0.619981 0.02,1.010904 -0.11575,0.284893 -0.8346,1.206169 -0.99048,1.269374 -0.17031,0.06894 -0.49192,0.08861 -0.61095,0.03719 z m -12.92294,-0.65594 c -0.0308,-0.03775 -0.0558,-0.133679 -0.0558,-0.212874 0,-0.168364 -0.0855,-0.430515 -0.22005,-0.675122 -0.0525,-0.09548 -0.10993,-0.325572 -0.12759,-0.511405 -0.0177,-0.185814 -0.10017,-0.524817 -0.18338,-0.753343 -0.16391,-0.450194 -0.16584,-0.72322 -0.007,-1.100055 0.14446,-0.344418 -0.003,-1.135976 -0.29562,-1.592258 -0.16629,-0.258845 -0.1709,-0.32043 -0.0649,-0.865854 0.0362,-0.185973 -0.14727,-0.405066 -0.33908,-0.405066 -0.10235,0 -0.17641,-0.05039 -0.23452,-0.159803 -0.0982,-0.184746 -0.22641,-0.197765 -0.52325,-0.05311 -0.11407,0.05545 -0.32405,0.106301 -0.46663,0.112614 -0.14258,0.0075 -0.31937,0.03344 -0.39287,0.06013 -0.10918,0.03962 -0.17562,0.0056 -0.36294,-0.185205 -0.12611,-0.128481 -0.25262,-0.29766 -0.28114,-0.375824 -0.0285,-0.07821 -0.12768,-0.259463 -0.22035,-0.402902 -0.18127,-0.280538 -0.2046,-0.462577 -0.10948,-0.854005 0.0418,-0.172176 0.0436,-0.317995 0.006,-0.500849 -0.0498,-0.242022 -0.0398,-0.285567 0.16132,-0.704608 0.12237,-0.254864 0.29236,-0.510599 0.39591,-0.595582 0.11748,-0.09647 0.20518,-0.237639 0.24871,-0.400514 0.0369,-0.138307 0.15283,-0.348202 0.25743,-0.466333 0.15365,-0.173534 0.21905,-0.207684 0.34037,-0.177758 0.0961,0.0237 0.23671,-0.01124 0.39067,-0.0952 0.15106,-0.08317 0.40246,-0.145434 0.67608,-0.167717 l 0.43559,-0.03541 -0.0307,0.232853 c -0.0338,0.256156 0.0498,0.365277 0.3442,0.449725 0.0812,0.02332 0.21227,0.101244 0.2911,0.173019 0.1982,0.180663 0.48371,0.193794 0.51147,0.0236 0.0331,-0.202917 0.092,-0.209689 0.46881,-0.05395 0.28748,0.118936 0.41908,0.13929 0.69457,0.107556 0.18693,-0.02164 0.36516,-0.05845 0.39605,-0.08186 0.0309,-0.0236 0.0715,-0.223748 0.0902,-0.444921 0.0373,-0.44004 -0.0126,-0.548159 -0.21071,-0.456226 -0.0594,0.02754 -0.16268,0.02501 -0.22947,-0.0056 -0.0668,-0.03072 -0.14395,-0.03878 -0.17146,-0.0178 -0.096,0.07315 -0.28605,-0.03606 -0.34631,-0.199142 -0.0865,-0.234099 -0.0763,-0.286205 0.0559,-0.28584 0.0641,1.5e-4 0.22759,-0.04871 0.36317,-0.108689 0.20455,-0.09039 0.27579,-0.0959 0.41847,-0.03231 0.18599,0.08299 0.44398,0.09984 0.57512,0.03775 0.15192,-0.07194 0.0882,-0.278121 -0.15002,-0.485084 -0.18624,-0.161854 -0.22634,-0.229584 -0.20319,-0.343294 0.0159,-0.07793 0.003,-0.161938 -0.0304,-0.186741 -0.0822,-0.06266 -0.36402,0.09123 -0.36402,0.198712 0,0.117943 -0.085,0.112473 -0.12244,-0.0075 -0.0172,-0.05536 -0.0947,-0.0959 -0.18278,-0.0959 -0.11939,0 -0.17801,0.05002 -0.26716,0.227842 -0.0628,0.125249 -0.12055,0.319474 -0.1283,0.43147 -0.0108,0.155822 -0.0367,0.200323 -0.11037,0.189495 -0.053,-0.0084 -0.16236,0.01826 -0.24313,0.05788 -0.13409,0.06585 -0.14381,0.09189 -0.11201,0.30092 l 0.0349,0.228881 -0.10879,-0.121325 c -0.0598,-0.06688 -0.13637,-0.234857 -0.17008,-0.373548 -0.0444,-0.182816 -0.11804,-0.296367 -0.26767,-0.412812 -0.11353,-0.08833 -0.25346,-0.2147 -0.31098,-0.280763 -0.15123,-0.173702 -0.29243,-0.156356 -0.29243,0.03597 0,0.0858 0.0232,0.173712 0.0515,0.195321 0.0283,0.02164 0.0758,0.0952 0.10553,0.163587 0.0883,0.203385 -0.0308,0.146708 -0.23414,-0.11149 -0.17683,-0.224489 -0.1939,-0.232141 -0.35615,-0.159813 -0.0937,0.04187 -0.24459,0.07596 -0.33524,0.07596 -0.0907,0 -0.16483,0.02763 -0.16483,0.06135 0,0.03381 -0.0933,0.17537 -0.20739,0.314613 -0.11407,0.1393 -0.20739,0.294091 -0.20739,0.344137 0,0.232056 -0.4296,0.428557 -0.63938,0.292452 -0.15155,-0.09829 -0.19389,-0.189598 -0.15652,-0.337355 0.0172,-0.06809 0.0349,-0.211891 0.0391,-0.319615 l 0.007,-0.195874 0.3601,-0.0192 c 0.20721,-0.01124 0.37686,-0.0517 0.39961,-0.09591 0.0679,-0.131562 0.0449,-0.445033 -0.0413,-0.562424 -0.0765,-0.104184 -0.07,-0.120192 0.0907,-0.221641 0.0952,-0.06023 0.30758,-0.234819 0.47186,-0.388141 0.16429,-0.153349 0.32577,-0.278795 0.35885,-0.278795 0.0331,0 0.097,-0.04018 0.14201,-0.08936 0.0612,-0.06697 0.14693,-0.07681 0.34109,-0.03971 0.14258,0.02735 0.31481,0.0236 0.38274,-0.0084 0.068,-0.03175 0.1659,-0.04131 0.21771,-0.02089 0.10617,0.04159 0.30688,-0.16856 0.30688,-0.321254 0,-0.06079 0.0496,-0.0959 0.13567,-0.0959 0.11013,0 0.13056,-0.02398 0.10856,-0.127778 -0.0321,-0.151476 0.0516,-0.236178 0.1336,-0.135075 0.0895,0.110366 0.17761,0.08439 0.20855,-0.06154 0.017,-0.08018 0.0655,-0.127928 0.1227,-0.120482 0.17844,0.02304 0.22419,-0.0028 0.22419,-0.126092 0,-0.155794 -0.18549,-0.234136 -0.29326,-0.123854 -0.0676,0.06922 -0.0928,0.06276 -0.1533,-0.03934 -0.0398,-0.06716 -0.059,-0.173937 -0.0427,-0.237302 0.0164,-0.0635 0.007,-0.115283 -0.0217,-0.115283 -0.0869,0 -0.3704,0.325319 -0.3704,0.424942 0,0.0517 -0.0233,0.07624 -0.0519,0.05451 -0.0938,-0.07147 -0.0542,-0.24856 0.0865,-0.386895 0.0917,-0.09011 0.12721,-0.171801 0.10532,-0.242107 -0.0566,-0.181561 -0.24271,-0.117391 -0.48039,0.165564 -0.22154,0.263743 -0.29229,0.504248 -0.17468,0.593867 0.037,0.02819 0.0302,0.0769 -0.0206,0.147608 -0.0417,0.05817 -0.0842,0.163034 -0.0946,0.233358 -0.023,0.156244 -0.22535,0.206908 -0.26881,0.06744 -0.019,-0.06079 -0.003,-0.09928 0.0422,-0.09928 0.0402,0 0.0882,-0.03007 0.10653,-0.06669 0.0428,-0.08552 -0.0748,-0.263744 -0.14086,-0.213436 -0.0275,0.02089 -0.12399,0.04608 -0.21449,0.05601 -0.0905,0.0098 -0.21382,0.03793 -0.27405,0.06238 -0.0864,0.03494 -0.11635,0.01264 -0.14188,-0.104755 -0.0566,-0.260335 -0.0392,-0.29722 0.22332,-0.473311 0.14139,-0.09492 0.35211,-0.311476 0.46827,-0.48131 0.1797,-0.262751 0.26315,-0.327792 0.55952,-0.436154 0.2816,-0.10292 0.38806,-0.114853 0.55573,-0.06191 0.11406,0.03606 0.3357,0.10307 0.49255,0.149172 0.33067,0.09717 0.57032,0.207788 0.57032,0.263322 0,0.02136 -0.11017,0.02932 -0.24483,0.01752 -0.2877,-0.02501 -0.34401,0.08524 -0.16475,0.322482 0.0886,0.117241 0.14598,0.139992 0.2738,0.10882 0.0889,-0.02173 0.19671,-0.0945 0.23947,-0.161732 0.0427,-0.06716 0.17111,-0.141791 0.28517,-0.165732 0.11407,-0.02388 0.26354,-0.08701 0.33217,-0.140283 0.0713,-0.05536 0.29243,-0.108258 0.51617,-0.123704 0.21528,-0.01489 0.42152,-0.05788 0.45834,-0.09548 0.0477,-0.04889 0.13329,-0.04786 0.29746,0.0028 0.12679,0.03943 0.25519,0.07156 0.28534,0.07156 0.0853,0 0.0644,-0.178761 -0.0283,-0.242753 -0.0913,-0.06294 -0.0819,-0.275452 0.0138,-0.314773 0.0882,-0.03606 0.38268,0.522486 0.36741,0.696938 -0.0195,0.223711 0.17422,0.196557 0.26508,-0.03709 0.0669,-0.172279 0.0634,-0.1937 -0.0512,-0.303158 -0.10476,-0.100119 -0.11157,-0.127216 -0.0454,-0.181196 0.10181,-0.08299 0.34363,-0.08252 0.47005,7.03e-4 0.12703,0.08383 0.13785,-0.03381 0.0111,-0.121325 -0.19235,-0.132687 0.30448,-0.452564 0.71131,-0.457922 0.0998,-0.0019 0.22389,-0.04196 0.27576,-0.09058 0.0688,-0.06435 0.13878,-0.0724 0.2589,-0.02988 0.0905,0.03203 0.24641,0.05873 0.34641,0.0591 0.1,4.59e-4 0.21681,0.02988 0.25958,0.06519 0.0678,0.05592 0.0662,0.07259 -0.013,0.130027 -0.15004,0.109102 -0.10285,0.191143 0.10369,0.1804 0.10694,-0.0056 0.5094,0.01264 0.89438,0.04 0.56109,0.04018 0.72464,0.07371 0.82441,0.16916 0.10457,0.09998 0.17918,0.112474 0.46663,0.07821 0.18819,-0.02248 0.36433,-0.06604 0.39142,-0.09661 0.0754,-0.08552 0.43985,-0.06669 0.77195,0.04 0.16422,0.05283 0.41485,0.0959 0.55695,0.0959 0.14211,0 0.34446,0.0444 0.44966,0.09857 0.13941,0.07194 0.38149,0.09913 0.89272,0.100672 0.50314,9.36e-4 0.82375,0.03709 1.13415,0.125399 0.45221,0.128762 0.69115,0.244851 0.51187,0.248635 -0.13477,0.0028 -0.16783,0.178977 -0.061,0.324598 0.0892,0.121466 0.0884,0.131573 -0.0182,0.271621 -0.0765,0.1004 -0.17691,0.148732 -0.32418,0.155982 -0.39394,0.01939 -0.46396,0.233583 -0.17827,0.545414 0.1489,0.162519 0.18147,0.242809 0.18147,0.447328 0,0.137052 -0.0216,0.239662 -0.0479,0.227954 -0.0792,-0.03522 -0.52245,-0.567407 -0.52245,-0.627213 0,-0.03044 0.0276,-0.202552 0.0611,-0.38223 0.0529,-0.282842 0.0498,-0.34069 -0.0233,-0.43088 -0.0721,-0.08889 -0.097,-0.09142 -0.17003,-0.01667 -0.0489,0.05011 -0.17233,0.07971 -0.28826,0.0695 -0.18569,-0.01658 -0.20518,-0.0028 -0.232,0.162678 l -0.0293,0.180728 -0.45247,-0.02192 c -0.48959,-0.0236 -0.51717,-0.0084 -0.6158,0.341486 -0.0297,0.105458 -0.07,0.240159 -0.0895,0.299299 -0.0421,0.127779 0.20003,0.307963 0.41368,0.307963 0.20282,0 0.4407,0.174611 0.4407,0.323502 0,0.07062 0.0352,0.194581 0.0781,0.275358 0.0629,0.118375 0.0681,0.211937 0.0265,0.482125 -0.064,0.416268 -0.0826,0.453182 -0.22689,0.453182 -0.14812,0 -0.24062,0.114019 -0.24062,0.296658 0,0.07877 -0.0233,0.161029 -0.0519,0.182769 -0.0906,0.06912 -0.0567,0.165282 0.12962,0.36879 0.17806,0.194337 0.23169,0.384431 0.13027,0.461705 -0.0281,0.02145 -0.089,-0.07756 -0.13524,-0.219964 -0.0463,-0.142428 -0.11384,-0.258976 -0.15024,-0.258976 -0.0364,0 -0.10439,-0.07194 -0.1511,-0.159793 -0.0538,-0.101234 -0.13334,-0.159803 -0.21706,-0.159803 -0.0727,0 -0.16613,-0.04196 -0.2077,-0.0931 -0.0974,-0.120191 -0.1839,-0.07587 -0.33096,0.169348 l -0.11863,0.197821 0.1237,0.117241 c 0.0681,0.06444 0.17702,0.117954 0.24218,0.118656 0.10383,0.0019 0.11135,0.0178 0.0609,0.134242 -0.0317,0.07306 -0.0439,0.177383 -0.0268,0.231841 0.0169,0.05433 0.005,0.138166 -0.0278,0.18601 -0.0672,0.09984 0.0126,0.158107 0.18421,0.134522 0.074,-0.0098 0.13162,0.06332 0.21261,0.271256 0.10783,0.276763 0.10852,0.294353 0.0234,0.592332 -0.0937,0.328054 -0.28408,0.624618 -0.40097,0.624618 -0.0392,0 -0.14589,0.04758 -0.23703,0.105729 -0.0912,0.05817 -0.2652,0.100963 -0.38678,0.09535 -0.19783,-0.0098 -0.23188,0.01124 -0.32407,0.197971 -0.0567,0.114582 -0.1031,0.22891 -0.10319,0.254096 -1.1e-4,0.02529 0.10255,0.188456 0.22815,0.362795 0.12559,0.17434 0.24518,0.411548 0.26578,0.527122 0.0332,0.186451 0.0179,0.230249 -0.13566,0.388309 l -0.17309,0.178152 -0.20934,-0.248232 c -0.26975,-0.319821 -0.40761,-0.408654 -0.48539,-0.312759 -0.0564,0.0695 -0.10513,-0.03091 -0.23475,-0.482837 -0.0261,-0.09085 -0.0667,-0.107987 -0.18212,-0.07671 -0.13191,0.03578 -0.15188,0.02023 -0.17787,-0.138728 -0.0161,-0.09843 -0.0951,-0.270609 -0.1755,-0.382624 -0.0804,-0.112052 -0.16956,-0.250302 -0.19808,-0.307316 -0.0412,-0.08233 -0.0982,-0.0945 -0.27707,-0.05882 -0.12387,0.02454 -0.2522,0.08608 -0.28516,0.13662 -0.033,0.05058 -0.21159,0.293895 -0.39695,0.540863 -0.32562,0.433859 -0.33713,0.460638 -0.34062,0.792598 -0.004,0.345354 -0.10418,0.685538 -0.19196,0.649449 -0.0671,-0.02754 -0.49593,-1.249958 -0.53238,-1.517692 -0.0565,-0.415032 -0.11239,-0.518504 -0.25608,-0.474032 -0.0978,0.03035 -0.13846,0.01124 -0.16512,-0.07849 -0.0195,-0.06529 -0.12686,-0.216677 -0.23865,-0.336503 -0.19445,-0.208406 -0.22199,-0.218175 -0.63524,-0.225481 -0.32974,-0.0056 -0.45534,-0.03372 -0.53067,-0.117804 -0.0556,-0.06219 -0.18168,-0.110085 -0.28905,-0.110085 -0.15342,0 -0.23119,-0.05039 -0.40092,-0.259622 -0.14251,-0.175707 -0.24726,-0.253187 -0.32405,-0.239718 -0.19277,0.03381 -0.15938,0.249272 0.10467,0.675122 0.19328,0.311738 0.27772,0.399531 0.38433,0.399531 0.0752,0 0.16393,-0.04056 0.1973,-0.0902 0.0512,-0.07606 0.0925,-0.06463 0.26558,0.07531 0.11271,0.09095 0.20492,0.201803 0.20492,0.246294 0,0.186432 -0.23567,0.5505 -0.45953,0.709891 -0.13222,0.09408 -0.25528,0.197756 -0.27345,0.230267 -0.0459,0.08214 -0.78813,0.481844 -0.83341,0.448855 -0.0203,-0.0147 -0.0523,-0.133679 -0.0711,-0.264333 -0.0364,-0.252148 -0.17111,-0.568916 -0.36822,-0.865629 -0.066,-0.09942 -0.12003,-0.226109 -0.12003,-0.281625 0,-0.140273 -0.4704,-0.975948 -0.54932,-0.975948 -0.0354,0 -0.10247,-0.01808 -0.14903,-0.04 -0.12469,-0.05901 -0.0581,0.224141 0.18687,0.793722 0.11022,0.256316 0.20039,0.518523 0.20039,0.582665 0,0.06416 0.0435,0.185252 0.0966,0.269092 0.0531,0.08383 0.1127,0.215993 0.13243,0.293651 0.0197,0.07765 0.12801,0.231176 0.24058,0.341102 0.11259,0.109944 0.21842,0.267199 0.23516,0.349485 0.0625,0.306698 0.16895,0.356594 0.53601,0.251014 0.18133,-0.05208 0.34135,-0.08046 0.35561,-0.06276 0.0143,0.0177 -0.0504,0.247839 -0.14372,0.511667 -0.11725,0.331567 -0.24365,0.565347 -0.40932,0.757071 -0.31276,0.36197 -0.60149,0.801252 -0.70851,1.077968 -0.074,0.191434 -0.0773,0.277091 -0.024,0.632721 0.11833,0.790827 0.12312,1.124736 0.0177,1.236254 -0.0523,0.05536 -0.20581,0.219505 -0.3411,0.36479 l -0.24599,0.264174 0.0323,0.337927 c 0.0314,0.329684 0.0282,0.340437 -0.12991,0.441286 -0.1104,0.07034 -0.16213,0.150334 -0.16213,0.250574 0,0.186348 -0.26249,0.678579 -0.49753,0.933013 -0.11958,0.129464 -0.23612,0.195461 -0.3468,0.196472 -0.0917,7.03e-4 -0.2524,0.02613 -0.35713,0.0562 -0.12439,0.03569 -0.20979,0.03072 -0.24628,-0.01433 z m 1.08976,-2.639542 c 0.0601,-0.08926 0.0564,-0.100119 -0.0282,-0.0799 -0.0538,0.01264 -0.10746,0.05929 -0.11933,0.103201 -0.0308,0.114019 0.0654,0.09885 0.14756,-0.02332 z m 0.77275,-0.719305 c 0,-0.09661 -0.0329,-0.231251 -0.0731,-0.299046 -0.0686,-0.115705 -0.0754,-0.10854 -0.10958,0.116267 -0.0238,0.156553 -0.0144,0.272351 0.0271,0.334096 0.0865,0.128481 0.15555,0.06126 0.15555,-0.151373 z m -0.72198,-0.537397 c -0.007,-0.07643 -0.0775,-0.06163 -0.0998,0.02079 -0.0114,0.04215 0.007,0.06519 0.0415,0.05114 0.0342,-0.01405 0.0605,-0.04646 0.0583,-0.07194 z m 0.3072,-0.161414 c 0,-0.0281 -0.0215,-0.07849 -0.0478,-0.111911 -0.0263,-0.03344 -0.0682,-0.159447 -0.0931,-0.280107 -0.0615,-0.297669 -0.17017,-0.333347 -0.17017,-0.05592 0,0.240506 0.12238,0.498966 0.23625,0.498966 0.0411,0 0.0748,-0.02304 0.0748,-0.05114 z m 0.30306,-1.03462 c 0.0405,-0.143355 0.0374,-0.211272 -0.0125,-0.272829 -0.0366,-0.04505 -0.0771,-0.121466 -0.0902,-0.169741 -0.0346,-0.128059 -0.35587,-0.160533 -0.35587,-0.03597 0,0.07231 0.0341,0.08589 0.13638,0.05433 0.075,-0.02314 0.12676,-0.01658 0.115,0.0147 -0.0118,0.03128 -0.0528,0.134241 -0.0914,0.228684 -0.0899,0.220527 -0.0417,0.371647 0.11844,0.371647 0.0934,0 0.14017,-0.04955 0.18013,-0.190853 z m 0.24467,-0.94502 c -0.017,-0.02089 -0.0576,-0.0056 -0.0901,0.03466 -0.0443,0.05461 -0.0409,0.10026 0.0138,0.182067 0.0676,0.101094 0.0742,0.09843 0.0901,-0.03466 0.009,-0.07924 0.003,-0.161058 -0.0138,-0.182076 z m -2.47798,-1.369119 c -0.0321,-0.118515 -0.14367,-0.138175 -0.14367,-0.02529 0,0.05564 0.0369,0.101243 0.0821,0.101243 0.0452,0 0.0728,-0.03409 0.0616,-0.07596 z m 2.00802,-1.522159 c 0.0177,-0.03513 0.007,-0.06388 -0.0229,-0.06388 -0.0302,0 -0.0549,0.02875 -0.0549,0.06388 0,0.03522 0.0103,0.06388 0.0229,0.06388 0.0126,0 0.0373,-0.02875 0.0549,-0.06388 z m 2.06968,-2.148267 c 0.0901,-0.04271 0.10921,-0.320579 0.0323,-0.470444 -0.0298,-0.05798 -0.0292,-0.121878 0.002,-0.16768 0.0663,-0.09843 0.009,-0.268258 -0.10551,-0.313096 -0.0506,-0.01976 -0.13197,-0.09039 -0.18074,-0.156824 -0.0834,-0.113738 -0.0835,-0.130589 -6.3e-4,-0.286345 0.071,-0.13353 0.0756,-0.183988 0.0237,-0.261093 -0.0913,-0.135637 -0.25124,-0.118506 -0.4499,0.04833 -0.22211,0.186413 -0.22739,0.413253 -0.0166,0.709367 0.11177,0.156946 0.15555,0.28376 0.15555,0.450616 0,0.193382 0.0281,0.253393 0.1685,0.35887 0.17976,0.135084 0.24167,0.149846 0.37166,0.08833 z m -1.08457,-0.344745 c 0.0177,-0.03513 0.007,-0.06388 -0.0229,-0.06388 -0.0302,0 -0.0549,0.02875 -0.0549,0.06388 0,0.03522 0.0103,0.06388 0.0229,0.06388 0.0126,0 0.0373,-0.02875 0.0549,-0.06388 z m 3.51543,-0.606391 c 0.006,-0.03466 -0.0306,-0.07268 -0.0805,-0.08449 -0.0568,-0.01405 -0.0907,0.01798 -0.0907,0.08364 0,0.111219 0.15323,0.112062 0.17125,7.03e-4 z m -1.84005,-0.432351 c -0.0121,-0.15408 -0.0416,-0.20775 -0.11429,-0.20775 -0.054,0 -0.1218,0.04646 -0.15083,0.10321 -0.0797,0.155635 -0.007,0.312309 0.14683,0.312309 0.12055,0 0.13284,-0.02164 0.11829,-0.207741 z m 1.40573,-0.138175 c 0.0434,-0.06444 0.0446,-0.102498 0.005,-0.133399 -0.0601,-0.0458 -0.20765,0.07315 -0.20765,0.167456 0,0.08833 0.13655,0.06547 0.20357,-0.0341 z m -3.21771,-0.392506 c 0.0164,-0.104193 0.007,-0.108961 -0.0648,-0.03484 -0.0991,0.101383 -0.11143,0.219908 -0.019,0.181936 0.0356,-0.01461 0.0733,-0.08083 0.0838,-0.147111 z m 4.01737,0.0019 c -0.0161,-0.05152 -0.05,-0.0938 -0.0755,-0.0938 -0.0532,0 -0.0626,0.150408 -0.0132,0.211328 0.0553,0.06809 0.11983,-0.01723 0.0886,-0.117531 z m 0.91516,0.06603 c 0,-0.05264 -0.022,-0.0959 -0.0488,-0.0959 -0.0654,0 -0.1122,0.09984 -0.0708,0.150886 0.0584,0.07203 0.11957,0.04384 0.11957,-0.05508 z m 1.13796,-0.63569 c 0.0877,-0.115143 0.11031,-0.199282 0.0858,-0.319624 -0.046,-0.225996 -0.18223,-0.207647 -0.22073,0.02979 -0.0172,0.106151 -0.0516,0.208574 -0.0765,0.227504 -0.0707,0.05395 -0.0528,0.218625 0.0236,0.218625 0.0379,0 0.12231,-0.07034 0.18781,-0.156272 z m -6.73753,-0.900472 c 0,-0.102077 -0.13779,-0.200988 -0.19011,-0.13648 -0.0166,0.02032 -0.0163,0.08149 6.3e-4,0.135777 0.0397,0.127788 0.1895,0.12835 0.1895,7.03e-4 z m 1.60728,-0.06191 c 0,-0.05283 -0.022,-0.0959 -0.0488,-0.0959 -0.0654,0 -0.1122,0.09984 -0.0708,0.150895 0.0584,0.07203 0.11957,0.04384 0.11957,-0.05508 z m -1.9415,-0.357681 c 0.0534,-0.106573 -0.0668,-0.228806 -0.13827,-0.14062 -0.0598,0.07371 -0.0223,0.21012 0.0577,0.21012 0.0251,0 0.0614,-0.03128 0.0806,-0.0695 z m 1.44879,13.402175 c -0.0141,-0.05536 -0.0373,-0.145566 -0.0513,-0.200529 -0.0141,-0.05507 0.0115,-0.188399 0.057,-0.296498 0.0496,-0.118375 0.0706,-0.269888 0.0525,-0.380826 -0.0222,-0.137192 -0.003,-0.212527 0.0758,-0.294784 0.0582,-0.06079 0.18526,-0.208687 0.28249,-0.328626 0.26477,-0.32664 0.26762,-0.154276 0.0126,0.763131 -0.15951,0.573889 -0.24697,0.802808 -0.31241,0.81785 -0.05,0.01124 -0.10248,-0.02445 -0.11666,-0.07971 z m 10.90804,-2.561791 c -0.0821,-0.05508 -0.14797,-0.166565 -0.16677,-0.282355 -0.0208,-0.12834 -0.0843,-0.225378 -0.19298,-0.294644 -0.15581,-0.09928 -0.15852,-0.107987 -0.0715,-0.226483 0.11378,-0.155007 0.15932,-0.154024 0.5174,0.01124 0.33474,0.154408 0.64579,0.462343 0.64579,0.639295 0,0.140443 -0.0201,0.146653 -0.16516,0.05096 -0.0857,-0.05657 -0.13525,-0.04412 -0.25374,0.06388 -0.17154,0.156366 -0.14199,0.152769 -0.31306,0.03822 z m -3.31217,-0.09576 c -0.0665,-0.05292 -0.0646,-0.06219 0.013,-0.06294 0.0499,-4.78e-4 0.0907,0.02782 0.0907,0.06294 0,0.07793 -0.006,0.07793 -0.10369,0 z M 607.1295,45.32634 c -0.16672,-0.22002 -0.45367,-0.883612 -0.40698,-0.94116 0.0595,-0.07325 0.34664,0.19326 0.3959,0.367468 0.0274,0.09675 0.098,0.226877 0.15702,0.289165 0.11319,0.119498 0.14399,0.368958 0.054,0.437511 -0.0293,0.02229 -0.11928,-0.04646 -0.19996,-0.152984 z m 1.05053,-0.181392 c -0.12929,-0.02004 -0.18006,-0.07484 -0.25212,-0.271874 -0.0912,-0.249394 -0.0752,-0.385659 0.0453,-0.385659 0.0362,0 0.20946,-0.160186 0.38495,-0.355985 0.17549,-0.195798 0.33698,-0.342347 0.35887,-0.325666 0.0718,0.05461 0.0298,0.777359 -0.057,0.984622 -0.0467,0.111209 -0.0847,0.24665 -0.0847,0.301135 0,0.0997 -0.0521,0.106713 -0.39521,0.05339 z m 0.84309,-0.11416 c 0.0164,-0.05283 0.0507,-0.0959 0.0761,-0.0959 0.0254,0 0.0463,0.04309 0.0463,0.0959 0,0.05264 -0.0343,0.0959 -0.0761,0.0959 -0.0464,0 -0.0645,-0.03747 -0.0463,-0.0959 z m 1.44457,-0.0959 c -0.0177,-0.03512 -0.007,-0.06407 0.0229,-0.06407 0.0302,0 0.0549,0.02875 0.0549,0.06407 0,0.03513 -0.0103,0.06388 -0.0229,0.06388 -0.0126,0 -0.0373,-0.02876 -0.0549,-0.06388 z m -3.53102,-0.868926 c -0.0878,-0.25892 -0.0795,-0.366813 0.0221,-0.288996 0.0836,0.06407 0.17542,0.518673 0.10479,0.518673 -0.027,0 -0.0841,-0.103341 -0.12687,-0.229677 z m -2.40557,-0.57313 c 0,-0.05489 0.0233,-0.08186 0.0519,-0.06023 0.0285,0.02173 0.0519,0.0666 0.0519,0.0997 0,0.03316 -0.0233,0.06023 -0.0519,0.06023 -0.0285,0 -0.0519,-0.04477 -0.0519,-0.0997 z m 4.9774,0.0028 c 0,-0.05283 0.0351,-0.09591 0.0778,-0.09591 0.0427,0 0.0778,0.04327 0.0778,0.09591 0,0.05264 -0.0351,0.0959 -0.0778,0.0959 -0.0427,0 -0.0778,-0.04327 -0.0778,-0.0959 z M 585.8918,43.01621 c 0.0177,-0.03522 0.0424,-0.06388 0.0549,-0.06388 0.0126,0 0.0229,0.02875 0.0229,0.06388 0,0.03513 -0.0247,0.06388 -0.0549,0.06388 -0.0302,0 -0.0405,-0.02875 -0.0229,-0.06388 z m -0.12962,-0.319708 c -0.0713,-0.06884 -0.21128,-0.157199 -0.31109,-0.196436 -0.0998,-0.03934 -0.2315,-0.144357 -0.29266,-0.23362 -0.0907,-0.132275 -0.16247,-0.164646 -0.38886,-0.174949 -0.15271,-0.0066 -0.34766,-0.06154 -0.43321,-0.121175 -0.46299,-0.323212 -0.4655,-0.326406 -0.49426,-0.629536 -0.0152,-0.160158 -0.0878,-0.402443 -0.16125,-0.538399 -0.2507,-0.463822 -0.35553,-0.709638 -0.35553,-0.833792 0,-0.06828 -0.0336,-0.179903 -0.0746,-0.248148 -0.0637,-0.105879 -0.0902,-0.112333 -0.18147,-0.04365 -0.0971,0.07306 -0.10685,0.06547 -0.10685,-0.08299 0,-0.09464 -0.0578,-0.229443 -0.13723,-0.320223 -0.10387,-0.118656 -0.14348,-0.236965 -0.16292,-0.486462 -0.0277,-0.354843 0.0414,-0.584754 0.30412,-1.012628 0.0756,-0.123011 0.17463,-0.313555 0.22017,-0.42334 0.0455,-0.109813 0.13243,-0.215646 0.19308,-0.235185 0.14958,-0.04814 0.11409,-0.270178 -0.0422,-0.263387 -0.10413,0.0047 -0.11171,-0.01808 -0.0858,-0.255698 0.0156,-0.143374 0.0383,-0.322097 0.0506,-0.397179 0.0122,-0.07512 -0.0126,-0.172092 -0.0551,-0.215562 -0.0425,-0.04337 -0.0772,-0.171774 -0.0772,-0.285062 0,-0.254068 -0.10986,-0.378268 -0.41479,-0.468955 -0.31546,-0.0938 -0.96192,0.0075 -1.15151,0.179285 -0.0772,0.07025 -0.17796,0.127778 -0.22376,0.127778 -0.15937,0 -0.38448,-0.195939 -0.38676,-0.336643 -9.3e-4,-0.06969 0.30225,-0.224882 0.52545,-0.268773 0.10406,-0.02051 0.21962,-0.08243 0.25678,-0.137614 0.0568,-0.08439 0.0515,-0.112052 -0.0337,-0.174096 -0.089,-0.06491 -0.073,-0.07755 0.13207,-0.105739 0.18561,-0.02538 0.23644,-0.05882 0.24857,-0.163503 0.0167,-0.143926 0.3332,-0.301856 0.82344,-0.410911 0.28125,-0.06266 1.2024,0.05039 1.47616,0.18114 0.0755,0.03606 0.14824,0.05199 0.16165,0.03541 0.0134,-0.01658 0.16822,-0.05854 0.34403,-0.09348 0.39149,-0.07784 1.12011,0.01939 1.2523,0.166818 0.12957,0.144573 0.63748,0.105449 0.6616,-0.05095 0.0134,-0.08655 -0.0182,-0.111912 -0.13903,-0.111912 -0.18982,0 -0.26176,-0.107556 -0.0984,-0.147129 l 0.11742,-0.02847 -0.11307,-0.04636 c -0.0622,-0.02538 -0.12561,-0.08664 -0.14095,-0.135928 -0.0153,-0.04927 -0.0927,-0.09039 -0.17209,-0.09151 -0.13993,-9.37e-4 -0.14113,-0.0056 -0.0405,-0.09871 0.11846,-0.110507 0.3975,-0.07568 0.65271,0.08121 0.0861,0.05292 0.238,0.09914 0.33749,0.102639 0.15144,0.0056 0.1784,0.02763 0.16567,0.137332 -0.0122,0.104887 -0.0594,0.135085 -0.23556,0.150736 -0.25093,0.02248 -0.27714,0.09142 -0.0916,0.24117 0.1043,0.0842 0.20012,0.09534 0.50551,0.05826 0.42115,-0.05095 0.50645,-0.106151 0.50645,-0.32693 0,-0.138316 0.0319,-0.170106 0.14258,-0.142184 0.0214,0.0056 0.0315,0.06322 0.0226,0.12834 -0.009,0.06519 0.0214,0.164945 0.0674,0.221688 0.13981,0.172372 0.0692,0.281315 -0.31036,0.478696 -0.59436,0.309097 -0.68049,0.366261 -0.85516,0.567426 -0.10667,0.122861 -0.15558,0.228741 -0.13548,0.293314 0.0173,0.05564 0.0315,0.126233 0.0315,0.15703 0,0.03072 0.15078,0.148507 0.33508,0.26158 0.31647,0.194188 0.33473,0.217567 0.32854,0.420568 -0.004,0.118225 0.0182,0.245525 0.0485,0.282889 0.0914,0.112754 0.27024,-0.0056 0.34572,-0.22757 0.075,-0.221379 0.52184,-0.590946 0.5783,-0.478332 0.0353,0.07034 0.12662,0.01517 0.12662,-0.07643 0,-0.03466 -0.0409,-0.05451 -0.0907,-0.04421 -0.13851,0.02866 -0.13984,-0.215637 -0.003,-0.480607 0.0996,-0.19223 0.14973,-0.230773 0.30334,-0.23304 0.21322,-0.0028 0.30849,0.08945 0.30849,0.299748 0,0.189608 0.12709,0.250209 0.32828,0.1566 0.0866,-0.04028 0.16555,-0.06332 0.17546,-0.05095 0.01,0.01264 0.0246,0.125671 0.0327,0.252035 0.0103,0.160955 0.0572,0.271115 0.15672,0.367581 0.1845,0.17893 0.16478,0.381116 -0.0451,0.462034 -0.0856,0.03297 -0.33236,0.07971 -0.54846,0.104053 -0.28413,0.03175 -0.43861,0.08411 -0.55797,0.188933 -0.18636,0.163596 -0.17893,0.261017 0.0164,0.21499 0.11233,-0.02641 0.13086,-0.0084 0.13086,0.132696 0,0.08982 0.0233,0.181262 0.0519,0.203002 0.10142,0.07727 0.0498,0.161591 -0.0753,0.122861 -0.19831,-0.06135 -0.63263,0.145874 -0.75699,0.361212 -0.0594,0.102779 -0.16139,0.203338 -0.22678,0.22357 -0.14723,0.04561 -0.58425,0.590252 -0.60836,0.758251 -0.01,0.068 -0.14604,0.232609 -0.30285,0.365923 -0.42684,0.362823 -0.53499,0.539542 -0.49936,0.815977 0.0162,0.125811 0.007,0.271845 -0.0199,0.324589 -0.038,0.0739 -0.0497,0.05461 -0.0502,-0.08411 -9.3e-4,-0.321161 -0.08,-0.414311 -0.38986,-0.462043 -0.20323,-0.03128 -0.30916,-0.02004 -0.3669,0.03906 -0.0454,0.04646 -0.18122,0.07671 -0.30832,0.06856 -0.2218,-0.01414 -0.5969,0.159681 -0.67327,0.312018 -0.0185,0.03681 -0.0784,0.25995 -0.13304,0.495697 -0.10608,0.457341 -0.0783,0.7426 0.0964,0.989202 0.12222,0.172495 0.45333,0.148048 0.60994,-0.04505 0.07,-0.08636 0.12727,-0.186966 0.12727,-0.22372 0,-0.03681 0.0467,-0.06688 0.10369,-0.06688 0.12664,0 0.12664,0.02838 0,0.351573 -0.17291,0.441371 -0.13919,0.518683 0.21217,0.486331 0.18411,-0.01695 0.24968,0.105317 0.1935,0.36065 -0.053,0.241198 -0.0754,0.248354 -0.25012,0.07971 z M 583.9475,38.22576 c 0,-0.03316 -0.0233,-0.07793 -0.0519,-0.09969 -0.0285,-0.02173 -0.0519,0.0056 -0.0519,0.06013 0,0.05489 0.0233,0.0997 0.0519,0.0997 0.0285,0 0.0519,-0.02707 0.0519,-0.06023 z m 3.36305,-0.123142 c 0.1037,-0.06575 0.2583,-0.145397 0.34357,-0.177103 0.20052,-0.07456 0.2438,-0.278758 0.0591,-0.278758 -0.0718,0 -0.16097,-0.05292 -0.19823,-0.117531 -0.0373,-0.06472 -0.13191,-0.137042 -0.21033,-0.16103 -0.0808,-0.02454 -0.14258,-0.08748 -0.14258,-0.144938 0,-0.05573 -0.0572,-0.18528 -0.1272,-0.287788 -0.12099,-0.17729 -0.12984,-0.180325 -0.18107,-0.06238 -0.0296,0.06828 -0.13571,0.157377 -0.23574,0.198084 -0.10002,0.04074 -0.18185,0.100541 -0.18185,0.132977 0,0.03241 -6.3e-4,0.08065 -0.002,0.106863 -9.4e-4,0.02641 0.07,0.06238 0.15811,0.0799 l 0.16017,0.03203 -0.1322,0.220171 c -0.14715,0.245066 -0.17601,0.514935 -0.0551,0.514935 0.0425,0 0.1348,-0.112614 0.20529,-0.250321 0.0705,-0.137604 0.14995,-0.266919 0.17659,-0.287207 0.0737,-0.0562 0.12436,0.281334 0.0572,0.381032 -0.0628,0.09338 -0.0265,0.220433 0.063,0.220433 0.0301,0 0.13953,-0.05376 0.24322,-0.119499 z m -1.10586,-1.350779 c 0.0391,0 0.0954,-0.107847 0.12509,-0.239737 0.0847,-0.375908 0.0743,-0.419491 -0.0877,-0.369351 -0.19454,0.06013 -0.26011,0.138315 -0.29892,0.356228 -0.0394,0.220705 0.007,0.339463 0.11369,0.289165 0.0422,-0.01995 0.10876,-0.03625 0.14786,-0.03625 z m 0.38705,0 c 0,-0.03522 -0.0103,-0.06388 -0.0229,-0.06388 -0.0126,0 -0.0373,0.02876 -0.0549,0.06388 -0.0177,0.03513 -0.007,0.06388 0.0229,0.06388 0.0302,0 0.0549,-0.02876 0.0549,-0.06388 z m 1.91139,-0.09914 c 0.0164,-0.104343 0.007,-0.10897 -0.0648,-0.03484 -0.0991,0.101383 -0.11144,0.219908 -0.019,0.181936 0.0356,-0.01461 0.0733,-0.08083 0.0838,-0.147111 z m 0.62916,-0.344567 c 0,-0.03316 -0.0233,-0.07793 -0.0519,-0.0997 -0.0285,-0.02164 -0.0519,0.0056 -0.0519,0.06023 0,0.05489 0.0233,0.09969 0.0519,0.09969 0.0285,0 0.0519,-0.02707 0.0519,-0.06013 z m -2.43685,-0.131572 c 0,-0.03513 -0.0233,-0.06388 -0.0519,-0.06388 -0.0285,0 -0.0519,0.02875 -0.0519,0.06388 0,0.03522 0.0233,0.06388 0.0519,0.06388 0.0285,0 0.0519,-0.02876 0.0519,-0.06388 z m -1.11472,-0.255679 c 0,-0.04693 -0.0292,-0.09717 -0.0648,-0.111912 -0.0385,-0.01583 -0.0648,0.02951 -0.0648,0.111912 0,0.08243 0.0263,0.127638 0.0648,0.111912 0.0356,-0.01461 0.0648,-0.065 0.0648,-0.111912 z m 0.74157,-0.231579 c 0.008,-0.07521 -0.0184,-0.151832 -0.0611,-0.171979 -0.0809,-0.03831 -0.1497,0.03934 -0.20556,0.231981 -0.028,0.09647 -0.01,0.112614 0.10861,0.09591 0.0989,-0.01405 0.14706,-0.06154 0.15797,-0.155879 z m 0.3213,0.07175 c 0,-0.0532 -0.0461,-0.0959 -0.10369,-0.0959 -0.0576,0 -0.10369,0.04252 -0.10369,0.0959 0,0.0532 0.0461,0.09591 0.10369,0.09591 0.0576,0 0.10369,-0.04271 0.10369,-0.09591 z m -0.77772,-0.351574 c 0,-0.03512 -0.0336,-0.06388 -0.0747,-0.06388 -0.041,0 -0.0891,0.02876 -0.10676,0.06388 -0.0177,0.03522 0.016,0.06388 0.0747,0.06388 0.0587,0 0.10675,-0.02875 0.10675,-0.06388 z m -0.25582,-0.194028 c 0.11928,-0.07868 0.1318,-0.242537 0.0225,-0.294241 -0.0427,-0.02023 -0.0778,-0.09207 -0.0778,-0.159812 0,-0.06763 0.035,-0.139571 0.0778,-0.159803 0.12696,-0.06013 0.0963,-0.278936 -0.0389,-0.277934 -0.21931,9.37e-4 -0.34998,0.07568 -0.34998,0.198347 0,0.0858 0.0372,0.120332 0.12961,0.120332 0.0713,0 0.12963,0.02875 0.12963,0.06388 0,0.03512 -0.0249,0.06388 -0.0554,0.06388 -0.0306,0 -0.0415,0.05376 -0.0244,0.120342 0.0195,0.07596 0.002,0.134101 -0.0483,0.157798 -0.0437,0.02061 -0.0793,0.08158 -0.0793,0.135366 0,0.113035 0.1659,0.129745 0.3145,0.03175 z m 0.87799,-0.0296 c 0,-0.05283 -0.0227,-0.0959 -0.0506,-0.0959 -0.0285,0 -0.0369,-0.08355 -0.0195,-0.191771 0.0246,-0.151326 0.013,-0.191762 -0.0548,-0.191762 -0.10881,0 -0.16697,0.177272 -0.0895,0.272773 0.0323,0.0399 0.0587,0.124126 0.0587,0.187472 0,0.06332 0.0351,0.115143 0.0778,0.115143 0.0427,0 0.0778,-0.04327 0.0778,-0.0959 z m 0.21398,-0.07128 c 0.0509,-0.05676 0.16026,-0.107425 0.24307,-0.112623 0.18542,-0.01124 0.3472,-0.160608 0.27322,-0.25182 -0.0346,-0.04252 -0.0763,-0.03887 -0.12525,0.01124 -0.0404,0.04131 -0.11075,0.05742 -0.1564,0.03578 -0.0926,-0.04365 -0.38931,0.212939 -0.39389,0.340699 -0.004,0.108118 0.0483,0.100531 0.15925,-0.02332 z m 22.288,6.939213 c 0,-0.0725 0.0223,-0.114581 0.0496,-0.0938 0.0273,0.02079 0.0365,0.07999 0.0204,0.131572 -0.0411,0.132124 -0.0699,0.116538 -0.0699,-0.03775 z M 587.51528,41.69429 c 0.0374,-0.01836 0.0822,-0.01611 0.0994,0.0056 0.0172,0.02135 -0.0134,0.03634 -0.0681,0.03353 -0.0604,-0.0028 -0.0727,-0.01808 -0.0313,-0.03859 z m 22.48313,-2.518517 c -0.0141,-0.0281 0.0449,-0.140133 0.13107,-0.248926 0.0862,-0.10869 0.15949,-0.261421 0.16287,-0.339304 0.005,-0.11192 0.0144,-0.101383 0.0457,0.05011 0.0786,0.381097 0.0627,0.443927 -0.13107,0.518729 -0.10059,0.03878 -0.19446,0.04758 -0.20858,0.01939 z m 0.0804,-1.337123 c 0,-0.08093 0.10595,-0.08093 0.2074,0 0.0606,0.04833 0.0463,0.06219 -0.0648,0.06294 -0.0785,4.78e-4 -0.14259,-0.02782 -0.14259,-0.06294 z M 589.9108,37.087546 c 0.003,-0.151364 0.0932,-0.218597 0.2,-0.14816 0.15747,0.103903 0.1362,0.196116 -0.0453,0.196116 -0.0856,0 -0.15518,-0.02145 -0.15475,-0.04786 z m 5.39139,-0.560251 c 0,-0.0532 0.0281,-0.152301 0.0625,-0.22018 0.0534,-0.105308 0.042,-0.146886 -0.0772,-0.28316 -0.0856,-0.09773 -0.12778,-0.198319 -0.10883,-0.259239 0.0429,-0.138035 0.17543,-0.125109 0.17543,0.01686 0,0.06407 0.0694,0.229453 0.15409,0.367553 0.21275,0.346647 0.20613,0.474847 -0.0245,0.474847 -0.12746,0 -0.18147,-0.02875 -0.18147,-0.09676 z m -0.51848,-0.143908 c 0,-0.120473 0.0921,-0.270722 0.16591,-0.270722 0.0864,0 0.0369,0.25418 -0.0622,0.319615 -0.0862,0.05685 -0.10369,0.04861 -0.10369,-0.04889 z m -3.25421,-1.231899 c -0.13634,-0.06753 -0.2196,-0.297838 -0.2196,-0.607459 0,-0.177252 0.0289,-0.236337 0.15479,-0.316617 0.18085,-0.115275 0.26627,-0.402744 0.14464,-0.486668 -0.0473,-0.0326 -0.0691,-0.112474 -0.0552,-0.202168 0.0136,-0.08758 -0.0186,-0.211497 -0.0785,-0.302783 -0.0828,-0.126233 -0.15016,-0.154998 -0.3667,-0.157002 -0.32396,-0.0028 -0.37398,-0.116689 -0.0731,-0.166266 0.12017,-0.01976 0.26067,-0.08299 0.31223,-0.140554 0.0568,-0.06332 0.22649,-0.118656 0.42962,-0.140283 1.70139,-0.180784 2.24813,-0.195068 2.52248,-0.06603 0.22261,0.104896 0.22729,0.112333 0.12427,0.201363 -0.0621,0.05367 -0.12045,0.195798 -0.13894,0.338432 -0.0253,0.195105 -0.0684,0.270244 -0.20841,0.363188 -0.099,0.06575 -0.16545,0.152675 -0.15135,0.197972 0.0161,0.0517 -0.021,0.08074 -0.10285,0.08074 -0.0919,0 -0.12798,0.03484 -0.12798,0.123564 0,0.132696 -0.053,0.162294 -0.41479,0.231176 -0.12832,0.02445 -0.29857,0.101374 -0.37832,0.170958 -0.0798,0.0695 -0.23803,0.141913 -0.35172,0.160721 -0.16129,0.0267 -0.26041,0.103201 -0.45124,0.348118 -0.13449,0.172681 -0.25232,0.341354 -0.26182,0.37484 -0.0212,0.07456 -0.15063,0.07231 -0.30752,-0.0056 z m -2.03517,-0.38327 c -0.0554,-0.127779 -0.0446,-0.160637 0.0989,-0.299102 0.0886,-0.08552 0.16122,-0.191209 0.16122,-0.234792 0,-0.149303 -0.2986,-0.358964 -0.51126,-0.358964 -0.17688,0 -0.21815,0.02876 -0.3069,0.214251 -0.0564,0.117812 -0.15201,0.230202 -0.21251,0.249703 -0.14507,0.04674 -0.13892,-9.37e-4 0.0196,-0.155747 0.12955,-0.125681 0.17563,-0.308207 0.0778,-0.308207 -0.0285,0 -0.0519,-0.04393 -0.0519,-0.09787 0,-0.131712 0.15509,-0.198224 0.20946,-0.08973 0.0355,0.07091 0.0614,0.0666 0.14246,-0.02388 0.12107,-0.135075 0.58939,-0.11135 0.7264,0.0369 0.0485,0.05255 0.14075,0.115143 0.20491,0.13929 0.077,0.02894 0.11666,0.09395 0.11666,0.191546 0,0.08158 0.0522,0.191349 0.11665,0.245282 0.0918,0.07681 0.10332,0.114581 0.054,0.177684 -0.0502,0.06416 -0.0784,0.06388 -0.14191,-0.0019 -0.13365,-0.13677 -0.24969,-0.0326 -0.21026,0.188793 0.0257,0.144526 0.0156,0.191817 -0.0412,0.191817 -0.0414,0 -0.14617,0.01752 -0.23265,0.03878 -0.12799,0.03157 -0.16884,0.01264 -0.21955,-0.104756 z m 4.47277,-0.04028 c -0.12911,-0.06416 -0.0598,-0.132828 0.17387,-0.172382 0.30517,-0.0517 0.40628,0.02164 0.17324,0.12539 -0.19663,0.08758 -0.25071,0.09492 -0.34711,0.04693 z m -5.58608,-0.08645 c 0.0179,-0.03578 0.0543,-0.04843 0.0808,-0.02819 0.0719,0.05479 0.0585,0.0931 -0.0325,0.0931 -0.0444,0 -0.0662,-0.02922 -0.0482,-0.065 z m 23.20139,-0.126795 c -0.0632,-0.05039 -0.0566,-0.06219 0.0358,-0.06304 0.0625,-4.77e-4 0.12802,0.02782 0.14564,0.06304 0.0408,0.08149 -0.0793,0.08149 -0.18146,0 z m -11.51023,-0.84875 c 0,-0.114581 0.14993,-0.365802 0.21837,-0.365802 0.0313,0 0.0183,0.05264 -0.0289,0.11697 -0.0472,0.06435 -0.0858,0.164982 -0.0858,0.223739 0,0.05882 -0.0233,0.106853 -0.0519,0.106853 -0.0285,0 -0.0519,-0.03681 -0.0519,-0.08168 z m -12.05462,-0.04618 c -0.0177,-0.03513 0.006,-0.06388 0.0519,-0.06388 0.0461,0 0.0695,0.02875 0.0519,0.06388 -0.0177,0.03522 -0.041,0.06388 -0.0519,0.06388 -0.0109,0 -0.0342,-0.02876 -0.0519,-0.06388 z m 1.63321,-0.671198 c -0.0355,-0.05283 -0.13168,-0.09591 -0.21374,-0.09591 -0.0821,0 -0.1492,-0.02819 -0.1492,-0.06266 0,-0.09829 0.22352,-0.142634 0.3708,-0.07362 0.0963,0.04524 0.15344,0.0399 0.20537,-0.01911 0.0968,-0.109954 1.23118,-0.262722 1.30204,-0.17537 0.0356,0.04393 -0.0289,0.07971 -0.19986,0.110788 -0.1389,0.02529 -0.42699,0.1282 -0.64021,0.228797 -0.43787,0.20672 -0.58217,0.22534 -0.6752,0.0872 z m 7.3624,-0.0251 c 0,-0.07053 0.13452,-0.139299 0.17498,-0.08945 0.0163,0.02004 0.0172,0.06126 0.002,0.09142 -0.0364,0.07259 -0.177,0.0709 -0.177,-9.36e-4 z"
+         style="fill:#000080" />
+    </g>
+  </g>
+</svg>
diff -Nru qmapshack-1.8.1/src/icons/ToggleRouter.svg qmapshack-1.9.0/src/icons/ToggleRouter.svg
--- qmapshack-1.8.1/src/icons/ToggleRouter.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/ToggleRouter.svg	2017-07-01 14:40:11.000000000 +0000
@@ -0,0 +1,128 @@
+<?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="ToggleRouter.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="-43.213422"
+     inkscape:cy="34.818224"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     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" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000099;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 14.601019,29.704584 c 0,0 6.231804,-7.762755 14.091681,-6.791172 13.420643,1.658966 6.281834,18.675722 6.281834,18.675722 0,0 -9.690816,-5.767379 -16.80815,-1.358234 -7.711133,4.776999 -1.030156,12.564241 -1.018676,12.563667"
+       id="path4334"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscsc" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2789689"
+       sodipodi:start="0"
+       d="m 20.222283,30.254875 a 5.5757575,5.5757575 0 0 1 -5.56988,5.575755 5.5757575,5.5757575 0 0 1 -5.5816227,-5.564 5.5757575,5.5757575 0 0 1 5.5581127,-5.587484 5.5757575,5.5757575 0 0 1 5.59334,5.55222"
+       sodipodi:ry="5.5757575"
+       sodipodi:rx="5.5757575"
+       sodipodi:cy="30.254875"
+       sodipodi:cx="14.646525"
+       id="path3339"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2789689"
+       sodipodi:start="0"
+       d="m 39.737436,41.406387 a 5.5757575,5.5757575 0 0 1 -5.56988,5.575755 5.5757575,5.5757575 0 0 1 -5.581623,-5.564 5.5757575,5.5757575 0 0 1 5.558113,-5.587484 5.5757575,5.5757575 0 0 1 5.59334,5.55222"
+       sodipodi:ry="5.5757575"
+       sodipodi:rx="5.5757575"
+       sodipodi:cy="41.406387"
+       sodipodi:cx="34.161678"
+       id="path3341"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2789689"
+       sodipodi:start="0"
+       d="m 23.01016,52.557903 a 5.5757575,5.5757575 0 0 1 -5.56988,5.575755 5.5757575,5.5757575 0 0 1 -5.581623,-5.564 5.5757575,5.5757575 0 0 1 5.558113,-5.587484 5.5757575,5.5757575 0 0 1 5.59334,5.55222"
+       sodipodi:ry="5.5757575"
+       sodipodi:rx="5.5757575"
+       sodipodi:cy="52.557903"
+       sodipodi:cx="17.434402"
+       id="path3343"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff -Nru qmapshack-1.8.1/src/icons/ToolBarSetup.svg qmapshack-1.9.0/src/icons/ToolBarSetup.svg
--- qmapshack-1.8.1/src/icons/ToolBarSetup.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/ToolBarSetup.svg	2017-07-01 14:40:11.000000000 +0000
@@ -0,0 +1,126 @@
+<?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="svg3020"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ToolBarSetup.svg"
+   inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_touch/src/icons/48x48/ToolBarSetup.png"
+   inkscape:export-xdpi="67.5"
+   inkscape:export-ydpi="67.5">
+  <defs
+     id="defs3022" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.2079788"
+     inkscape:cx="-83.960856"
+     inkscape:cy="-0.49180468"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="-47.636364,-6.1818182"
+       orientation="0,1"
+       id="guide3378" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3025">
+    <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
+       y="-52.745033"
+       x="-51.45879"
+       height="27.539677"
+       width="25.80184"
+       id="rect4156-1"
+       style="fill:none;stroke:#000080;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="scale(-1,-1)" />
+    <rect
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1.11963093;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3376"
+       width="14.149452"
+       height="15.008654"
+       x="-57.967514"
+       y="-21.629807"
+       transform="scale(-1,-1)" />
+    <rect
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1.11963093;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3376-6"
+       width="14.149452"
+       height="15.008654"
+       x="-43.764492"
+       y="-21.648991"
+       transform="scale(-1,-1)" />
+    <rect
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1.11963093;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3376-6-2"
+       width="14.149452"
+       height="15.008654"
+       x="-29.611471"
+       y="-21.62529"
+       transform="scale(-1,-1)" />
+    <rect
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1.11963093;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3376-6-9"
+       width="14.149452"
+       height="15.008654"
+       x="-15.409525"
+       y="-21.611561"
+       transform="scale(-1,-1)" />
+    <path
+       style="fill:#00ffff;stroke-width:1"
+       d="m 14.835522,14.111363 0,6.917858 -6.5048517,0 -6.504853,0 0,-6.917858 0,-6.9178593 6.504853,0 6.5048517,0 0,6.9178593 z"
+       id="path4216"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ff0000;stroke-width:1"
+       d="m 29.042946,14.111363 0,6.917858 -6.504852,0 -6.504852,0 0,-6.917858 0,-6.9178593 6.504852,0 6.504852,0 0,6.9178593 z"
+       id="path4218"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffff00;stroke-width:1"
+       d="m 57.377636,14.132012 0,6.93851 -6.484203,0 -6.484201,0 0,-6.93851 0,-6.9385083 6.484201,0 6.484203,0 0,6.9385083 z"
+       id="path4220"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#666666;stroke:#000000;stroke-width:1.39968503;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 37.536002,60.600283 2.66938,-0.08745 0.787693,-2.929242 0,-0.349762 -0.393858,-2.492038 3.71963,-0.918121 0.83144,2.404601 0.131157,0.262317 2.100494,2.229723 2.363049,-1.136719 -0.437586,-3.060404 -0.174949,-0.262318 -1.312826,-2.142283 3.019464,-2.360881 1.706658,1.836241 0.262632,0.218603 2.844423,1.180441 1.706647,-2.011125 -1.706647,-2.623198 -0.218783,-0.174878 -2.100492,-1.399042 1.794173,-3.322725 2.31929,0.918117 0.306325,0.08747 3.019458,-0.08747 0.787688,-2.53576 -2.581858,-1.661363 -0.306326,-0.08746 -2.49433,-0.437199 0.306321,-3.759924 2.494335,-0.08746 0.306321,-0.04365 2.756897,-1.311601 -0.350083,-2.623201 -3.019461,-0.480921 -0.350082,0 -2.406813,0.655801 -1.312806,-3.585043 2.275534,-1.093 0.262559,-0.174875 2.012974,-2.317163 -1.400328,-2.229719 -2.93194,0.743239 -0.30632,0.174877 -1.969213,1.57392 -2.625623,-2.710647 1.619132,-1.923677 0.174949,-0.306041 0.875211,-2.929239 -2.188011,-1.442764 -2.406828,1.87996 -0.174949,0.30604 -1.137749,2.186003 -3.544603,-1.399043 0.700167,-2.448318 0.0876,-0.306042 -0.393832,-3.016682 -2.625631,-0.48092 -1.400329,2.710642 -0.0438,0.34976 -0.174948,2.49204 -3.76338,0.174877 -0.393835,-2.535762 -0.0438,-0.306042 -1.619136,-2.623203 -2.538104,0.655801 -0.174949,3.016683 0.04379,0.34976 0.918967,2.360881 -3.457047,1.661359 -1.312827,-2.142281 -0.218757,-0.218599 -2.494327,-1.792522 -2.056745,1.617644 1.050249,2.88552 0.218753,0.262322 1.750415,1.792519 -2.450578,2.929243 -2.056719,-1.399044 -0.306332,-0.174877 -3.019438,-0.56836 -1.225301,2.317162 2.144247,2.186005 0.30633,0.174877 2.319298,0.918119 -1.050245,3.628761 -2.450576,-0.393477 -0.35011,-0.04365 -2.975688,0.699521 -0.131155,2.66692 2.80066,1.04928 0.306307,0.04365 2.538104,-0.08745 0.525136,3.759923 -2.450577,0.612078 -0.306331,0.08746 -2.450578,1.879961 0.91897,2.448324 3.063216,-0.131066 0.30633,-0.131066 2.231774,-1.092997 2.056742,3.235285 -2.012992,1.530202 -0.218756,0.262322 -1.487856,2.6232 1.837939,1.923684 2.756907,-1.355319 0.218756,-0.262326 1.619132,-1.923678 3.150741,2.14228 -1.181523,2.229722 -0.131155,0.306039 -0.262582,3.016681 2.450577,1.005563 1.969217,-2.360884 0.0876,-0.34976 0.656413,-2.404599 3.76338,0.69952 -0.174948,2.492041 0.04379,0.349763 0.962721,2.8418 z M 37.317246,49.582836 C 34.391966,49.472874 31.48564,48.395681 29.134072,46.347554 L 28.959123,46.172678 C 27.935677,45.246004 27.118859,44.199381 26.464795,43.06855 l 6.914122,-2.53576 c 1.127605,1.310051 2.740725,2.092239 4.419769,2.14227 l 2.450576,6.689171 c -0.961111,0.177375 -1.956843,0.255269 -2.931935,0.218599 z m 7.045399,-1.7488 -2.450577,-6.645453 c 1.341757,-1.149843 2.121553,-2.824158 2.14427,-4.546883 l 6.826595,-2.492041 c 0.673959,3.861579 -0.379455,8.019906 -3.282018,11.148608 -0.95322,1.02749 -2.077756,1.874471 -3.23827,2.535769 z m -19.38581,-8.918892 c -0.687966,-3.858684 0.329322,-8.013048 3.238269,-11.148609 0.961508,-1.036408 2.06659,-1.872924 3.238269,-2.535762 l 2.494325,6.820324 c -1.235767,1.11375 -1.998141,2.704025 -2.056716,4.328286 l -6.914147,2.535761 z m 13.171854,-0.480921 c -0.712539,0.06059 -1.43104,-0.295058 -1.794164,-0.961843 l 0,-0.04364 c -0.473515,-0.910382 -0.122235,-2.018256 0.787692,-2.492039 0.909864,-0.473775 2.020812,-0.123391 2.494327,0.786959 0.473516,0.910398 0.122235,2.018272 -0.787691,2.492041 -0.224447,0.116816 -0.462652,0.198441 -0.700164,0.218604 z m 4.37604,-5.902205 c -1.145544,-1.280458 -2.784696,-1.98899 -4.463566,-2.01112 l -2.494329,-6.776607 c 3.932348,-0.738386 8.134992,0.247407 11.290138,3.104123 1.031542,0.933971 1.882828,2.004686 2.538104,3.147841 l -6.87037,2.535763 z"
+       id="path6034"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff -Nru qmapshack-1.8.1/src/icons/ToolBar.svg qmapshack-1.9.0/src/icons/ToolBar.svg
--- qmapshack-1.8.1/src/icons/ToolBar.svg	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/icons/ToolBar.svg	2017-07-01 14:40:11.000000000 +0000
@@ -0,0 +1,121 @@
+<?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="svg3020"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ToolBar.svg"
+   inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_touch/src/icons/32x32/ToolBar.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs3022" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.2079788"
+     inkscape:cx="-124.3777"
+     inkscape:cy="-0.49180468"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1059"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="-47.636364,-6.1818182"
+       orientation="0,1"
+       id="guide3378" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3025">
+    <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
+       y="-52.745033"
+       x="-51.45879"
+       height="27.539677"
+       width="25.80184"
+       id="rect4156-1"
+       style="fill:none;stroke:#000080;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="scale(-1,-1)" />
+    <rect
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1.11963093;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3376"
+       width="14.149452"
+       height="15.008654"
+       x="-60.343952"
+       y="-39.215446"
+       transform="scale(-1,-1)" />
+    <rect
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1.11963093;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3376-6"
+       width="14.149452"
+       height="15.008654"
+       x="-46.14093"
+       y="-39.234631"
+       transform="scale(-1,-1)" />
+    <rect
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1.11963093;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3376-6-2"
+       width="14.149452"
+       height="15.008654"
+       x="-31.987909"
+       y="-39.21093"
+       transform="scale(-1,-1)" />
+    <rect
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1.11963093;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3376-6-9"
+       width="14.149452"
+       height="15.008654"
+       x="-17.785963"
+       y="-39.197201"
+       transform="scale(-1,-1)" />
+    <path
+       style="fill:#00ffff;stroke-width:1"
+       d="m 17.21196,31.697003 0,6.917858 -6.504852,0 -6.5048529,0 0,-6.917858 0,-6.917859 6.5048529,0 6.504852,0 0,6.917859 z"
+       id="path4216"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ff0000;stroke-width:1"
+       d="m 31.419384,31.697003 0,6.917858 -6.504852,0 -6.504852,0 0,-6.917858 0,-6.917859 6.504852,0 6.504852,0 0,6.917859 z"
+       id="path4218"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffff00;stroke-width:1"
+       d="m 59.754074,31.717652 0,6.93851 -6.484203,0 -6.484201,0 0,-6.93851 0,-6.938508 6.484201,0 6.484203,0 0,6.938508 z"
+       id="path4220"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff -Nru qmapshack-1.8.1/src/IMainWindow.ui qmapshack-1.9.0/src/IMainWindow.ui
--- qmapshack-1.8.1/src/IMainWindow.ui	2017-02-06 17:00:38.000000000 +0000
+++ qmapshack-1.9.0/src/IMainWindow.ui	2017-07-01 14:40:11.000000000 +0000
@@ -55,7 +55,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>23</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -103,7 +103,9 @@
      <string>Window</string>
     </property>
     <addaction name="actionCloseTab"/>
+    <addaction name="actionToggleDocks"/>
     <addaction name="separator"/>
+    <addaction name="actionSetupToolbar"/>
    </widget>
    <widget class="QMenu" name="menu">
     <property name="title">
@@ -279,6 +281,17 @@
     </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">
@@ -804,6 +817,33 @@
     <string>Quickstart Help</string>
    </property>
   </action>
+  <action name="actionSetupToolbar">
+   <property name="icon">
+    <iconset resource="resources.qrc">
+     <normaloff>:/icons/32x32/ToolBarSetup.png</normaloff>:/icons/32x32/ToolBarSetup.png</iconset>
+   </property>
+   <property name="text">
+    <string>Setup Toolbar</string>
+   </property>
+  </action>
+  <action name="actionToggleDocks">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="resources.qrc">
+     <normaloff>:/icons/32x32/ToggleDocks.png</normaloff>:/icons/32x32/ToggleDocks.png</iconset>
+   </property>
+   <property name="text">
+    <string>Toggle Docks</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle visibility of dockable windows</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff -Nru qmapshack-1.8.1/src/locale/qmapshack_cs.ts qmapshack-1.9.0/src/locale/qmapshack_cs.ts
--- qmapshack-1.8.1/src/locale/qmapshack_cs.ts	2017-04-15 15:35:44.000000000 +0000
+++ qmapshack-1.9.0/src/locale/qmapshack_cs.ts	2017-07-23 13:41:03.000000000 +0000
@@ -122,7 +122,7 @@
         <translation>Pohled %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="695"/>
+        <location filename="../canvas/CCanvas.cpp" line="705"/>
         <source>Setup Map Background</source>
         <translation>Nastavit pozadí mapy</translation>
     </message>
@@ -559,32 +559,32 @@
 <context>
     <name>CDetailsTrk</name>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Reduce visible track points</source>
         <translation>Omezit po�et viditelných bodů stopy</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change elevation of track points</source>
         <translation>Změnit informace o výškách bodů stopy</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Change timestamp of track points</source>
         <translation>Změnit �asová razítka bodů stopy</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
         <source>Color</source>
         <translation>Barva</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
         <source>Activity</source>
         <translation>ÄŒinnost</translation>
     </message>
@@ -615,7 +615,7 @@
         <translation>Obrázek %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="1063"/>
+        <location filename="../gis/gpx/serialization.cpp" line="1068"/>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
@@ -728,7 +728,7 @@
 <context>
     <name>CFitDecoder</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="119"/>
+        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="132"/>
         <source>FIT decoding error: unexpected end of file %1.</source>
         <translation>Chyba při dekódování FIT: Neo�ekávaný konec souboru %1.</translation>
     </message>
@@ -744,12 +744,12 @@
 <context>
     <name>CFitFieldDataState</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="115"/>
+        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
         <source>Missing field definition for development field.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="207"/>
+        <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>
     </message>
@@ -788,7 +788,7 @@
         <translation>Chyba při dekódování FIT: Architektura %1 není podporována.</translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="107"/>
+        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="110"/>
         <source>FIT decoding error: invalid offset %1 for state &apos;record content&apos;</source>
         <translation>Chyba při dekódování FIT: Neplatný posun %1 pro stav &apos;zaznamenaný obsah&apos;</translation>
     </message>
@@ -972,7 +972,7 @@
 <context>
     <name>CGisItemTrk</name>
     <message>
-        <location filename="../gis/fit/serialization.cpp" line="247"/>
+        <location filename="../gis/fit/serialization.cpp" line="246"/>
         <source>FIT file %1 contains no GPS data.</source>
         <translation>Soubor FIT %1 neobsahuje žádná data GPS.</translation>
     </message>
@@ -1228,37 +1228,37 @@
         <translation>Ukázat body.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
         <source>Changed name</source>
         <translation>Změněný název</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
         <source>Changed comment</source>
         <translation>Změněná poznámka</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
         <source>Changed description</source>
         <translation>Změněný popis</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
         <source>Changed links</source>
         <translation>Změněné odkazy</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
         <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="2047"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2041"/>
         <source>Changed activity to &apos;%1&apos; for complete track.</source>
         <translation>Činnost byla pro celou stopu změněna na &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
         <source>Changed activity to &apos;%1&apos; for range(%2..%3).</source>
         <translation>Činnost byla změněna pro oblast (%2...%3) na &apos;%1&apos;.</translation>
     </message>
@@ -1289,51 +1289,56 @@
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="221"/>
+        <source>Added terrain slope from DEM file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="243"/>
         <source>Replaced elevation data with data from DEM files.</source>
         <translation>Výšková data nahrazena daty ze souborů s digitálním výškovým modelem (DEM).</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="239"/>
+        <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>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="255"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="277"/>
         <source>Offset elevation data by %1%2.</source>
         <translation>Výšková data posunuta o %1%2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="268"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="290"/>
         <source>Changed start of track to %1.</source>
         <translation>Za�átek stopy změněn na %1.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="281"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="303"/>
         <source>Remove timestamps.</source>
         <translation>Odstranit �asová razítka.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="298"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="320"/>
         <source>Set artificial timestamps with delta of %1 sec.</source>
         <translation>Uměle utvořená �asová razítka nastavena s odstupem %1 s.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="324"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="346"/>
         <source>Changed speed to %1%2.</source>
         <translation>Rychlost změněna na %1%2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="343"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="365"/>
         <source>%1 (Segment %2)</source>
         <translation>%1 (�ást %2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="361"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="383"/>
         <source>Removed extension %1 from all Track Points</source>
         <translation>Rozšíření %1 bylo odstraněno ze všech bodů stopy</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="372"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="394"/>
         <source>Converted subpoints from routing to track points</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1346,17 +1351,17 @@
 <context>
     <name>CGisItemWpt</name>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="604"/>
+        <location filename="../gis/gpx/serialization.cpp" line="609"/>
         <source>Archived</source>
         <translation>Archivováno</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="608"/>
+        <location filename="../gis/gpx/serialization.cpp" line="613"/>
         <source>Available</source>
         <translation>Dostupné</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="612"/>
+        <location filename="../gis/gpx/serialization.cpp" line="617"/>
         <source>Not Available</source>
         <translation>Nedostupné</translation>
     </message>
@@ -1676,8 +1681,8 @@
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="652"/>
-        <location filename="../gis/CGisListWks.cpp" line="1650"/>
-        <location filename="../gis/CGisListWks.cpp" line="1688"/>
+        <location filename="../gis/CGisListWks.cpp" line="1646"/>
+        <location filename="../gis/CGisListWks.cpp" line="1684"/>
         <source>&lt;b&gt;Update devices&lt;/b&gt;&lt;p&gt;Update %1&lt;br/&gt;Please wait...&lt;/p&gt;</source>
         <translation>&lt;b&gt;Aktualizovat zařízení&lt;/b&gt;&lt;p&gt;Aktualizovat %1&lt;br/&gt;Po�kejte, prosím...&lt;/p&gt;</translation>
     </message>
@@ -1786,27 +1791,32 @@
 <context>
     <name>CGisWidget</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>Load project...</source>
         <translation>Nahrát projekt...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>The project &quot;%1&quot; is already in the workspace.</source>
         <translation>Projekt &quot;%1&quot; je již náhrán do pracovního prostoru.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="515"/>
+        <location filename="../gis/CGisWidget.cpp" line="554"/>
         <source>Copy items...</source>
         <translation>Kopírovat prvky...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="573"/>
+        <source>Change waypoint symbols.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Cut Track...</source>
         <translation>Rozkrojit stopu...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Do you want to delete the original track?</source>
         <translation>Opravdu chcete smazat původní stopu?</translation>
     </message>
@@ -1838,27 +1848,27 @@
         <translation>Není souborem GPX: %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="268"/>
         <source>File exists ...</source>
         <translation>Soubor existuje...</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="269"/>
         <source>The file exists and it has not been created by QMapShack. If you press &apos;yes&apos; 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. &lt;b&gt;Do you really want to overwrite the file?&lt;/b&gt;</source>
         <translation>Soubor existuje a nebyl vytvořen programem QMapShack. Pokud stisknete Ano, budou všechna data v tomto souboru ztracena. I když by tento soubor obsahoval data GPX a byl nahrán programem 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. &lt;b&gt;Opravdu chcete soubor přepsat?&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="386"/>
         <source>Failed to create file &apos;%1&apos;</source>
         <translation>Nepodařilo se vytvořit soubor &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="392"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="396"/>
         <source>Failed to write file &apos;%1&apos;</source>
         <translation>Nepodařilo se zapsat soubor &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="404"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="408"/>
         <source>Saving GIS data failed...</source>
         <translation>Nepodařilo se uložit data GIS...</translation>
     </message>
@@ -1889,27 +1899,27 @@
 <context>
     <name>CHistoryListWidget</name>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="62"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="65"/>
         <source> by %1</source>
         <translation> od %1</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="108"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
         <source>Cut history before</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="113"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="38"/>
         <source>Cut history after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="161"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="155"/>
         <source>History removal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="162"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
         <source>The removal is permanent and cannot be undone. &lt;b&gt;Do you really want to delete history before this step?&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1935,67 +1945,95 @@
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
         <source>Air Temperature</source>
         <translation>Teplota vzduchu</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
         <source>Water Temperature</source>
         <translation>Teplota vody</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
         <source>Depth</source>
         <translation>Hloubka</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
         <source>Heart Rate</source>
         <translation>Tep srdce</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
+        <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>Rychlost chůze</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
         <source>Speed</source>
         <translation>Rychlost</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
         <source>Acceleration</source>
         <translation>Zrychlení</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
         <source>Course</source>
         <translation>Směr</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <source>Temperature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <source>Sea Level Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Speed (vertical)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
         <source>Slope*</source>
         <translation>Sklon*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
         <source>Speed*</source>
         <translation>Rychlost*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
         <source>Elevation</source>
         <translation>Výška</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
         <source>Progress</source>
         <translation>Postup</translation>
     </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <source>Terrain slope</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CLostFoundProject</name>
@@ -2008,48 +2046,53 @@
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="588"/>
+        <location filename="../CMainWindow.cpp" line="769"/>
         <source>Use &lt;b&gt;Menu-&gt;View-&gt;Add Map View&lt;/b&gt; to open a new view. Or &lt;b&gt;Menu-&gt;File-&gt;Load Map View&lt;/b&gt; to restore a saved one. Or click &lt;a href=&apos;newview&apos;&gt;here&lt;/a&gt;.</source>
         <translation>Použít &lt;b&gt;Nabídka → Pohled → Přidat pohled na mapu&lt;/b&gt; k otevření nového pohledu. Nebo &lt;b&gt;Nabídka → Soubor → Nahrát pohled na mapu&lt;/b&gt; k obnovení uložené. Nebo klepněte &lt;a href=&apos;newview&apos;&gt;sem&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="716"/>
+        <location filename="../CMainWindow.cpp" line="897"/>
         <source>Ele: %1%2</source>
         <translation>Výška: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="732"/>
+        <location filename="../CMainWindow.cpp" line="909"/>
+        <source>Slope: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="925"/>
         <source>[Grid: %1]</source>
         <translation>[Mřížka: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="867"/>
+        <location filename="../CMainWindow.cpp" line="1066"/>
         <source>Load GIS Data...</source>
         <translation>Nahrát data GIS...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
         <source>Select output file</source>
         <translation>Vybrat výstupní soubor</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>QMapShack View (*.view)</source>
         <translation>Pohled QMapShack (*.view)</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>Select file to load</source>
         <translation>Vybrat soubor k nahrání</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1106"/>
+        <location filename="../CMainWindow.cpp" line="1369"/>
         <source>Fatal...</source>
         <translation>Kritické...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1107"/>
+        <location filename="../CMainWindow.cpp" line="1370"/>
         <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>
@@ -2072,620 +2115,631 @@
         <translation>Nepodařilo se...</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="157"/>
+        <location filename="../map/CMapIMG.cpp" line="175"/>
         <source>Unspecified</source>
         <translation>Neur�eno</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="158"/>
+        <location filename="../map/CMapIMG.cpp" line="176"/>
         <source>French</source>
         <translation>Francouzský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="159"/>
+        <location filename="../map/CMapIMG.cpp" line="177"/>
         <source>German</source>
         <translation>Německý</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="160"/>
+        <location filename="../map/CMapIMG.cpp" line="178"/>
         <source>Dutch</source>
         <translation>Holandský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="161"/>
+        <location filename="../map/CMapIMG.cpp" line="179"/>
         <source>English</source>
         <translation>Anglický</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="162"/>
+        <location filename="../map/CMapIMG.cpp" line="180"/>
         <source>Italian</source>
         <translation>Italský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="163"/>
+        <location filename="../map/CMapIMG.cpp" line="181"/>
         <source>Finnish</source>
         <translation>Finský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="164"/>
+        <location filename="../map/CMapIMG.cpp" line="182"/>
         <source>Swedish</source>
         <translation>Švédský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="165"/>
+        <location filename="../map/CMapIMG.cpp" line="183"/>
         <source>Spanish</source>
         <translation>Španělský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="166"/>
+        <location filename="../map/CMapIMG.cpp" line="184"/>
         <source>Basque</source>
         <translation>Baskický</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="167"/>
+        <location filename="../map/CMapIMG.cpp" line="185"/>
         <source>Catalan</source>
         <translation>Katalánský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="168"/>
+        <location filename="../map/CMapIMG.cpp" line="186"/>
         <source>Galician</source>
         <translation>Galicijský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="169"/>
+        <location filename="../map/CMapIMG.cpp" line="187"/>
         <source>Welsh</source>
         <translation>Velšský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="170"/>
+        <location filename="../map/CMapIMG.cpp" line="188"/>
         <source>Gaelic</source>
         <translation>Gaelský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="171"/>
+        <location filename="../map/CMapIMG.cpp" line="189"/>
         <source>Danish</source>
         <translation>Dánský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="172"/>
+        <location filename="../map/CMapIMG.cpp" line="190"/>
         <source>Norwegian</source>
         <translation>Norský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="173"/>
+        <location filename="../map/CMapIMG.cpp" line="191"/>
         <source>Portuguese</source>
         <translation>Portugalský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="174"/>
+        <location filename="../map/CMapIMG.cpp" line="192"/>
         <source>Slovak</source>
         <translation>Slovenský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="175"/>
+        <location filename="../map/CMapIMG.cpp" line="193"/>
         <source>Czech</source>
         <translation>Český</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="176"/>
+        <location filename="../map/CMapIMG.cpp" line="194"/>
         <source>Croatian</source>
         <translation>Chorvatský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="177"/>
+        <location filename="../map/CMapIMG.cpp" line="195"/>
         <source>Hungarian</source>
         <translation>Ma�arský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="178"/>
+        <location filename="../map/CMapIMG.cpp" line="196"/>
         <source>Polish</source>
         <translation>Polský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="179"/>
+        <location filename="../map/CMapIMG.cpp" line="197"/>
         <source>Turkish</source>
         <translation>Turecký</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="180"/>
+        <location filename="../map/CMapIMG.cpp" line="198"/>
         <source>Greek</source>
         <translation>Řecký</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="181"/>
+        <location filename="../map/CMapIMG.cpp" line="199"/>
         <source>Slovenian</source>
         <translation>Slovinský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="182"/>
+        <location filename="../map/CMapIMG.cpp" line="200"/>
         <source>Russian</source>
         <translation>Ruský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="183"/>
+        <location filename="../map/CMapIMG.cpp" line="201"/>
         <source>Estonian</source>
         <translation>Estonský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="184"/>
+        <location filename="../map/CMapIMG.cpp" line="202"/>
         <source>Latvian</source>
         <translation>Lotyšský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="185"/>
+        <location filename="../map/CMapIMG.cpp" line="203"/>
         <source>Romanian</source>
         <translation>Rumunský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="186"/>
+        <location filename="../map/CMapIMG.cpp" line="204"/>
         <source>Albanian</source>
         <translation>Albánský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="187"/>
+        <location filename="../map/CMapIMG.cpp" line="205"/>
         <source>Bosnian</source>
         <translation>Bosenský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="188"/>
+        <location filename="../map/CMapIMG.cpp" line="206"/>
         <source>Lithuanian</source>
         <translation>Litevský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="189"/>
+        <location filename="../map/CMapIMG.cpp" line="207"/>
         <source>Serbian</source>
         <translation>Srbský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="190"/>
+        <location filename="../map/CMapIMG.cpp" line="208"/>
         <source>Macedonian</source>
         <translation>Makedonský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="191"/>
+        <location filename="../map/CMapIMG.cpp" line="209"/>
         <source>Bulgarian</source>
         <translation>Bulharský</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="248"/>
+        <location filename="../map/CMapIMG.cpp" line="266"/>
         <source>Major highway</source>
         <translation>Dálnice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="249"/>
+        <location filename="../map/CMapIMG.cpp" line="267"/>
         <source>Principal highway</source>
         <translation>Silnice první třídy</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="250"/>
+        <location filename="../map/CMapIMG.cpp" line="268"/>
         <source>Other highway</source>
         <translation>Jiné rychlostní silnice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="251"/>
+        <location filename="../map/CMapIMG.cpp" line="269"/>
         <source>Arterial road</source>
         <translation>Rychlostní silnice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="252"/>
+        <location filename="../map/CMapIMG.cpp" line="270"/>
         <source>Collector road</source>
         <translation>Státní silnice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="253"/>
+        <location filename="../map/CMapIMG.cpp" line="271"/>
         <source>Residential street</source>
         <translation>Silnice v obytné oblasti</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="254"/>
+        <location filename="../map/CMapIMG.cpp" line="272"/>
         <source>Alley/Private road</source>
         <translation>Soukromá cesta</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="255"/>
+        <location filename="../map/CMapIMG.cpp" line="273"/>
         <source>Highway ramp, low speed</source>
         <translation>Nájezd na dálnici/sjezd z dálnice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="256"/>
+        <location filename="../map/CMapIMG.cpp" line="274"/>
         <source>Highway ramp, high speed</source>
         <translation>Nájezd na dálnici/sjezd z dálnice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="257"/>
+        <location filename="../map/CMapIMG.cpp" line="275"/>
         <source>Unpaved road</source>
         <translation>Neasfaltovaná cesta</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="258"/>
+        <location filename="../map/CMapIMG.cpp" line="276"/>
         <source>Major highway connector</source>
         <translation>Dalni�ní přivadě�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="259"/>
+        <location filename="../map/CMapIMG.cpp" line="277"/>
         <source>Roundabout</source>
         <translation>Kruhový objezd</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="260"/>
+        <location filename="../map/CMapIMG.cpp" line="278"/>
         <source>Railroad</source>
         <translation>Železnice, koleje</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="261"/>
+        <location filename="../map/CMapIMG.cpp" line="279"/>
         <source>Shoreline</source>
         <translation>Břeh</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="262"/>
+        <location filename="../map/CMapIMG.cpp" line="280"/>
         <source>Trail</source>
         <translation>Cesta</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="263"/>
+        <location filename="../map/CMapIMG.cpp" line="281"/>
         <source>Stream</source>
         <translation>Proud</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="264"/>
+        <location filename="../map/CMapIMG.cpp" line="282"/>
         <source>Time zone</source>
         <translation>Časové pásmo</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="265"/>
-        <location filename="../map/CMapIMG.cpp" line="266"/>
+        <location filename="../map/CMapIMG.cpp" line="283"/>
+        <location filename="../map/CMapIMG.cpp" line="284"/>
         <source>Ferry</source>
         <translation>Přívoz</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="267"/>
+        <location filename="../map/CMapIMG.cpp" line="285"/>
         <source>State/province border</source>
         <translation>Státní/Zemská hranice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="268"/>
+        <location filename="../map/CMapIMG.cpp" line="286"/>
         <source>County/parish border</source>
         <translation>Krajská/Obecní hranice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="269"/>
+        <location filename="../map/CMapIMG.cpp" line="287"/>
         <source>International border</source>
         <translation>Mezinárodní hranice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="270"/>
+        <location filename="../map/CMapIMG.cpp" line="288"/>
         <source>River</source>
         <translation>Řeka</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="271"/>
+        <location filename="../map/CMapIMG.cpp" line="289"/>
         <source>Minor land contour</source>
         <translation>Malá vrstevnice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="272"/>
+        <location filename="../map/CMapIMG.cpp" line="290"/>
         <source>Intermediate land contour</source>
         <translation>Střední vrstevnice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="273"/>
+        <location filename="../map/CMapIMG.cpp" line="291"/>
         <source>Major land contour</source>
         <translation>Velká vrstevnice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="274"/>
+        <location filename="../map/CMapIMG.cpp" line="292"/>
         <source>Minor depth contour</source>
         <translation>Malá hloubková �ára</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="275"/>
+        <location filename="../map/CMapIMG.cpp" line="293"/>
         <source>Intermediate depth contour</source>
         <translation>Střední hloubková �ára</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="276"/>
+        <location filename="../map/CMapIMG.cpp" line="294"/>
         <source>Major depth contour</source>
         <translation>Velká hloubková �ára</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="277"/>
+        <location filename="../map/CMapIMG.cpp" line="295"/>
         <source>Intermittent stream</source>
         <translation>Přerušovaný potok (Wadi)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="278"/>
-        <location filename="../map/CMapIMG.cpp" line="360"/>
+        <location filename="../map/CMapIMG.cpp" line="296"/>
+        <location filename="../map/CMapIMG.cpp" line="378"/>
         <source>Airport runway</source>
         <translation>Přistávací dráha</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="279"/>
+        <location filename="../map/CMapIMG.cpp" line="297"/>
         <source>Pipeline</source>
         <translation>Dálkové potrubí</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="280"/>
+        <location filename="../map/CMapIMG.cpp" line="298"/>
         <source>Powerline</source>
         <translation>Elektrické vedení</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="281"/>
+        <location filename="../map/CMapIMG.cpp" line="299"/>
         <source>Marine boundary</source>
         <translation>Hranice moře</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="282"/>
+        <location filename="../map/CMapIMG.cpp" line="300"/>
         <source>Hazard boundary</source>
         <translation>Nebezpe�ná hranice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="347"/>
+        <location filename="../map/CMapIMG.cpp" line="365"/>
         <source>Large urban area (&amp;gt;200K)</source>
         <translation>Velkoměstská oblast (&amp;gt;200 000)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="348"/>
+        <location filename="../map/CMapIMG.cpp" line="366"/>
         <source>Small urban area (&amp;lt;200K)</source>
         <translation>Maloměstská oblast (&amp;gt;200 000)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="349"/>
+        <location filename="../map/CMapIMG.cpp" line="367"/>
         <source>Rural housing area</source>
         <translation>Městská obytná oblast</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="350"/>
+        <location filename="../map/CMapIMG.cpp" line="368"/>
         <source>Military base</source>
         <translation>Vojenská základna</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="351"/>
+        <location filename="../map/CMapIMG.cpp" line="369"/>
         <source>Parking lot</source>
         <translation>Parkoviště</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="352"/>
+        <location filename="../map/CMapIMG.cpp" line="370"/>
         <source>Parking garage</source>
         <translation>Parkovací budova</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="353"/>
+        <location filename="../map/CMapIMG.cpp" line="371"/>
         <source>Airport</source>
         <translation>Letiště</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="354"/>
+        <location filename="../map/CMapIMG.cpp" line="372"/>
         <source>Shopping center</source>
         <translation>Nákupní středisko</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="355"/>
+        <location filename="../map/CMapIMG.cpp" line="373"/>
         <source>Marina</source>
         <translation>Přístav</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="356"/>
+        <location filename="../map/CMapIMG.cpp" line="374"/>
         <source>University/College</source>
         <translation>Univerzita/Vysoká škola</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="357"/>
+        <location filename="../map/CMapIMG.cpp" line="375"/>
         <source>Hospital</source>
         <translation>Nemocnice</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="358"/>
+        <location filename="../map/CMapIMG.cpp" line="376"/>
         <source>Industrial complex</source>
         <translation>Průmyslový celek</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="359"/>
+        <location filename="../map/CMapIMG.cpp" line="377"/>
         <source>Reservation</source>
         <translation>Chráněné území</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="361"/>
+        <location filename="../map/CMapIMG.cpp" line="379"/>
         <source>Man-made area</source>
         <translation>Zástavba</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="362"/>
+        <location filename="../map/CMapIMG.cpp" line="380"/>
         <source>Sports complex</source>
         <translation>Oblast pro tělesné �innosti</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="363"/>
+        <location filename="../map/CMapIMG.cpp" line="381"/>
         <source>Golf course</source>
         <translation>Golfové hřiště</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="364"/>
+        <location filename="../map/CMapIMG.cpp" line="382"/>
         <source>Cemetery</source>
         <translation>Hřbitov</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="365"/>
-        <location filename="../map/CMapIMG.cpp" line="366"/>
-        <location filename="../map/CMapIMG.cpp" line="367"/>
+        <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>Národní park</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="368"/>
+        <location filename="../map/CMapIMG.cpp" line="386"/>
         <source>City park</source>
         <translation>Městské sady</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="369"/>
-        <location filename="../map/CMapIMG.cpp" line="370"/>
-        <location filename="../map/CMapIMG.cpp" line="371"/>
+        <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>Státní park</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="372"/>
+        <location filename="../map/CMapIMG.cpp" line="390"/>
         <source>Forest</source>
         <translation>Les</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="373"/>
+        <location filename="../map/CMapIMG.cpp" line="391"/>
         <source>Ocean</source>
         <translation>Oceán</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="374"/>
-        <location filename="../map/CMapIMG.cpp" line="376"/>
-        <location filename="../map/CMapIMG.cpp" line="386"/>
+        <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>Modrá (neznámé)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="375"/>
+        <location filename="../map/CMapIMG.cpp" line="393"/>
         <source>Sea</source>
         <translation>Moře</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="377"/>
-        <location filename="../map/CMapIMG.cpp" line="378"/>
-        <location filename="../map/CMapIMG.cpp" line="385"/>
+        <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>Velké jezero</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="379"/>
-        <location filename="../map/CMapIMG.cpp" line="380"/>
+        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="398"/>
         <source>Medium lake</source>
         <translation>Střední jezero</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="381"/>
-        <location filename="../map/CMapIMG.cpp" line="382"/>
+        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="400"/>
         <source>Small lake</source>
         <translation>Malé jezero</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="383"/>
-        <location filename="../map/CMapIMG.cpp" line="384"/>
+        <location filename="../map/CMapIMG.cpp" line="401"/>
+        <location filename="../map/CMapIMG.cpp" line="402"/>
         <source>Major lake</source>
         <translation>Velmi velké jezero</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="387"/>
+        <location filename="../map/CMapIMG.cpp" line="405"/>
         <source>Major River</source>
         <translation>Veletok</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="388"/>
+        <location filename="../map/CMapIMG.cpp" line="406"/>
         <source>Large River</source>
         <translation>Velká řeka</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="389"/>
+        <location filename="../map/CMapIMG.cpp" line="407"/>
         <source>Medium River</source>
         <translation>Střední řeka</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="390"/>
+        <location filename="../map/CMapIMG.cpp" line="408"/>
         <source>Small River</source>
         <translation>Malá řeka</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="393"/>
+        <location filename="../map/CMapIMG.cpp" line="411"/>
         <source>Intermittent water</source>
         <translation>Přerušovaná voda</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="394"/>
+        <location filename="../map/CMapIMG.cpp" line="412"/>
         <source>Wetland/Swamp</source>
         <translation>Mo�ál/Bažina</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="395"/>
+        <location filename="../map/CMapIMG.cpp" line="413"/>
         <source>Glacier</source>
         <translation>Ledovec</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="396"/>
+        <location filename="../map/CMapIMG.cpp" line="414"/>
         <source>Orchard/Plantation</source>
         <translation>Sad/Plantáž</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="415"/>
         <source>Scrub</source>
         <translation>Křoví</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="398"/>
+        <location filename="../map/CMapIMG.cpp" line="416"/>
         <source>Tundra</source>
         <translation>Tundra</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="417"/>
         <source>Flat</source>
         <translation>Rovina</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="400"/>
+        <location filename="../map/CMapIMG.cpp" line="418"/>
         <source>???</source>
         <translation>???</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="436"/>
+        <location filename="../map/CMapIMG.cpp" line="432"/>
+        <source>Read external type file...</source>
+        <translation type="unfinished"></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>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="474"/>
         <source>Failed to read: </source>
         <translation>Nepodařilo se pře�íst: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="479"/>
+        <location filename="../map/CMapIMG.cpp" line="517"/>
         <source>Failed to open: </source>
         <translation>Nepodařilo se otevřít: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="503"/>
-        <location filename="../map/CMapIMG.cpp" line="507"/>
+        <location filename="../map/CMapIMG.cpp" line="541"/>
+        <location filename="../map/CMapIMG.cpp" line="545"/>
         <source>Bad file format: </source>
         <translation>Špatný formát souboru: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="596"/>
+        <location filename="../map/CMapIMG.cpp" line="634"/>
         <source>Failed to read file structure: </source>
         <translation>Nepodařilo se pře�íst stavbu souboru: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="631"/>
+        <location filename="../map/CMapIMG.cpp" line="669"/>
         <source>Loading %1</source>
         <translation>Nahrává se %1</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="637"/>
+        <location filename="../map/CMapIMG.cpp" line="675"/>
         <source>User abort: </source>
         <translation>Zrušeno uživatelem: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="640"/>
+        <location filename="../map/CMapIMG.cpp" line="678"/>
         <source>File is NT format. QMapShack is unable to read map files with NT format: </source>
         <translation>Soubor je ve formátu NT. QMapShack nedokáže �íst mapové soubory ve formátu NT: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="731"/>
+        <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>Soubor obsahuje zamknutá/zašifrovaná data. Garmin nechce, aby byl tento soubor použit s jiným programem než dodaným Garminem.</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2342"/>
-        <location filename="../map/CMapIMG.cpp" line="2348"/>
-        <location filename="../map/CMapIMG.cpp" line="2352"/>
+        <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>Podivuhodnost</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2438"/>
+        <location filename="../map/CMapIMG.cpp" line="2484"/>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2480"/>
-        <location filename="../map/CMapIMG.cpp" line="2488"/>
-        <location filename="../map/CMapIMG.cpp" line="2495"/>
+        <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>Oblast</translation>
     </message>
@@ -2745,6 +2799,14 @@
     </message>
 </context>
 <context>
+    <name>CMapPropSetup</name>
+    <message>
+        <location filename="../map/CMapPropSetup.cpp" line="196"/>
+        <source>Select type file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CMapRMAP</name>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="48"/>
@@ -3179,7 +3241,7 @@
         <translation>Uplynulý �as: %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="86"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="87"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation>Uplynulý �as: %1 sekund.</translation>
     </message>
@@ -3796,27 +3858,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="620"/>
         <source>error renaming file %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+        <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>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
         <source>being downloaded: %1 of %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
         <source>no local data, online available: %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="798"/>
         <source>local data outdated (%1, %2 - remote %3, %4)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3836,12 +3898,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="806"/>
         <source>local data up to date (%1, %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="818"/>
         <source>no routing-data available</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3849,13 +3911,13 @@
 <context>
     <name>CRouterBRouterToolShell</name>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
         <source>!!! done !!!
 </source>
         <translation type="unfinished">Hotovo!</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
         <source>!!! failed !!!
 </source>
         <translation type="unfinished">Nepodařilo se!</translation>
@@ -4194,7 +4256,7 @@
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="415"/>
         <source>Calculate route with %1</source>
         <translation>Spo�ítat cestu s %1</translation>
     </message>
@@ -4572,6 +4634,19 @@
     </message>
 </context>
 <context>
+    <name>CToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="43"/>
+        <source>Available Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="44"/>
+        <source>Selected Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CTwoNavProject</name>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
@@ -6163,6 +6238,29 @@
     </message>
 </context>
 <context>
+    <name>IFilterTerrainSlope</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulář</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="51"/>
+        <source>&lt;b&gt;Calculate Terrain Slope&lt;/b&gt;</source>
+        <translation type="unfinished"></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>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="70"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+</context>
+<context>
     <name>IFitDecoderState</name>
     <message>
         <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="31"/>
@@ -6343,31 +6441,46 @@
         <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="49"/>
+        <location filename="../gis/IGisWidget.ui" line="43"/>
         <source>Opacity</source>
         <translation type="unfinished">Neprůhlednost</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="56"/>
+        <location filename="../gis/IGisWidget.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="108"/>
-        <location filename="../gis/IGisWidget.ui" line="138"/>
+        <location filename="../gis/IGisWidget.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"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="143"/>
+        <location filename="../gis/IGisWidget.ui" line="151"/>
         <source>Age</source>
         <translation>Věk</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="177"/>
+        <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>
     </message>
+    <message>
+        <location filename="../gis/IGisWidget.ui" line="205"/>
+        <source>Clear Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <source>Setup Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IGridSetup</name>
@@ -6523,338 +6636,363 @@
         <translation>Okno</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="110"/>
+        <location filename="../IMainWindow.ui" line="112"/>
         <source>?</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="118"/>
+        <location filename="../IMainWindow.ui" line="120"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="129"/>
+        <location filename="../IMainWindow.ui" line="131"/>
         <source>Tool</source>
         <translation>Nástroj</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="154"/>
+        <location filename="../IMainWindow.ui" line="156"/>
         <source>Maps</source>
         <translation>Mapy</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="197"/>
+        <location filename="../IMainWindow.ui" line="199"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation>Digitální výškový model</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="236"/>
+        <location filename="../IMainWindow.ui" line="238"/>
         <source>Data</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="294"/>
+        <location filename="../IMainWindow.ui" line="307"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="309"/>
+        <location filename="../IMainWindow.ui" line="322"/>
         <source>Show Scale</source>
         <translation>Ukázat měřítko</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="321"/>
+        <location filename="../IMainWindow.ui" line="334"/>
         <source>Setup Map Font</source>
         <translation>Nastavit písmo mapy</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="336"/>
+        <location filename="../IMainWindow.ui" line="349"/>
         <source>Show Grid</source>
         <translation>Ukázat mřížku</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="339"/>
+        <location filename="../IMainWindow.ui" line="352"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="351"/>
+        <location filename="../IMainWindow.ui" line="364"/>
         <source>Setup Grid</source>
         <translation>Nastavit mřížku</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="354"/>
+        <location filename="../IMainWindow.ui" line="367"/>
         <source>Ctrl+Alt+G</source>
         <translation>Ctrl+Alt+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="382"/>
         <source>Flip Mouse Wheel</source>
         <translation>Obrátit kole�ko myši</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="381"/>
-        <location filename="../IMainWindow.ui" line="384"/>
+        <location filename="../IMainWindow.ui" line="394"/>
+        <location filename="../IMainWindow.ui" line="397"/>
         <source>Setup Map Paths</source>
         <translation>Nastavit cesty k mapám</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="399"/>
+        <location filename="../IMainWindow.ui" line="412"/>
         <source>POI Text</source>
         <translation>Text POI</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="414"/>
+        <location filename="../IMainWindow.ui" line="427"/>
         <source>Night / Day</source>
         <translation>Noc/Den</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="429"/>
+        <location filename="../IMainWindow.ui" line="442"/>
         <source>Map Tool Tip</source>
         <translation>Rada k nástroji pro mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="444"/>
+        <location filename="../IMainWindow.ui" line="457"/>
         <source>Setup DEM Paths</source>
         <translation>Nastavit cesty k výškovým modelům</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="456"/>
+        <location filename="../IMainWindow.ui" line="469"/>
         <source>About</source>
         <translation>O programu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="468"/>
+        <location filename="../IMainWindow.ui" line="481"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="254"/>
+        <location filename="../IMainWindow.ui" line="256"/>
         <source>Route</source>
         <translation>Cesta</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="288"/>
-        <location filename="../IMainWindow.ui" line="291"/>
+        <location filename="../IMainWindow.ui" line="286"/>
+        <source>Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="301"/>
+        <location filename="../IMainWindow.ui" line="304"/>
         <source>Add Map View</source>
         <translation>Přidat pohled na mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="432"/>
+        <location filename="../IMainWindow.ui" line="445"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="484"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="483"/>
-        <location filename="../IMainWindow.ui" line="486"/>
+        <location filename="../IMainWindow.ui" line="496"/>
+        <location filename="../IMainWindow.ui" line="499"/>
         <source>Setup Map View</source>
         <translation>Nastavit pohled na mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="498"/>
+        <location filename="../IMainWindow.ui" line="511"/>
         <source>Load GIS Data</source>
         <translation>Nahrát data GIS</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="501"/>
+        <location filename="../IMainWindow.ui" line="514"/>
         <source>Load projects from file</source>
         <translation>Nahrát projekty ze souboru</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="504"/>
+        <location filename="../IMainWindow.ui" line="517"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="516"/>
+        <location filename="../IMainWindow.ui" line="529"/>
         <source>Save All GIS Data</source>
         <translation>Uložit všechna data GIS</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="519"/>
+        <location filename="../IMainWindow.ui" line="532"/>
         <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="522"/>
+        <location filename="../IMainWindow.ui" line="535"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="534"/>
+        <location filename="../IMainWindow.ui" line="547"/>
         <source>Setup Time Zone</source>
         <translation>Nastavit �asové pásmo</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="546"/>
+        <location filename="../IMainWindow.ui" line="559"/>
         <source>Add empty project</source>
         <translation>Přidat prázdný projekt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="561"/>
+        <location filename="../IMainWindow.ui" line="574"/>
         <source>Search Google</source>
         <translation>Hledat pomocí Google</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="573"/>
+        <location filename="../IMainWindow.ui" line="586"/>
         <source>Close all projects</source>
         <translation>Zavřít všechny projekty</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="576"/>
+        <location filename="../IMainWindow.ui" line="589"/>
         <source>F8</source>
         <translation>F8</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="588"/>
+        <location filename="../IMainWindow.ui" line="601"/>
         <source>Setup Units</source>
         <translation>Nastavit jednotky</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="600"/>
+        <location filename="../IMainWindow.ui" line="613"/>
         <source>Setup Workspace</source>
         <translation>Nastavit pracovní prostor</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="603"/>
+        <location filename="../IMainWindow.ui" line="616"/>
         <source>Setup save on exit.</source>
         <translation>Nastavit uložení při ukon�ení.</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="615"/>
+        <location filename="../IMainWindow.ui" line="628"/>
         <source>Import Database from QLandkarte</source>
         <translation>Zavést databázi z QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="618"/>
+        <location filename="../IMainWindow.ui" line="631"/>
         <source>Import QLandkarte GT database</source>
         <translation>Zavést databázi GT QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="630"/>
+        <location filename="../IMainWindow.ui" line="643"/>
         <source>VRT Builder</source>
         <translation>Sestavova� VRT</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="633"/>
+        <location filename="../IMainWindow.ui" line="646"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation>Rozhraní pro gdalbuildvrt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="645"/>
+        <location filename="../IMainWindow.ui" line="658"/>
         <source>Store Map View</source>
         <translation>Uložit pohled na mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="648"/>
+        <location filename="../IMainWindow.ui" line="661"/>
         <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="660"/>
+        <location filename="../IMainWindow.ui" line="673"/>
         <source>Load Map View</source>
         <translation>Nahrát pohled na mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="663"/>
+        <location filename="../IMainWindow.ui" line="676"/>
         <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="678"/>
+        <location filename="../IMainWindow.ui" line="691"/>
         <source>Ext. Profile</source>
         <translation>Ext. Profil</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="681"/>
+        <location filename="../IMainWindow.ui" line="694"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="693"/>
+        <location filename="../IMainWindow.ui" line="706"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="696"/>
+        <location filename="../IMainWindow.ui" line="709"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="708"/>
+        <location filename="../IMainWindow.ui" line="721"/>
         <source>Clone Map View</source>
         <translation>Klonovat pohled na mapu</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="711"/>
+        <location filename="../IMainWindow.ui" line="724"/>
         <source>Ctrl+Shift+T</source>
         <translation>Ctrl+Shift+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="723"/>
+        <location filename="../IMainWindow.ui" line="736"/>
         <source>Create Routino Database</source>
         <translation>Vytvořit databázi Routino</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="735"/>
+        <location filename="../IMainWindow.ui" line="748"/>
         <source>Save(Print) Map Screenshot</source>
         <translation>Uložit (vytisknout) snímek obrazovky s mapou</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="738"/>
+        <location filename="../IMainWindow.ui" line="751"/>
         <source>Print a selected area of the map</source>
         <translation>Vytisknout vybranou oblast mapy</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="741"/>
+        <location filename="../IMainWindow.ui" line="754"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="753"/>
+        <location filename="../IMainWindow.ui" line="766"/>
         <source>Setup Coord. Format</source>
         <translation>Nastavit formát souřadnic</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="756"/>
+        <location filename="../IMainWindow.ui" line="769"/>
         <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="768"/>
+        <location filename="../IMainWindow.ui" line="781"/>
         <source>Setup Map Background</source>
         <translation>Nastavit pozadí mapy</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="780"/>
+        <location filename="../IMainWindow.ui" line="793"/>
         <source>Setup Waypoint Icons</source>
         <translation>Stanovit ikony cestovních bodů</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="783"/>
+        <location filename="../IMainWindow.ui" line="796"/>
         <source>Setup path to custom icons</source>
         <translation>Stanovit cestu k vlastním ikonám</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="792"/>
+        <location filename="../IMainWindow.ui" line="805"/>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="795"/>
+        <location filename="../IMainWindow.ui" line="808"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="804"/>
+        <location filename="../IMainWindow.ui" line="817"/>
         <source>Quickstart Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="826"/>
+        <source>Setup Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="838"/>
+        <source>Toggle Docks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="841"/>
+        <source>Toggle visibility of dockable windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="844"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished">Ctrl+D</translation>
+    </message>
 </context>
 <context>
     <name>IMapList</name>
@@ -6964,6 +7102,8 @@
     <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>
@@ -7008,6 +7148,21 @@
         <translation>Cesta k vyrovnávací paměti</translation>
     </message>
     <message>
+        <location filename="../map/IMapPropSetup.ui" line="353"/>
+        <source>Type File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="367"/>
+        <source>Forget external type file and use internal types.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="381"/>
+        <source>Load an external type file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../map/IMapPropSetup.ui" line="227"/>
         <source>Cache Size (MB)</source>
         <translation>Velikost vyrovnávací paměti (MB)</translation>
@@ -8137,8 +8292,8 @@
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="222"/>
-        <source>Select all itmes that are completely inside the selected area.</source>
-        <translation>Vybrat všechny prvky, které jsou úplně uvnitř vybrané oblasti.</translation>
+        <source>Select all items that are completely inside the selected area.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="282"/>
@@ -8411,6 +8566,52 @@
     </message>
 </context>
 <context>
+    <name>ISelectDoubleListWidget</name>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulář</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="22"/>
+        <source>Available</source>
+        <translation type="unfinished">Dostupné</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="46"/>
+        <source>Add to selected items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="60"/>
+        <source>Remove from selected items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="78"/>
+        <source>Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="102"/>
+        <source>Move selected items up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="116"/>
+        <source>Move selected items down</source>
+        <translation type="unfinished"></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 type="unfinished">...</translation>
+    </message>
+</context>
+<context>
     <name>ISelectProjectDialog</name>
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="14"/>
@@ -8589,6 +8790,29 @@
     </message>
 </context>
 <context>
+    <name>ISetupFilter</name>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulář</translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="38"/>
+        <source>Apply filter to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="45"/>
+        <source>name only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="52"/>
+        <source>complete text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ISetupFolder</name>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="14"/>
@@ -9022,6 +9246,14 @@
     </message>
 </context>
 <context>
+    <name>IToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/IToolBarSetupDialog.ui" line="14"/>
+        <source>Setup Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IToolShell</name>
     <message>
         <location filename="../tool/IToolShell.cpp" line="46"/>
diff -Nru qmapshack-1.8.1/src/locale/qmapshack_de.ts qmapshack-1.9.0/src/locale/qmapshack_de.ts
--- qmapshack-1.8.1/src/locale/qmapshack_de.ts	2017-04-15 15:35:44.000000000 +0000
+++ qmapshack-1.9.0/src/locale/qmapshack_de.ts	2017-07-23 13:41:03.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
+<TS version="2.0" language="de_DE">
 <context>
     <name>CAbout</name>
     <message>
@@ -122,7 +122,7 @@
         <translation>Ansicht %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="695"/>
+        <location filename="../canvas/CCanvas.cpp" line="705"/>
         <source>Setup Map Background</source>
         <translation>Kartenhintergrund einstellen</translation>
     </message>
@@ -559,32 +559,32 @@
 <context>
     <name>CDetailsTrk</name>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Reduce visible track points</source>
         <translation>Sichtbare Trackpunkte reduzieren</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change elevation of track points</source>
         <translation>Höhe von Trackpunkten ändern</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Change timestamp of track points</source>
         <translation>Zeitstempel von Trackpunkten ändern</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Miscellaneous</source>
         <translation>Verschiedenes</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
         <source>Color</source>
         <translation>Farbe</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
         <source>Activity</source>
         <translation>Aktivität</translation>
     </message>
@@ -615,7 +615,7 @@
         <translation>Bild %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="1063"/>
+        <location filename="../gis/gpx/serialization.cpp" line="1068"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
@@ -728,7 +728,7 @@
 <context>
     <name>CFitDecoder</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="119"/>
+        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="132"/>
         <source>FIT decoding error: unexpected end of file %1.</source>
         <translation>FIT Dekodierfehler: Unerwartetes Ende der Datei %1.</translation>
     </message>
@@ -744,14 +744,14 @@
 <context>
     <name>CFitFieldDataState</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="115"/>
+        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
         <source>Missing field definition for development field.</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="207"/>
+        <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></translation>
     </message>
 </context>
 <context>
@@ -788,7 +788,7 @@
         <translation>FIT Dekodierfehler: Architektur %1 wird nicht unterstützt.</translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="107"/>
+        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="110"/>
         <source>FIT decoding error: invalid offset %1 for state &apos;record content&apos;</source>
         <translation>FIT Dekodierfehler: Ungültiger Offset %1 für Status &apos;aufgezeichneter Inhalt&apos;</translation>
     </message>
@@ -972,7 +972,7 @@
 <context>
     <name>CGisItemTrk</name>
     <message>
-        <location filename="../gis/fit/serialization.cpp" line="247"/>
+        <location filename="../gis/fit/serialization.cpp" line="246"/>
         <source>FIT file %1 contains no GPS data.</source>
         <translation>FIT Dekodierfehler: Datei %1 enthält keine GPS Daten.</translation>
     </message>
@@ -1228,37 +1228,37 @@
         <translation>Punkte anzeigen.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
         <source>Changed name</source>
         <translation>Name geändert</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
         <source>Changed comment</source>
         <translation>Kommentar geändert</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
         <source>Changed description</source>
         <translation>Beschreibung geändert</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
         <source>Changed links</source>
         <translation>Geänderte Verknüpfungen</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
         <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="2047"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2041"/>
         <source>Changed activity to &apos;%1&apos; for complete track.</source>
         <translation>Die Aktivität wurde für den gesamten Track auf &apos;%1&apos; geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
         <source>Changed activity to &apos;%1&apos; for range(%2..%3).</source>
         <translation>Die Aktivität wurde für den Bereich (%2..%3) auf &apos;%1&apos; geändert.</translation>
     </message>
@@ -1289,51 +1289,56 @@
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="221"/>
+        <source>Added terrain slope from DEM file.</source>
+        <translation>Hangneigung aus dem Höhenmodell hinzufügen.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="243"/>
         <source>Replaced elevation data with data from DEM files.</source>
         <translation>Höhendaten durch Daten von DEM Dateien ersetzt.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="239"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="261"/>
         <source>Replaced elevation data with interpolated values. (M=%1, RMSErr=%2)</source>
         <translation>Höhenwerte durch interpolierte Werte ersetzt. (M=%1, RMSErr=%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="255"/>
+        <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>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="268"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="290"/>
         <source>Changed start of track to %1.</source>
         <translation>Trackanfang auf %1 verschoben.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="281"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="303"/>
         <source>Remove timestamps.</source>
         <translation>Zeitstempel entfernt.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="298"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="320"/>
         <source>Set artificial timestamps with delta of %1 sec.</source>
         <translation>Künstliche Zeitstempel mit einem Abstand von %1 Sek. gesetzt.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="324"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="346"/>
         <source>Changed speed to %1%2.</source>
         <translation>Geschwindigkeit auf %1 %2 geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="343"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="365"/>
         <source>%1 (Segment %2)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="361"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="383"/>
         <source>Removed extension %1 from all Track Points</source>
         <translation>Erweiterung %1 wurde von allen Trackpunkten entfernt</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="372"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="394"/>
         <source>Converted subpoints from routing to track points</source>
         <translation>Punkte vom autom. Routing in Trackpunkte umgewandelt </translation>
     </message>
@@ -1346,17 +1351,17 @@
 <context>
     <name>CGisItemWpt</name>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="604"/>
+        <location filename="../gis/gpx/serialization.cpp" line="609"/>
         <source>Archived</source>
         <translation>Archiviert</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="608"/>
+        <location filename="../gis/gpx/serialization.cpp" line="613"/>
         <source>Available</source>
         <translation>Verfügbar</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="612"/>
+        <location filename="../gis/gpx/serialization.cpp" line="617"/>
         <source>Not Available</source>
         <translation>Nicht verfügbar</translation>
     </message>
@@ -1681,8 +1686,8 @@
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="652"/>
-        <location filename="../gis/CGisListWks.cpp" line="1650"/>
-        <location filename="../gis/CGisListWks.cpp" line="1688"/>
+        <location filename="../gis/CGisListWks.cpp" line="1646"/>
+        <location filename="../gis/CGisListWks.cpp" line="1684"/>
         <source>&lt;b&gt;Update devices&lt;/b&gt;&lt;p&gt;Update %1&lt;br/&gt;Please wait...&lt;/p&gt;</source>
         <translation>&lt;b&gt;Aktualisieren der Geräte&lt;/b&gt;&lt;p&gt;Aktualisiere %1&lt;br/&gt;Bitte warten...&lt;/p&gt;</translation>
     </message>
@@ -1786,27 +1791,32 @@
 <context>
     <name>CGisWidget</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>Load project...</source>
         <translation>Lade Projekt...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>The project &quot;%1&quot; is already in the workspace.</source>
         <translation>Das Projekt &quot;%1&quot; ist schon im Arbeitsplatz geladen.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="515"/>
+        <location filename="../gis/CGisWidget.cpp" line="554"/>
         <source>Copy items...</source>
         <translation>Elemente kopieren...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="573"/>
+        <source>Change waypoint symbols.</source>
+        <translation>Symbol der Wegpunkte wird geändert.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Cut Track...</source>
         <translation>Track teilen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Do you want to delete the original track?</source>
         <translation>Wollen Sie den ursprünglichen Track löschen?</translation>
     </message>
@@ -1838,27 +1848,27 @@
         <translation>Keine GPX Datei: %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="268"/>
         <source>File exists ...</source>
         <translation>Datei existiert...</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="269"/>
         <source>The file exists and it has not been created by QMapShack. If you press &apos;yes&apos; 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. &lt;b&gt;Do you really want to overwrite the file?&lt;/b&gt;</source>
         <translation>Diese Datei wurde nicht mit QMapShack erstellt. Wenn Sie &apos;Ja&apos; drücken werden alle Daten dieser Datei gelöscht. Selbst wenn diese Datei GPX Daten enthält und mit QMapShack geladen wurde, können nicht alle Elemente dieser Datei durch QMapShack geladen und gespeichert werden. Diese Elemente sind verloren. Ich empfehle die Nutzung einer anderen Datei. &lt;b&gt;Wollen Sie die Datei wirklich überschreiben?&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="386"/>
         <source>Failed to create file &apos;%1&apos;</source>
         <translation>Datei &apos;%1&apos; konnte nicht erstellt werden</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="392"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="396"/>
         <source>Failed to write file &apos;%1&apos;</source>
         <translation>Datei &apos;%1&apos; konnte nicht geschrieben werden</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="404"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="408"/>
         <source>Saving GIS data failed...</source>
         <translation>Das Speichern der GIS Daten ist fehlgeschlagen...</translation>
     </message>
@@ -1889,29 +1899,29 @@
 <context>
     <name>CHistoryListWidget</name>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="62"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="65"/>
         <source> by %1</source>
         <translation> von %1</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="108"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
         <source>Cut history before</source>
-        <translation type="unfinished"></translation>
+        <translation>Historie davor verkürzen</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="113"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="38"/>
         <source>Cut history after</source>
-        <translation type="unfinished"></translation>
+        <translation>Historie danach verkürzen</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="161"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="155"/>
         <source>History removal</source>
-        <translation type="unfinished"></translation>
+        <translation>Historie entfernen</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="162"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
         <source>The removal is permanent and cannot be undone. &lt;b&gt;Do you really want to delete history before this step?&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Entfernen ist permanent und kann nicht rückgängig gemacht werden. &lt;p&gt; Wollen Sie wirklich die Historie vor diesem Eintrag löschen?&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
@@ -1935,67 +1945,95 @@
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
         <source>Water Temperature</source>
         <translation>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
         <source>Heart Rate</source>
         <translation>Pulsrate</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
+        <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>Trittfrequenz</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
         <source>Speed</source>
         <translation>Geschwindigkeit</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
         <source>Acceleration</source>
         <translation>Beschleunigung</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
         <source>Course</source>
         <translation>Kurs</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <source>Distance</source>
+        <translation>Entfernung</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <source>Sea Level Pressure</source>
+        <translation>Luftdruck Meereshöhe</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Speed (vertical)</source>
+        <translation>Geschwindigkeit (vertikal)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
         <source>Slope*</source>
         <translation>Neigung*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
         <source>Speed*</source>
         <translation>Geschwindigkeit*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
         <source>Elevation</source>
         <translation>Höhe</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
         <source>Progress</source>
         <translation>Verlauf</translation>
     </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <source>Terrain slope</source>
+        <translation>Hangneigung</translation>
+    </message>
 </context>
 <context>
     <name>CLostFoundProject</name>
@@ -2008,48 +2046,53 @@
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="588"/>
+        <location filename="../CMainWindow.cpp" line="769"/>
         <source>Use &lt;b&gt;Menu-&gt;View-&gt;Add Map View&lt;/b&gt; to open a new view. Or &lt;b&gt;Menu-&gt;File-&gt;Load Map View&lt;/b&gt; to restore a saved one. Or click &lt;a href=&apos;newview&apos;&gt;here&lt;/a&gt;.</source>
         <translation>Benützen Sie &lt;b&gt;Menü-&gt;Ansicht-&gt;Kartenansicht hinzufügen&lt;/b&gt;, um eine neue Ansicht zu öffnen. Oder &lt;b&gt;Menü-&gt;Datei-&gt;Kartenansicht laden&lt;/b&gt;, um eine gespeicherte wieder herzustellen. Oder Sie klicken einfach &lt;a href=&apos;newview&apos;&gt;hier&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="716"/>
+        <location filename="../CMainWindow.cpp" line="897"/>
         <source>Ele: %1%2</source>
         <translation>Höhe: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="732"/>
+        <location filename="../CMainWindow.cpp" line="909"/>
+        <source>Slope: %1%2</source>
+        <translation>Hangneigung: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="925"/>
         <source>[Grid: %1]</source>
         <translation>[Gitter: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="867"/>
+        <location filename="../CMainWindow.cpp" line="1066"/>
         <source>Load GIS Data...</source>
         <translation>GIS Daten laden...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
         <source>Select output file</source>
         <translation>Ausgabedatei auswählen</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>QMapShack View (*.view)</source>
         <translation>QMapShack Ansicht (*.view)</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>Select file to load</source>
         <translation>Zu ladende Datei auswählen</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1106"/>
+        <location filename="../CMainWindow.cpp" line="1369"/>
         <source>Fatal...</source>
         <translation>Schwerer Fehler...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1107"/>
+        <location filename="../CMainWindow.cpp" line="1370"/>
         <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>
@@ -2074,621 +2117,633 @@
         <translation>Fehlgeschlagen...</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="157"/>
+        <location filename="../map/CMapIMG.cpp" line="175"/>
         <source>Unspecified</source>
         <translation>Nicht angegeben</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="158"/>
+        <location filename="../map/CMapIMG.cpp" line="176"/>
         <source>French</source>
         <translation>Französisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="159"/>
+        <location filename="../map/CMapIMG.cpp" line="177"/>
         <source>German</source>
         <translation>Deutsch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="160"/>
+        <location filename="../map/CMapIMG.cpp" line="178"/>
         <source>Dutch</source>
         <translation>Niederländisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="161"/>
+        <location filename="../map/CMapIMG.cpp" line="179"/>
         <source>English</source>
         <translation>Englisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="162"/>
+        <location filename="../map/CMapIMG.cpp" line="180"/>
         <source>Italian</source>
         <translation>Italienisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="163"/>
+        <location filename="../map/CMapIMG.cpp" line="181"/>
         <source>Finnish</source>
         <translation>Finnisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="164"/>
+        <location filename="../map/CMapIMG.cpp" line="182"/>
         <source>Swedish</source>
         <translation>Schwedisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="165"/>
+        <location filename="../map/CMapIMG.cpp" line="183"/>
         <source>Spanish</source>
         <translation>Spanisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="166"/>
+        <location filename="../map/CMapIMG.cpp" line="184"/>
         <source>Basque</source>
         <translation>Baskisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="167"/>
+        <location filename="../map/CMapIMG.cpp" line="185"/>
         <source>Catalan</source>
         <translation>Katalanisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="168"/>
+        <location filename="../map/CMapIMG.cpp" line="186"/>
         <source>Galician</source>
         <translation>Galizisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="169"/>
+        <location filename="../map/CMapIMG.cpp" line="187"/>
         <source>Welsh</source>
         <translation>Walisisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="170"/>
+        <location filename="../map/CMapIMG.cpp" line="188"/>
         <source>Gaelic</source>
         <translation>Gälisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="171"/>
+        <location filename="../map/CMapIMG.cpp" line="189"/>
         <source>Danish</source>
         <translation>Dänisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="172"/>
+        <location filename="../map/CMapIMG.cpp" line="190"/>
         <source>Norwegian</source>
         <translation>Norwegisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="173"/>
+        <location filename="../map/CMapIMG.cpp" line="191"/>
         <source>Portuguese</source>
         <translation>Portugiesisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="174"/>
+        <location filename="../map/CMapIMG.cpp" line="192"/>
         <source>Slovak</source>
         <translation>Slowakisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="175"/>
+        <location filename="../map/CMapIMG.cpp" line="193"/>
         <source>Czech</source>
         <translation>Tschechisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="176"/>
+        <location filename="../map/CMapIMG.cpp" line="194"/>
         <source>Croatian</source>
         <translation>Kroatisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="177"/>
+        <location filename="../map/CMapIMG.cpp" line="195"/>
         <source>Hungarian</source>
         <translation>Ungarisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="178"/>
+        <location filename="../map/CMapIMG.cpp" line="196"/>
         <source>Polish</source>
         <translation>Polnisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="179"/>
+        <location filename="../map/CMapIMG.cpp" line="197"/>
         <source>Turkish</source>
         <translation>Türkisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="180"/>
+        <location filename="../map/CMapIMG.cpp" line="198"/>
         <source>Greek</source>
         <translation>Griechisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="181"/>
+        <location filename="../map/CMapIMG.cpp" line="199"/>
         <source>Slovenian</source>
         <translation>Slowenisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="182"/>
+        <location filename="../map/CMapIMG.cpp" line="200"/>
         <source>Russian</source>
         <translation>Russisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="183"/>
+        <location filename="../map/CMapIMG.cpp" line="201"/>
         <source>Estonian</source>
         <translation>Estnisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="184"/>
+        <location filename="../map/CMapIMG.cpp" line="202"/>
         <source>Latvian</source>
         <translation>Lettisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="185"/>
+        <location filename="../map/CMapIMG.cpp" line="203"/>
         <source>Romanian</source>
         <translation>Rumänisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="186"/>
+        <location filename="../map/CMapIMG.cpp" line="204"/>
         <source>Albanian</source>
         <translatorcomment>Albanisch</translatorcomment>
         <translation>Albanisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="187"/>
+        <location filename="../map/CMapIMG.cpp" line="205"/>
         <source>Bosnian</source>
         <translation>Bosnisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="188"/>
+        <location filename="../map/CMapIMG.cpp" line="206"/>
         <source>Lithuanian</source>
         <translation>Litauisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="189"/>
+        <location filename="../map/CMapIMG.cpp" line="207"/>
         <source>Serbian</source>
         <translation>Serbisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="190"/>
+        <location filename="../map/CMapIMG.cpp" line="208"/>
         <source>Macedonian</source>
         <translation>Makedonisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="191"/>
+        <location filename="../map/CMapIMG.cpp" line="209"/>
         <source>Bulgarian</source>
         <translation>Bulgarisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="248"/>
+        <location filename="../map/CMapIMG.cpp" line="266"/>
         <source>Major highway</source>
         <translation>Autobahn</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="249"/>
+        <location filename="../map/CMapIMG.cpp" line="267"/>
         <source>Principal highway</source>
         <translation>Bundesstraße</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="250"/>
+        <location filename="../map/CMapIMG.cpp" line="268"/>
         <source>Other highway</source>
         <translation>Schnellstraße</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="251"/>
+        <location filename="../map/CMapIMG.cpp" line="269"/>
         <source>Arterial road</source>
         <translation>Fernstraße</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="252"/>
+        <location filename="../map/CMapIMG.cpp" line="270"/>
         <source>Collector road</source>
         <translation>Sammelstraße</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="253"/>
+        <location filename="../map/CMapIMG.cpp" line="271"/>
         <source>Residential street</source>
         <translation>Wohnstraße</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="254"/>
+        <location filename="../map/CMapIMG.cpp" line="272"/>
         <source>Alley/Private road</source>
         <translation>Allee/Privatstraße</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="255"/>
+        <location filename="../map/CMapIMG.cpp" line="273"/>
         <source>Highway ramp, low speed</source>
         <translation>Auffahrt (langsam)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="256"/>
+        <location filename="../map/CMapIMG.cpp" line="274"/>
         <source>Highway ramp, high speed</source>
         <translation>Auffahrt (schnell)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="257"/>
+        <location filename="../map/CMapIMG.cpp" line="275"/>
         <source>Unpaved road</source>
         <translation>Unbefestigte Straße</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="258"/>
+        <location filename="../map/CMapIMG.cpp" line="276"/>
         <source>Major highway connector</source>
         <translation>Autobahnzubringer</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="259"/>
+        <location filename="../map/CMapIMG.cpp" line="277"/>
         <source>Roundabout</source>
         <translation>Kreisverkehr</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="260"/>
+        <location filename="../map/CMapIMG.cpp" line="278"/>
         <source>Railroad</source>
         <translation>Eisenbahn</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="261"/>
+        <location filename="../map/CMapIMG.cpp" line="279"/>
         <source>Shoreline</source>
         <translation>Küstenlinie</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="262"/>
+        <location filename="../map/CMapIMG.cpp" line="280"/>
         <source>Trail</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="263"/>
+        <location filename="../map/CMapIMG.cpp" line="281"/>
         <source>Stream</source>
         <translation>Bach</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="264"/>
+        <location filename="../map/CMapIMG.cpp" line="282"/>
         <source>Time zone</source>
         <translation>Zeitzone</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="265"/>
-        <location filename="../map/CMapIMG.cpp" line="266"/>
+        <location filename="../map/CMapIMG.cpp" line="283"/>
+        <location filename="../map/CMapIMG.cpp" line="284"/>
         <source>Ferry</source>
         <translation>Fähre</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="267"/>
+        <location filename="../map/CMapIMG.cpp" line="285"/>
         <source>State/province border</source>
         <translation>Staats-/Landesgrenze</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="268"/>
+        <location filename="../map/CMapIMG.cpp" line="286"/>
         <source>County/parish border</source>
         <translation>Kreis-/Gemeindegrenze</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="269"/>
+        <location filename="../map/CMapIMG.cpp" line="287"/>
         <source>International border</source>
         <translation>Internationale Grenze</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="270"/>
+        <location filename="../map/CMapIMG.cpp" line="288"/>
         <source>River</source>
         <translation>Fluss</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="271"/>
+        <location filename="../map/CMapIMG.cpp" line="289"/>
         <source>Minor land contour</source>
         <translation>Höhenlinie klein</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="272"/>
+        <location filename="../map/CMapIMG.cpp" line="290"/>
         <source>Intermediate land contour</source>
         <translation>Höhenlinie mittel</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="273"/>
+        <location filename="../map/CMapIMG.cpp" line="291"/>
         <source>Major land contour</source>
         <translation>Höhenlinie groß</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="274"/>
+        <location filename="../map/CMapIMG.cpp" line="292"/>
         <source>Minor depth contour</source>
         <translation>Tiefenlinie klein</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="275"/>
+        <location filename="../map/CMapIMG.cpp" line="293"/>
         <source>Intermediate depth contour</source>
         <translation>Tiefenlinie mittel</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="276"/>
+        <location filename="../map/CMapIMG.cpp" line="294"/>
         <source>Major depth contour</source>
         <translation>Tiefenlinie groß</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="277"/>
+        <location filename="../map/CMapIMG.cpp" line="295"/>
         <source>Intermittent stream</source>
         <translation>Intermittierender Bach</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="278"/>
-        <location filename="../map/CMapIMG.cpp" line="360"/>
+        <location filename="../map/CMapIMG.cpp" line="296"/>
+        <location filename="../map/CMapIMG.cpp" line="378"/>
         <source>Airport runway</source>
         <translation>Landebahn</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="279"/>
+        <location filename="../map/CMapIMG.cpp" line="297"/>
         <source>Pipeline</source>
         <translation>Pipeline</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="280"/>
+        <location filename="../map/CMapIMG.cpp" line="298"/>
         <source>Powerline</source>
         <translation>Stromleitung</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="281"/>
+        <location filename="../map/CMapIMG.cpp" line="299"/>
         <source>Marine boundary</source>
         <translation>Meeresgrenze</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="282"/>
+        <location filename="../map/CMapIMG.cpp" line="300"/>
         <source>Hazard boundary</source>
         <translation>Gefahrbereichgrenze</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="347"/>
+        <location filename="../map/CMapIMG.cpp" line="365"/>
         <source>Large urban area (&amp;gt;200K)</source>
         <translation>Großes Wohngebiet (&amp;gt;200K)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="348"/>
+        <location filename="../map/CMapIMG.cpp" line="366"/>
         <source>Small urban area (&amp;lt;200K)</source>
         <translation>Kleines Wohngebiet (&amp;lt;200K)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="349"/>
+        <location filename="../map/CMapIMG.cpp" line="367"/>
         <source>Rural housing area</source>
         <translation>Ländliches Wohngebiet</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="350"/>
+        <location filename="../map/CMapIMG.cpp" line="368"/>
         <source>Military base</source>
         <translation>Militärbasis</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="351"/>
+        <location filename="../map/CMapIMG.cpp" line="369"/>
         <source>Parking lot</source>
         <translation>Parkplatz</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="352"/>
+        <location filename="../map/CMapIMG.cpp" line="370"/>
         <source>Parking garage</source>
         <translation>Parkhaus</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="353"/>
+        <location filename="../map/CMapIMG.cpp" line="371"/>
         <source>Airport</source>
         <translation>Flugplatz</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="354"/>
+        <location filename="../map/CMapIMG.cpp" line="372"/>
         <source>Shopping center</source>
         <translation>Einkaufszentrum</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="355"/>
+        <location filename="../map/CMapIMG.cpp" line="373"/>
         <source>Marina</source>
         <translation>Jachthafen</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="356"/>
+        <location filename="../map/CMapIMG.cpp" line="374"/>
         <source>University/College</source>
         <translation>Universität/Hochschule</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="357"/>
+        <location filename="../map/CMapIMG.cpp" line="375"/>
         <source>Hospital</source>
         <translation>Krankenhaus</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="358"/>
+        <location filename="../map/CMapIMG.cpp" line="376"/>
         <source>Industrial complex</source>
         <translation>Industrie</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="359"/>
+        <location filename="../map/CMapIMG.cpp" line="377"/>
         <source>Reservation</source>
         <translation>Schutzgebiet</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="361"/>
+        <location filename="../map/CMapIMG.cpp" line="379"/>
         <source>Man-made area</source>
         <translation>Fabrikgelände</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="362"/>
+        <location filename="../map/CMapIMG.cpp" line="380"/>
         <source>Sports complex</source>
         <translation>Sportanlage</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="363"/>
+        <location filename="../map/CMapIMG.cpp" line="381"/>
         <source>Golf course</source>
         <translation>Golfplatz</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="364"/>
+        <location filename="../map/CMapIMG.cpp" line="382"/>
         <source>Cemetery</source>
         <translation>Friedhof</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="365"/>
-        <location filename="../map/CMapIMG.cpp" line="366"/>
-        <location filename="../map/CMapIMG.cpp" line="367"/>
+        <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>Nationalpark</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="368"/>
+        <location filename="../map/CMapIMG.cpp" line="386"/>
         <source>City park</source>
         <translation>Stadtpark</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="369"/>
-        <location filename="../map/CMapIMG.cpp" line="370"/>
-        <location filename="../map/CMapIMG.cpp" line="371"/>
+        <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></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="372"/>
+        <location filename="../map/CMapIMG.cpp" line="390"/>
         <source>Forest</source>
         <translation>Wald</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="373"/>
+        <location filename="../map/CMapIMG.cpp" line="391"/>
         <source>Ocean</source>
         <translation>Ozean</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="374"/>
-        <location filename="../map/CMapIMG.cpp" line="376"/>
-        <location filename="../map/CMapIMG.cpp" line="386"/>
+        <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></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="375"/>
+        <location filename="../map/CMapIMG.cpp" line="393"/>
         <source>Sea</source>
         <translation>Meer</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="377"/>
-        <location filename="../map/CMapIMG.cpp" line="378"/>
-        <location filename="../map/CMapIMG.cpp" line="385"/>
+        <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>See</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="379"/>
-        <location filename="../map/CMapIMG.cpp" line="380"/>
+        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="398"/>
         <source>Medium lake</source>
         <translation>See</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="381"/>
-        <location filename="../map/CMapIMG.cpp" line="382"/>
+        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="400"/>
         <source>Small lake</source>
         <translation>See</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="383"/>
-        <location filename="../map/CMapIMG.cpp" line="384"/>
+        <location filename="../map/CMapIMG.cpp" line="401"/>
+        <location filename="../map/CMapIMG.cpp" line="402"/>
         <source>Major lake</source>
         <translation>See</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="387"/>
+        <location filename="../map/CMapIMG.cpp" line="405"/>
         <source>Major River</source>
         <translation>Strom</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="388"/>
+        <location filename="../map/CMapIMG.cpp" line="406"/>
         <source>Large River</source>
         <translation>Fluss</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="389"/>
+        <location filename="../map/CMapIMG.cpp" line="407"/>
         <source>Medium River</source>
         <translation>Fluss</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="390"/>
+        <location filename="../map/CMapIMG.cpp" line="408"/>
         <source>Small River</source>
         <translation>Fluss</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="393"/>
+        <location filename="../map/CMapIMG.cpp" line="411"/>
         <source>Intermittent water</source>
         <translation>Gewässer</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="394"/>
+        <location filename="../map/CMapIMG.cpp" line="412"/>
         <source>Wetland/Swamp</source>
         <translation>Feuchtgebiet/Sumpf</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="395"/>
+        <location filename="../map/CMapIMG.cpp" line="413"/>
         <source>Glacier</source>
         <translation>Gletscher</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="396"/>
+        <location filename="../map/CMapIMG.cpp" line="414"/>
         <source>Orchard/Plantation</source>
         <translation>Obstgarten/Plantage</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="415"/>
         <source>Scrub</source>
         <translation>Buschwerk</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="398"/>
+        <location filename="../map/CMapIMG.cpp" line="416"/>
         <source>Tundra</source>
         <translation>Tundra</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="417"/>
         <source>Flat</source>
         <translation>Ebene</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="400"/>
+        <location filename="../map/CMapIMG.cpp" line="418"/>
         <source>???</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="436"/>
+        <location filename="../map/CMapIMG.cpp" line="432"/>
+        <source>Read external type file...</source>
+        <translation>Externe TYP Datei einlesen...</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="432"/>
+        <source>Failed to read type file: %1
+Fall back to internal types.</source>
+        <translation>Lesen der TYP Datei fehlgeschlagen: %1
+Interne Typen werden wiederhergestellt.</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="474"/>
         <source>Failed to read: </source>
         <translation>Lesen fehlgeschlagen:</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="479"/>
+        <location filename="../map/CMapIMG.cpp" line="517"/>
         <source>Failed to open: </source>
         <translation>Öffnen fehlgeschlagen:</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="503"/>
-        <location filename="../map/CMapIMG.cpp" line="507"/>
+        <location filename="../map/CMapIMG.cpp" line="541"/>
+        <location filename="../map/CMapIMG.cpp" line="545"/>
         <source>Bad file format: </source>
         <translation>Falsches Format:</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="596"/>
+        <location filename="../map/CMapIMG.cpp" line="634"/>
         <source>Failed to read file structure: </source>
         <translation>Lesen der Dateistruktur fehlgeschlagen:</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="631"/>
+        <location filename="../map/CMapIMG.cpp" line="669"/>
         <source>Loading %1</source>
         <translation>Lädt %1</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="637"/>
+        <location filename="../map/CMapIMG.cpp" line="675"/>
         <source>User abort: </source>
         <translation>Benutzerabbruch:</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="640"/>
+        <location filename="../map/CMapIMG.cpp" line="678"/>
         <source>File is NT format. QMapShack is unable to read map files with NT format: </source>
         <translation>Die Datei hat das NT Format. QMapShack kann dieses Format nicht lesen:</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="731"/>
+        <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>Die Datei enthält verschlüsselte Daten. Garmin möchte nicht, dass diese Datei mit einer anderen Software, als der von Garmin bereitgestellten, benutzt wird.</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2342"/>
-        <location filename="../map/CMapIMG.cpp" line="2348"/>
-        <location filename="../map/CMapIMG.cpp" line="2352"/>
+        <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>Ort von Interesse</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2438"/>
+        <location filename="../map/CMapIMG.cpp" line="2484"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2480"/>
-        <location filename="../map/CMapIMG.cpp" line="2488"/>
-        <location filename="../map/CMapIMG.cpp" line="2495"/>
+        <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>Gebiet</translation>
     </message>
@@ -2748,6 +2803,14 @@
     </message>
 </context>
 <context>
+    <name>CMapPropSetup</name>
+    <message>
+        <location filename="../map/CMapPropSetup.cpp" line="196"/>
+        <source>Select type file...</source>
+        <translation>TYP Datei auswählen...</translation>
+    </message>
+</context>
+<context>
     <name>CMapRMAP</name>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="48"/>
@@ -3181,7 +3244,7 @@
         <translation>Verstrichene Zeit: %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="86"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="87"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation>Verstrichene Zeit: %1 Sekunden.</translation>
     </message>
@@ -3798,27 +3861,27 @@
         <translation>Fehler beim Schreiben der Datei %1: %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="620"/>
         <source>error renaming file %1 to %2: %3</source>
         <translation>Fehler beim Umbenennen der Datei von %1 nach %2: %3</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+        <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>Aktuell: %1 (%2), Veraltet: %3 (%4), noch Herunterzuladen: %5 (%6)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
         <source>being downloaded: %1 of %2</source>
         <translation>wird heruntergeladen: %1 von %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
         <source>no local data, online available: %1 (%2)</source>
         <translation>lokale keine Daten. Verfügbar: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="798"/>
         <source>local data outdated (%1, %2 - remote %3, %4)</source>
         <translation>lokale Daten veraltet (%1, %2 - auf dem Server: %3, %4)</translation>
     </message>
@@ -3838,12 +3901,12 @@
         <translation>ungültige Anwort, keine Dateien gefunden</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="806"/>
         <source>local data up to date (%1, %2)</source>
         <translation>lokale Daten sind aktuell (%1, %2)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="818"/>
         <source>no routing-data available</source>
         <translation>keine Routing-daten verfügbar</translation>
     </message>
@@ -3851,13 +3914,13 @@
 <context>
     <name>CRouterBRouterToolShell</name>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
         <source>!!! done !!!
 </source>
         <translation>!!! erledigt !!!</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
         <source>!!! failed !!!
 </source>
         <translation>!!! fehlgeschlagen !!!</translation>
@@ -4197,7 +4260,7 @@
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="415"/>
         <source>Calculate route with %1</source>
         <translation>Berechne Route mit %1</translation>
     </message>
@@ -4575,6 +4638,19 @@
     </message>
 </context>
 <context>
+    <name>CToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="43"/>
+        <source>Available Actions</source>
+        <translation>Verfügbare Werkzeuge</translation>
+    </message>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="44"/>
+        <source>Selected Actions</source>
+        <translation>Ausgewählte Werkzeuge</translation>
+    </message>
+</context>
+<context>
     <name>CTwoNavProject</name>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
@@ -6165,6 +6241,29 @@
     </message>
 </context>
 <context>
+    <name>IFilterTerrainSlope</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="51"/>
+        <source>&lt;b&gt;Calculate Terrain Slope&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Hangneigung berechnen&lt;/b&gt;</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>Berechnet die Hangneigung basierend auf dem geladenen Höhenmodell.</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"/>
@@ -6174,7 +6273,7 @@
     <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></translation>
     </message>
 </context>
 <context>
@@ -6344,31 +6443,46 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="49"/>
+        <location filename="../gis/IGisWidget.ui" line="43"/>
         <source>Opacity</source>
         <translation>Transparenz</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="56"/>
+        <location filename="../gis/IGisWidget.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="108"/>
-        <location filename="../gis/IGisWidget.ui" line="138"/>
+        <location filename="../gis/IGisWidget.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"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="143"/>
+        <location filename="../gis/IGisWidget.ui" line="151"/>
         <source>Age</source>
         <translation>Alter</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="177"/>
+        <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"/>
+        <source>Clear Filter</source>
+        <translation>Filter zurücksetzen</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <source>Setup Filter</source>
+        <translation>Filter einstellen</translation>
+    </message>
 </context>
 <context>
     <name>IGridSetup</name>
@@ -6524,335 +6638,360 @@
         <translation>Fenster</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="110"/>
+        <location filename="../IMainWindow.ui" line="112"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="118"/>
+        <location filename="../IMainWindow.ui" line="120"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="129"/>
+        <location filename="../IMainWindow.ui" line="131"/>
         <source>Tool</source>
         <translation>Werkzeug</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="154"/>
+        <location filename="../IMainWindow.ui" line="156"/>
         <source>Maps</source>
         <translation>Karten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="197"/>
+        <location filename="../IMainWindow.ui" line="199"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation>Dig. Höhenmodell (DEM)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="236"/>
+        <location filename="../IMainWindow.ui" line="238"/>
         <source>Data</source>
         <translation>Daten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="254"/>
+        <location filename="../IMainWindow.ui" line="256"/>
         <source>Route</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="288"/>
-        <location filename="../IMainWindow.ui" line="291"/>
+        <location filename="../IMainWindow.ui" line="286"/>
+        <source>Toolbar</source>
+        <translation>Werkzeugleiste</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="301"/>
+        <location filename="../IMainWindow.ui" line="304"/>
         <source>Add Map View</source>
         <translation>Kartenansicht hinzufügen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="294"/>
+        <location filename="../IMainWindow.ui" line="307"/>
         <source>Ctrl+T</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="309"/>
+        <location filename="../IMainWindow.ui" line="322"/>
         <source>Show Scale</source>
         <translation>Maßstab</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="321"/>
+        <location filename="../IMainWindow.ui" line="334"/>
         <source>Setup Map Font</source>
         <translation>Kartenfont einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="336"/>
+        <location filename="../IMainWindow.ui" line="349"/>
         <source>Show Grid</source>
         <translation>Gitter</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="339"/>
+        <location filename="../IMainWindow.ui" line="352"/>
         <source>Ctrl+G</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="351"/>
+        <location filename="../IMainWindow.ui" line="364"/>
         <source>Setup Grid</source>
         <translation>Gitter einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="354"/>
+        <location filename="../IMainWindow.ui" line="367"/>
         <source>Ctrl+Alt+G</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="382"/>
         <source>Flip Mouse Wheel</source>
         <translation>Mausrad umdrehen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="381"/>
-        <location filename="../IMainWindow.ui" line="384"/>
+        <location filename="../IMainWindow.ui" line="394"/>
+        <location filename="../IMainWindow.ui" line="397"/>
         <source>Setup Map Paths</source>
         <translation>Kartenverzeichnisse angeben</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="399"/>
+        <location filename="../IMainWindow.ui" line="412"/>
         <source>POI Text</source>
         <translation>POI Text</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="414"/>
+        <location filename="../IMainWindow.ui" line="427"/>
         <source>Night / Day</source>
         <translation>Nacht / Tag</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="429"/>
+        <location filename="../IMainWindow.ui" line="442"/>
         <source>Map Tool Tip</source>
         <translation>Kartentooltip</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="432"/>
+        <location filename="../IMainWindow.ui" line="445"/>
         <source>Ctrl+I</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="444"/>
+        <location filename="../IMainWindow.ui" line="457"/>
         <source>Setup DEM Paths</source>
         <translation>DEM Verzeichnisse angeben</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="456"/>
+        <location filename="../IMainWindow.ui" line="469"/>
         <source>About</source>
         <translation>Ãœber</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="468"/>
+        <location filename="../IMainWindow.ui" line="481"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="484"/>
         <source>F1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="483"/>
-        <location filename="../IMainWindow.ui" line="486"/>
+        <location filename="../IMainWindow.ui" line="496"/>
+        <location filename="../IMainWindow.ui" line="499"/>
         <source>Setup Map View</source>
         <translation>Kartenansicht einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="630"/>
+        <location filename="../IMainWindow.ui" line="643"/>
         <source>VRT Builder</source>
         <translation>VRT Builder</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="633"/>
+        <location filename="../IMainWindow.ui" line="646"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation>Eine graphische Benutzerschnittstelle zu gdalbuildvrt </translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="645"/>
+        <location filename="../IMainWindow.ui" line="658"/>
         <source>Store Map View</source>
         <translation>Kartenansicht speichern</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="648"/>
+        <location filename="../IMainWindow.ui" line="661"/>
         <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="660"/>
+        <location filename="../IMainWindow.ui" line="673"/>
         <source>Load Map View</source>
         <translation>Kartenansicht laden</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="663"/>
+        <location filename="../IMainWindow.ui" line="676"/>
         <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="678"/>
+        <location filename="../IMainWindow.ui" line="691"/>
         <source>Ext. Profile</source>
         <translation>Erw. Profil</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="681"/>
+        <location filename="../IMainWindow.ui" line="694"/>
         <source>Ctrl+E</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="693"/>
+        <location filename="../IMainWindow.ui" line="706"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="696"/>
+        <location filename="../IMainWindow.ui" line="709"/>
         <source>Ctrl+Q</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="708"/>
+        <location filename="../IMainWindow.ui" line="721"/>
         <source>Clone Map View</source>
         <translation>Kartenansicht klonen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="711"/>
+        <location filename="../IMainWindow.ui" line="724"/>
         <source>Ctrl+Shift+T</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="723"/>
+        <location filename="../IMainWindow.ui" line="736"/>
         <source>Create Routino Database</source>
         <translation>Routino Datenbank erstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="735"/>
+        <location filename="../IMainWindow.ui" line="748"/>
         <source>Save(Print) Map Screenshot</source>
         <translation>Kartenausschnitt speichern (drucken)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="738"/>
+        <location filename="../IMainWindow.ui" line="751"/>
         <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="741"/>
+        <location filename="../IMainWindow.ui" line="754"/>
         <source>Ctrl+P</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="753"/>
+        <location filename="../IMainWindow.ui" line="766"/>
         <source>Setup Coord. Format</source>
         <translation>Koordinatenformat einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="756"/>
+        <location filename="../IMainWindow.ui" line="769"/>
         <source>Change the format coordinates are displayed</source>
         <translation>Ändert das Format der angezeigten Koordinaten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="768"/>
+        <location filename="../IMainWindow.ui" line="781"/>
         <source>Setup Map Background</source>
         <translation>Kartenhintergrund einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="780"/>
+        <location filename="../IMainWindow.ui" line="793"/>
         <source>Setup Waypoint Icons</source>
         <translation>Wegpunktsymbole konfigurieren</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="783"/>
+        <location filename="../IMainWindow.ui" line="796"/>
         <source>Setup path to custom icons</source>
         <translation>Pfad zu individuellen Symbolen einrichten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="792"/>
+        <location filename="../IMainWindow.ui" line="805"/>
         <source>Close Tab</source>
         <translation>Reiter schließen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="795"/>
+        <location filename="../IMainWindow.ui" line="808"/>
         <source>Ctrl+W</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="804"/>
+        <location filename="../IMainWindow.ui" line="817"/>
         <source>Quickstart Help</source>
         <translation>Schnellstartanleitung</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="498"/>
+        <location filename="../IMainWindow.ui" line="826"/>
+        <source>Setup Toolbar</source>
+        <translation>Werkzeugleiste einstellen</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="838"/>
+        <source>Toggle Docks</source>
+        <translation>Fenster umschalten</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="841"/>
+        <source>Toggle visibility of dockable windows</source>
+        <translation>Sichtbarkeit der andockbaren Fenster umschalten</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="844"/>
+        <source>Ctrl+D</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="511"/>
         <source>Load GIS Data</source>
         <translation>GIS Daten laden</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="501"/>
+        <location filename="../IMainWindow.ui" line="514"/>
         <source>Load projects from file</source>
         <translation>Lade Datei als Projekt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="504"/>
+        <location filename="../IMainWindow.ui" line="517"/>
         <source>Ctrl+L</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="516"/>
+        <location filename="../IMainWindow.ui" line="529"/>
         <source>Save All GIS Data</source>
         <translation>Alle GIS Daten speichern</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="519"/>
+        <location filename="../IMainWindow.ui" line="532"/>
         <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="522"/>
+        <location filename="../IMainWindow.ui" line="535"/>
         <source>Ctrl+S</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="534"/>
+        <location filename="../IMainWindow.ui" line="547"/>
         <source>Setup Time Zone</source>
         <translation>Zeitzone einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="546"/>
+        <location filename="../IMainWindow.ui" line="559"/>
         <source>Add empty project</source>
         <translation>Leeres Projekt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="561"/>
+        <location filename="../IMainWindow.ui" line="574"/>
         <source>Search Google</source>
         <translation>Mit Google suchen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="573"/>
+        <location filename="../IMainWindow.ui" line="586"/>
         <source>Close all projects</source>
         <translation>Alle Projekte schließen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="576"/>
+        <location filename="../IMainWindow.ui" line="589"/>
         <source>F8</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="588"/>
+        <location filename="../IMainWindow.ui" line="601"/>
         <source>Setup Units</source>
         <translation>Einheiten einstellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="600"/>
+        <location filename="../IMainWindow.ui" line="613"/>
         <source>Setup Workspace</source>
         <translation>Arbeitsplatz konfigurieren</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="603"/>
+        <location filename="../IMainWindow.ui" line="616"/>
         <source>Setup save on exit.</source>
         <translation>Speichert Einstellungen beim Beenden.</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="615"/>
+        <location filename="../IMainWindow.ui" line="628"/>
         <source>Import Database from QLandkarte</source>
         <translation>Datenbankimport aus QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="618"/>
+        <location filename="../IMainWindow.ui" line="631"/>
         <source>Import QLandkarte GT database</source>
         <translation>QLandkarte GT Datenbank importieren</translation>
     </message>
@@ -6965,6 +7104,8 @@
     <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>
@@ -7009,6 +7150,21 @@
         <translation>Speicherpfad</translation>
     </message>
     <message>
+        <location filename="../map/IMapPropSetup.ui" line="353"/>
+        <source>Type File:</source>
+        <translation>TYP Datei:</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="367"/>
+        <source>Forget external type file and use internal types.</source>
+        <translation>Externe TYP Datei vergessen und interne Typen verwenden.</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="381"/>
+        <source>Load an external type file.</source>
+        <translation>Externe TYP Datei laden.</translation>
+    </message>
+    <message>
         <location filename="../map/IMapPropSetup.ui" line="227"/>
         <source>Cache Size (MB)</source>
         <translation>Cache (MB)</translation>
@@ -8140,8 +8296,8 @@
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="222"/>
-        <source>Select all itmes that are completely inside the selected area.</source>
-        <translation>Wählt alle Elemente, die vollständig innerhalb des gewählten Bereiches liegen.</translation>
+        <source>Select all items that are completely inside the selected area.</source>
+        <translation>Alle Elemente auswählen, die komplett innerhalb des ausgewählten Gebietes sind.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="282"/>
@@ -8414,6 +8570,52 @@
     </message>
 </context>
 <context>
+    <name>ISelectDoubleListWidget</name>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="22"/>
+        <source>Available</source>
+        <translation>Verfügbar</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="46"/>
+        <source>Add to selected items</source>
+        <translation>Zu den ausgewählten Einträgen hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="60"/>
+        <source>Remove from selected items</source>
+        <translation>Von den ausgewählten Einträgen entfernen</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="78"/>
+        <source>Selected</source>
+        <translation>Ausgewählt</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="102"/>
+        <source>Move selected items up</source>
+        <translation>Ausgewählte Einträge nach oben</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="116"/>
+        <source>Move selected items down</source>
+        <translation>Ausgewählte Einträge nach unten</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"/>
@@ -8592,6 +8794,29 @@
     </message>
 </context>
 <context>
+    <name>ISetupFilter</name>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="14"/>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="38"/>
+        <source>Apply filter to</source>
+        <translation>Filter anwenden auf</translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="45"/>
+        <source>name only</source>
+        <translation>den Namen</translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="52"/>
+        <source>complete text</source>
+        <translation>den vollständigen Text</translation>
+    </message>
+</context>
+<context>
     <name>ISetupFolder</name>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="14"/>
@@ -9026,6 +9251,14 @@
     </message>
 </context>
 <context>
+    <name>IToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/IToolBarSetupDialog.ui" line="14"/>
+        <source>Setup Toolbar</source>
+        <translation>Werkzeugleiste einstellen</translation>
+    </message>
+</context>
+<context>
     <name>IToolShell</name>
     <message>
         <location filename="../tool/IToolShell.cpp" line="46"/>
diff -Nru qmapshack-1.8.1/src/locale/qmapshack_es.ts qmapshack-1.9.0/src/locale/qmapshack_es.ts
--- qmapshack-1.8.1/src/locale/qmapshack_es.ts	2017-04-15 15:35:44.000000000 +0000
+++ qmapshack-1.9.0/src/locale/qmapshack_es.ts	2017-07-23 13:41:03.000000000 +0000
@@ -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>detección y manipulación de dispositivos desactivados</translation>
     </message>
 </context>
 <context>
@@ -24,94 +24,94 @@
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
         <source>Foot</source>
-        <translation type="unfinished"></translation>
+        <translation>A pié</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
         <source>Bicycle</source>
-        <translation type="unfinished"></translation>
+        <translation>Bicicleta</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
         <source>Motor Bike</source>
-        <translation type="unfinished"></translation>
+        <translation>Moto</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
         <source>Car</source>
-        <translation type="unfinished"></translation>
+        <translation>Coche</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
         <source>Cable Car</source>
-        <translation type="unfinished"></translation>
+        <translation>Teleférico</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
         <source>Swim</source>
-        <translation type="unfinished"></translation>
+        <translation>Natación</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
         <source>Ship</source>
-        <translation type="unfinished"></translation>
+        <translation>Barco</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
         <source>Ski/Winter</source>
-        <translation type="unfinished"></translation>
+        <translation>Esquí</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
         <location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
         <source>Ascent:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ascenso:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
         <location filename="../gis/trk/CActivityTrk.cpp" line="329"/>
         <source>Descent:</source>
-        <translation type="unfinished"></translation>
+        <translation>Descenso:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
         <source>Aeronautics</source>
-        <translation type="unfinished"></translation>
+        <translation>Aeronáutica</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
         <location filename="../gis/trk/CActivityTrk.cpp" line="307"/>
         <source>Distance:</source>
-        <translation type="unfinished"></translation>
+        <translation>Distancia:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
         <location filename="../gis/trk/CActivityTrk.cpp" line="340"/>
         <source>Speed Moving:</source>
-        <translation type="unfinished"></translation>
+        <translation>Velocidad en movimiento:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
         <location filename="../gis/trk/CActivityTrk.cpp" line="351"/>
         <source>Speed Total:</source>
-        <translation type="unfinished"></translation>
+        <translation>Velocidad Total:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="275"/>
         <location filename="../gis/trk/CActivityTrk.cpp" line="362"/>
         <source>Time Moving:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiempo en movimiento:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="277"/>
         <location filename="../gis/trk/CActivityTrk.cpp" line="373"/>
         <source>Time Total:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiempo Total:</translation>
     </message>
     <message>
         <location filename="../gis/trk/CActivityTrk.cpp" line="414"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Ninguno</translation>
     </message>
 </context>
 <context>
@@ -122,9 +122,9 @@
         <translation>Vista %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="695"/>
+        <location filename="../canvas/CCanvas.cpp" line="705"/>
         <source>Setup Map Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuracion del Mapa de Fondo</translation>
     </message>
 </context>
 <context>
@@ -140,32 +140,32 @@
     <message>
         <location filename="../setup/CCommandProcessor.cpp" line="31"/>
         <source>Print debug output to console.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>No mostrar pantalla de bienvenida</translation>
     </message>
     <message>
         <location filename="../setup/CCommandProcessor.cpp" line="40"/>
         <source>File with QMapShack configuration.</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo con la configuración de QMapShack</translation>
     </message>
     <message>
         <location filename="../setup/CCommandProcessor.cpp" line="40"/>
         <source>file</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo</translation>
     </message>
     <message>
         <location filename="../setup/CCommandProcessor.cpp" line="43"/>
         <source>Files for future use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivos para uso futuro</translation>
     </message>
 </context>
 <context>
@@ -173,7 +173,7 @@
     <message>
         <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="68"/>
         <source>route</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruta</translation>
     </message>
 </context>
 <context>
@@ -181,17 +181,17 @@
     <message>
         <location filename="../gis/db/CDBFolderLostFound.cpp" line="30"/>
         <source>All your data grouped by folders.</source>
-        <translation type="unfinished">Todos tus datos agrupados en carpetas.</translation>
+        <translation>Todos tus datos agrupados en carpetas.</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderLostFound.cpp" line="59"/>
         <source>Lost &amp; Found (%1)</source>
-        <translation type="unfinished">Objetos Perdidos (%1)</translation>
+        <translation>Objetos Perdidos (%1)</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderLostFound.cpp" line="64"/>
         <source>Lost &amp; Found</source>
-        <translation type="unfinished">Objetos Perdidos</translation>
+        <translation>Objetos Perdidos</translation>
     </message>
 </context>
 <context>
@@ -199,28 +199,28 @@
     <message>
         <location filename="../gis/db/CDBFolderMysql.cpp" line="33"/>
         <source>All your data grouped by folders.</source>
-        <translation type="unfinished">Todos tus datos agrupados en carpetas.</translation>
+        <translation>Todos tus datos agrupados en carpetas.</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderMysql.cpp" line="53"/>
         <source>MySQL Database</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Servidor:</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderMysql.cpp" line="65"/>
         <source> (No PW)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Sin PW)</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderMysql.cpp" line="73"/>
         <source>Error: </source>
-        <translation type="unfinished">Error: </translation>
+        <translation>Error: </translation>
     </message>
 </context>
 <context>
@@ -228,22 +228,22 @@
     <message>
         <location filename="../gis/db/CDBFolderSqlite.cpp" line="30"/>
         <source>All your data grouped by folders.</source>
-        <translation type="unfinished">Todos tus datos agrupados en carpetas.</translation>
+        <translation>Todos tus datos agrupados en carpetas.</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderSqlite.cpp" line="52"/>
         <source>SQLite Database</source>
-        <translation type="unfinished"></translation>
+        <translation>Base de Datos SQLite</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderSqlite.cpp" line="62"/>
         <source>File: </source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo:</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBFolderSqlite.cpp" line="66"/>
         <source>Error: </source>
-        <translation type="unfinished">Error: </translation>
+        <translation>Error: </translation>
     </message>
 </context>
 <context>
@@ -261,7 +261,7 @@
     <message>
         <location filename="../gis/db/CDBItem.cpp" line="99"/>
         <source>%1 days</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 dias</translation>
     </message>
 </context>
 <context>
@@ -269,86 +269,90 @@
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="112"/>
         <source>Failed to load...</source>
-        <translation type="unfinished"></translation>
+        <translation>Falló al cargar...</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="113"/>
         <source>Can&apos;t load file &quot;%1&quot; . It will be skipped.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede cargar el archivo &quot;%1&quot; . Se omitirá.</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="126"/>
         <source>Project already in database...</source>
-        <translation type="unfinished"></translation>
+        <translation>Proyecto ya en base de datos ...</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="127"/>
         <source>The project &quot;%1&quot; has already been imported into the database. It will be skipped.</source>
-        <translation type="unfinished"></translation>
+        <translation>El proyecto &quot;%1&quot; Ya se ha importado a la base de datos. Se omitirá.</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="278"/>
         <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>
+        <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="284"/>
         <source>Conflict with database...</source>
-        <translation type="unfinished"></translation>
+        <translation>Conflicto con la base de datos...</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="285"/>
         <source>Clone &amp;&amp; Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Duplicar y Guardar</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="286"/>
         <source>Force Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Forzar guardado</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="287"/>
         <source>Take remote</source>
-        <translation type="unfinished"></translation>
+        <translation>Toma remota</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="569"/>
         <source>Missing folder...</source>
-        <translation type="unfinished"></translation>
+        <translation>Falta la carpeta</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="570"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
-        <translation type="unfinished"></translation>
+        <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="577"/>
         <source>Save ...</source>
-        <translation type="unfinished">Guardar...</translation>
+        <translation>Guardar...</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="640"/>
         <source>Error</source>
-        <translation type="unfinished">Error</translation>
+        <translation>Error</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="640"/>
         <source>There was an unexpected database error:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Se produjo un error de base de datos inesperado:
+
+% 1</translation>
     </message>
     <message>
         <location filename="../gis/db/CDBProject.cpp" line="755"/>
         <source>The project &apos;%1&apos; is about to update itself from the database. However there are changes not saved.</source>
-        <translation type="unfinished"></translation>
+        <translation>El proyecto &apos;%1&apos; 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="756"/>
         <source>Save changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Guardar cambios?</translation>
     </message>
 </context>
 <context>
@@ -415,7 +419,7 @@
         <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="61"/>
         <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="131"/>
         <source>???</source>
-        <translation></translation>
+        <translation>???</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CDetailsGeoCache.cpp" line="158"/>
@@ -472,27 +476,27 @@
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
         <source>From Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Desde el inicio</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
         <source>To Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Al siguiente</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
         <source>To End</source>
-        <translation type="unfinished"></translation>
+        <translation>Al Final</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="613"/>
         <source>distance: </source>
-        <translation type="unfinished"></translation>
+        <translation>Distancia:</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="623"/>
         <source>ascent: </source>
-        <translation type="unfinished"></translation>
+        <translation>Ascenso:</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="702"/>
@@ -502,27 +506,27 @@
     <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Correlación..</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="395"/>
         <source>&lt;b&gt;Summary over all tracks in project&lt;/b&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Resumen de todos los tracks del proyecto&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="633"/>
         <source>descent: </source>
-        <translation type="unfinished"></translation>
+        <translation>descenso:</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="732"/>
         <source>&lt;h2&gt;Routes&lt;/h2&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h2&gt;Rutas&lt;/h2&gt;</translation>
     </message>
     <message>
         <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
@@ -555,44 +559,44 @@
 <context>
     <name>CDetailsTrk</name>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Reduce visible track points</source>
         <translation>Reducir puntos visibles del track</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change elevation of track points</source>
-        <translation>Cambiar elevación de puntos del track</translation>
+        <translation>Cambiar altitud de puntos del track</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <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"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Miscellaneous</source>
-        <translation type="unfinished"></translation>
+        <translation>Diversos</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
         <source>Color</source>
-        <translation type="unfinished">Color</translation>
+        <translation>Color</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
         <source>Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Actividad</translation>
     </message>
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
         <source>Reset activities...</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiniciar actividades...</translation>
     </message>
     <message>
         <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
         <source>This will remove all activities from the track. Proceed?</source>
-        <translation type="unfinished"></translation>
+        <translation>Esto eliminará las actividades del track. ¿Proceder?</translation>
     </message>
 </context>
 <context>
@@ -608,12 +612,12 @@
     <message>
         <location filename="../device/CDeviceGarmin.cpp" line="265"/>
         <source>Picture%1</source>
-        <translation type="unfinished"></translation>
+        <translation>foto%1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="1063"/>
+        <location filename="../gis/gpx/serialization.cpp" line="1068"/>
         <source>Unknown</source>
-        <translation type="unfinished">Desconocido</translation>
+        <translation>Desconocido</translation>
     </message>
 </context>
 <context>
@@ -621,12 +625,12 @@
     <message>
         <location filename="../device/CDeviceGarminArchive.cpp" line="30"/>
         <source>Archive - expand to load</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo: expanda para cargar</translation>
     </message>
     <message>
         <location filename="../device/CDeviceGarminArchive.cpp" line="43"/>
         <source>Archive - loaded</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo - cargado</translation>
     </message>
 </context>
 <context>
@@ -642,7 +646,7 @@
     <message>
         <location filename="../gis/db/CExportDatabase.cpp" line="90"/>
         <source>Select export path...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar ruta de exportación ...</translation>
     </message>
 </context>
 <context>
@@ -651,40 +655,40 @@
         <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>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 type="unfinished"></translation>
+        <translation>Fallo al crear %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="88"/>
         <source>Done!</source>
-        <translation type="unfinished"></translation>
+        <translation>¡Hecho!</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="100"/>
         <source>Abort by user!</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Guardar proyecto como %1</translation>
     </message>
     <message>
         <location filename="../gis/db/CExportDatabaseThread.cpp" line="157"/>
         <source>Failed!</source>
-        <translation type="unfinished"></translation>
+        <translation>¡Falló!</translation>
     </message>
 </context>
 <context>
@@ -692,7 +696,7 @@
     <message>
         <location filename="../gis/trk/filter/CFilterDeleteExtension.cpp" line="57"/>
         <source>No extension available</source>
-        <translation type="unfinished"></translation>
+        <translation>Extensión no disponible</translation>
     </message>
 </context>
 <context>
@@ -700,17 +704,17 @@
     <message>
         <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="30"/>
         <source>coarse</source>
-        <translation type="unfinished"></translation>
+        <translation>grueso</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="31"/>
         <source>medium</source>
-        <translation type="unfinished"></translation>
+        <translation>medio</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/CFilterInterpolateElevation.cpp" line="32"/>
         <source>fine</source>
-        <translation type="unfinished"></translation>
+        <translation>fino</translation>
     </message>
 </context>
 <context>
@@ -718,15 +722,15 @@
     <message>
         <location filename="../gis/fit/decoder/CFitCrcState.cpp" line="32"/>
         <source>FIT decoding error : invalid CRC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Error decodificando FIT : CRC inválido.</translation>
     </message>
 </context>
 <context>
     <name>CFitDecoder</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="119"/>
+        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="132"/>
         <source>FIT decoding error: unexpected end of file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>FIT error de descodificación: final inesperado del archivo% 1.</translation>
     </message>
 </context>
 <context>
@@ -734,20 +738,20 @@
     <message>
         <location filename="../gis/fit/decoder/CFitFieldBuilder.cpp" line="77"/>
         <source>FIT decoding error: unknown base type %1.</source>
-        <translation type="unfinished"></translation>
+        <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="115"/>
+        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
         <source>Missing field definition for development field.</source>
-        <translation type="unfinished"></translation>
+        <translation>Falta la definición de campo para el campo de desarrollo.</translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="207"/>
+        <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>Error de decodificación FIT: campo no válido def nr %1 al crear el perfil de campo dev</translation>
     </message>
 </context>
 <context>
@@ -755,12 +759,12 @@
     <message>
         <location filename="../gis/fit/decoder/CFitHeaderState.cpp" line="69"/>
         <source>FIT decoding error: protocol %1 version not supported.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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>
@@ -768,12 +772,12 @@
     <message>
         <location filename="../gis/fit/CFitProject.cpp" line="61"/>
         <source>Failed to load file %1...</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Falló al cargar archivo FIT %1</translation>
     </message>
 </context>
 <context>
@@ -781,12 +785,12 @@
     <message>
         <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="70"/>
         <source>FIT decoding error: architecture %1 not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Error decodificacion FIT: Arquitectura %1 no soportada</translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="107"/>
+        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="110"/>
         <source>FIT decoding error: invalid offset %1 for state &apos;record content&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>FIT error de decodificación: desplazamiento no válido %1 para el contenido de registro de estado&apos;</translation>
     </message>
 </context>
 <context>
@@ -795,17 +799,17 @@
         <location filename="../map/garmin/CGarminTyp.cpp" line="457"/>
         <location filename="../map/garmin/CGarminTyp.cpp" line="838"/>
         <source>Warning...</source>
-        <translation type="unfinished">Aviso...</translation>
+        <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 type="unfinished">Este es un fichero TYP con una codificación de polígonos desconocida. ¡Por favor repórtelo!</translation>
+        <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 type="unfinished">Este es un fichero TYP con una codificación de polilíneas desconocida. ¡Por favor repórtelo!</translation>
+        <translation>Este es un fichero TYP con una codificación de polilíneas desconocida. ¡Por favor repórtelo!</translation>
     </message>
 </context>
 <context>
@@ -813,77 +817,77 @@
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="36"/>
         <source>thin</source>
-        <translation type="unfinished">fino</translation>
+        <translation>fino</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="37"/>
         <source>normal</source>
-        <translation type="unfinished">normal</translation>
+        <translation>normal</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="38"/>
         <source>wide</source>
-        <translation type="unfinished">ancho</translation>
+        <translation>ancho</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="39"/>
         <source>strong</source>
-        <translation type="unfinished">intenso</translation>
+        <translation>intenso</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="78"/>
         <source>_Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Duplicar</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
         <source>Area: %1%2</source>
-        <translation type="unfinished"></translation>
+        <translation>�rea: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
         <source>Changed area shape.</source>
-        <translation type="unfinished">Se cambió la forma del área.</translation>
+        <translation>Se cambió la forma del área.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="459"/>
         <source>Changed name.</source>
-        <translation type="unfinished">Se cambió el nombre.</translation>
+        <translation>Se cambió el nombre.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="465"/>
         <source>Changed border width.</source>
-        <translation type="unfinished">Se cambió la anchura del borde.</translation>
+        <translation>Se cambió la anchura del borde.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="471"/>
         <source>Changed fill pattern.</source>
-        <translation type="unfinished">Se cambió el patró de relleno.</translation>
+        <translation>Se cambió el patró de relleno.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="477"/>
         <source>Changed opacity.</source>
-        <translation type="unfinished">Se cambió la opacidad.</translation>
+        <translation>Se cambió la opacidad.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="483"/>
         <source>Changed comment.</source>
-        <translation type="unfinished">Se cambió el comentario.</translation>
+        <translation>Se cambió el comentario.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="489"/>
         <source>Changed description.</source>
-        <translation type="unfinished">Se cambió la descripción.</translation>
+        <translation>Se cambió la descripción.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="495"/>
         <source>Changed links</source>
-        <translation type="unfinished">Se cambió el enlace</translation>
+        <translation>Se cambió el enlace</translation>
     </message>
     <message>
         <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="506"/>
         <source>Changed color</source>
-        <translation type="unfinished">Se cambió el color</translation>
+        <translation>Se cambió el color</translation>
     </message>
 </context>
 <context>
@@ -891,7 +895,7 @@
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="66"/>
         <source>_Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>_Duplicar</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
@@ -901,43 +905,43 @@
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
         <source>Changed name.</source>
-        <translation type="unfinished">Se cambió el nombre.</translation>
+        <translation>Se cambió el nombre.</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
         <source>Changed comment</source>
-        <translation type="unfinished">Se cambió el comentario</translation>
+        <translation>Se cambió el comentario</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
         <source>Changed description</source>
-        <translation type="unfinished">Se cambió la descripción</translation>
+        <translation>Se cambió la descripción</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
         <source>Changed links</source>
-        <translation type="unfinished">Se cambió el enlace</translation>
+        <translation>Se cambió el enlace</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
         <source>Length: %1 %2</source>
-        <translation type="unfinished">Longitud: %1 %2</translation>
+        <translation>Longitud: %1 %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
         <source>Length: -</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished">Tiempo: %1 %2</translation>
+        <translation>Tiempo: %1 %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
         <source>Time: -</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiempo:</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
@@ -947,30 +951,30 @@
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
         <source>Last time routed:&lt;br/&gt;%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Última vez enrutado:&lt;br/&gt;%1</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
         <source>with %1</source>
-        <translation type="unfinished"></translation>
+        <translation>con %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="602"/>
         <source>Distance: %1 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Distancia: %1 %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/CGisItemRte.cpp" line="717"/>
         <source>Changed route points.</source>
-        <translation type="unfinished"></translation>
+        <translation>Puntos de ruta modificados.</translation>
     </message>
 </context>
 <context>
     <name>CGisItemTrk</name>
     <message>
-        <location filename="../gis/fit/serialization.cpp" line="247"/>
+        <location filename="../gis/fit/serialization.cpp" line="246"/>
         <source>FIT file %1 contains no GPS data.</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo FIT %1 no contiene datos GPS.</translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="211"/>
@@ -979,129 +983,129 @@
         <location filename="../gis/tnv/serialization.cpp" line="387"/>
         <location filename="../gis/tnv/serialization.cpp" line="420"/>
         <source>Error...</source>
-        <translation type="unfinished">Error...</translation>
+        <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 type="unfinished">Fallo al abrir %1.</translation>
+        <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 type="unfinished">Solamente soporta formato lon/lat WGS84.</translation>
+        <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 type="unfinished">Fallo al leer los datos.</translation>
+        <translation>Fallo al leer los datos.</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="80"/>
         <source>_Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>_Duplicar</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="251"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
-        <translation type="unfinished">Se cambiaron los puntos del track, y descartados todos los datos previos.</translation>
+        <translation>Se cambiaron los puntos del track, y descartados todos los datos previos.</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="305"/>
         <source>Length: %1 %2</source>
-        <translation type="unfinished">Longitud: %1 %2</translation>
+        <translation>Longitud: %1 %2</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="312"/>
         <source>, %1%2 %3, %4%5 %6</source>
-        <translation type="unfinished">, %1%2 %3, %4%5 %6</translation>
+        <translation>, %1%2 %3, %4%5 %6</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="346"/>
         <source>Start: %1</source>
-        <translation type="unfinished">Comienzo: %1</translation>
+        <translation>Inicio: %1</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="350"/>
         <source>Start: -</source>
-        <translation type="unfinished"></translation>
+        <translation>Inicio: -</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="356"/>
         <source>End: %1</source>
-        <translation type="unfinished">Final: %1</translation>
+        <translation>Final: %1</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="360"/>
         <source>End: -</source>
-        <translation type="unfinished"></translation>
+        <translation>Final: -</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="364"/>
         <source>Points: %1 (%2)</source>
-        <translation type="unfinished">Puntos: %1 (%2)</translation>
+        <translation>Puntos: %1 (%2)</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="368"/>
         <source>Invalid elevations!</source>
-        <translation type="unfinished"></translation>
+        <translation>¡Datos de altitud invalidos!</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="373"/>
         <source>Invalid timestamps!</source>
-        <translation type="unfinished"></translation>
+        <translation>¡Marcas de tiempo no válidas!</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="378"/>
         <source>Invalid positions!</source>
-        <translation type="unfinished"></translation>
+        <translation>¡Posiciones invalidas!</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="387"/>
         <source>Activities: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Actividades: %1</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="495"/>
         <source>Index: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Indice: %1</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="499"/>
         <source>Index: visible %1, total %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Indice: visible %1. total %2</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="510"/>
         <source>Ele.: %1 %2</source>
-        <translation type="unfinished">Altitud: %1 %2</translation>
+        <translation>Altitud: %1 %2</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="513"/>
         <source> slope: %1%3 (%2%)</source>
-        <translation type="unfinished"> pendiente: %1%3 (%2%)</translation>
+        <translation> pendiente: %1%3 (%2%)</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="518"/>
         <source> speed: %1%2</source>
-        <translation type="unfinished"> velocidad: %1%2</translation>
+        <translation> velocidad: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="546"/>
         <source>... and %1 tags not displayed</source>
-        <translation type="unfinished"></translation>
+        <translation>Y %1 etiquetas no mostradas</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
         <source>Distance: - (-)</source>
-        <translation type="unfinished"></translation>
+        <translation>Distancia: - (-)</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="559"/>
         <source>Moving: - (-)</source>
-        <translation type="unfinished"></translation>
+        <translation>En movimiento: - (-)</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
@@ -1115,17 +1119,17 @@
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
         <source>Hide point %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ocultar punto %1</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
         <source>Hide points %1..%2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ocultar puntos %1..%2</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="582"/>
         <source> Moving: %1%2 (%3%)</source>
-        <translation type="unfinished"> En movimiento: %1%2 (%3%)</translation>
+        <translation> En movimiento: %1%2 (%3%)</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
@@ -1136,7 +1140,7 @@
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
         <source> Time: %1%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiempo: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
@@ -1146,280 +1150,285 @@
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="324"/>
         <source>Time: %1, Speed: %2 %3</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiempo: %1, Velocidad: %2 %3</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="328"/>
         <source>Time: -, Speed: -</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiempo: -, Velocidad: -</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="336"/>
         <source>Moving: %1, Speed: %2 %3</source>
-        <translation type="unfinished"></translation>
+        <translation>En movimiento: %1, Velocidad: %2 %3</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
         <source>Moving: -, Speed: -</source>
-        <translation type="unfinished"></translation>
+        <translation>En movimiento: -, Velocidad: -</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="556"/>
         <source>Ascent: - (-)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ascenso: - (-)</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="557"/>
         <source>Descent: - (-)</source>
-        <translation type="unfinished"></translation>
+        <translation>Descenso: - (-)</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="564"/>
         <source>Ascent: %1%2 (%3%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ascenso: %1%2 (%3%)</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="570"/>
         <source> Descent: %1%2 (%3%)</source>
-        <translation type="unfinished"></translation>
+        <translation> Descenso: %1%2 (%3%)</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
         <source>Distance: %1%2 (%3%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Distancia: %1%2 (%3%)</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
         <source>Ascent: -</source>
-        <translation type="unfinished"></translation>
+        <translation>Ascenso: -</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
         <source>Descent: -</source>
-        <translation type="unfinished"></translation>
+        <translation>Descenso: -</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
         <source>Ascent: %1%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ascenso: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
         <source> Descent: %1%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Descenso: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
         <source>Distance: %1%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Distancia: %1%2</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
         <source>Permanently removed points %1..%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Puntos eliminados definitivamente %1..%2</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
         <source>Show points.</source>
-        <translation type="unfinished">Mostrar puntos.</translation>
+        <translation>Mostrar puntos.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
         <source>Changed name</source>
-        <translation type="unfinished">Se cambió el nombre</translation>
+        <translation>Se cambió el nombre</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
         <source>Changed comment</source>
-        <translation type="unfinished">Se cambió el comentario</translation>
+        <translation>Se cambió el comentario</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
         <source>Changed description</source>
-        <translation type="unfinished">Se cambió la descripción</translation>
+        <translation>Se cambió la descripción</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
         <source>Changed links</source>
-        <translation type="unfinished">Se cambió el enlace</translation>
+        <translation>Se cambió el enlace</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
         <source>Changed elevation of point %1 to %2 %3</source>
-        <translation type="unfinished"></translation>
+        <translation>Se cambió altitud de los puntos %1 a %2 %3</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2047"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2041"/>
         <source>Changed activity to &apos;%1&apos; for complete track.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actividad cambiada a &apos;%1&apos; para todo el track.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
         <source>Changed activity to &apos;%1&apos; for range(%2..%3).</source>
-        <translation type="unfinished"></translation>
+        <translation>Actividad cambiada a &apos;%1&apos; 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 type="unfinished">Ocultar puntos con algoritmo Douglas Peuker (%1%2)</translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished">Restaurados todos los puntos a visible</translation>
+        <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 type="unfinished">Elminados definitivamente todos los puntos ocultos del track</translation>
+        <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 type="unfinished">Pefil suavizado con Mediana de %1 puntos</translation>
+        <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 type="unfinished">Datos de elevación sustituidos por valores de fichero DEM.</translation>
+        <translation>Datos de altitud sustituidos por valores de fichero DEM.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="239"/>
+        <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>Reemplazados datos de altitud con valores interpolados. (M=%1, RMSErr=%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="255"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="277"/>
         <source>Offset elevation data by %1%2.</source>
-        <translation type="unfinished">Elevación desplazada %1%2.</translation>
+        <translation>altitud desplazada %1%2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="268"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="290"/>
         <source>Changed start of track to %1.</source>
-        <translation type="unfinished">Cambiado el inicio de track a %1.</translation>
+        <translation>Cambiado el inicio de track a %1.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="281"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="303"/>
         <source>Remove timestamps.</source>
-        <translation type="unfinished">Eliminadas las marcas de tiempo.</translation>
+        <translation>Eliminadas las marcas de tiempo.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="298"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="320"/>
         <source>Set artificial timestamps with delta of %1 sec.</source>
-        <translation type="unfinished">Marcas de tiempo ficticias con incremento de %1 sec.</translation>
+        <translation>Marcas de tiempo ficticias con incremento de %1 sec.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="324"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="346"/>
         <source>Changed speed to %1%2.</source>
-        <translation type="unfinished">Velocidad modificada a %1%2.</translation>
+        <translation>Velocidad modificada a %1%2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="343"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="365"/>
         <source>%1 (Segment %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (Segmento %2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="361"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="383"/>
         <source>Removed extension %1 from all Track Points</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminada extensión %1 a todos los puntos del track</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="372"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="394"/>
         <source>Converted subpoints from routing to track points</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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="604"/>
+        <location filename="../gis/gpx/serialization.cpp" line="609"/>
         <source>Archived</source>
-        <translation type="unfinished">Archivado</translation>
+        <translation>Archivado</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="608"/>
+        <location filename="../gis/gpx/serialization.cpp" line="613"/>
         <source>Available</source>
-        <translation type="unfinished">Disponible</translation>
+        <translation>Disponible</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="612"/>
+        <location filename="../gis/gpx/serialization.cpp" line="617"/>
         <source>Not Available</source>
-        <translation type="unfinished">No Disponible</translation>
+        <translation>No Disponible</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
         <source>_Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Duplicar</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="275"/>
         <source>Elevation: %1 %2</source>
-        <translation type="unfinished">Altitud: %1 %2</translation>
+        <translation>Altitud: %1 %2</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="286"/>
         <source>Proximity: %1 %2</source>
-        <translation type="unfinished">Proximidad: %1 %2</translation>
+        <translation>Proximidad: %1 %2</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
         <source>Changed name</source>
-        <translation type="unfinished">Se cambió el nombre</translation>
+        <translation>Se cambió el nombre</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
         <source>Changed position</source>
-        <translation type="unfinished">Se cambió la posición</translation>
+        <translation>Se cambió la posición</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
         <source>Changed elevation</source>
-        <translation type="unfinished">Se cambió la altitud</translation>
+        <translation>Se cambió la altitud</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="380"/>
         <source>Changed proximity</source>
-        <translation type="unfinished">Se cambió la proximidad</translation>
+        <translation>Se cambió la proximidad</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
         <source>Changed icon</source>
-        <translation type="unfinished">Se cambió el icono</translation>
+        <translation>Se cambió el icono</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
         <source>Changed comment</source>
-        <translation type="unfinished">Se cambió el comentario</translation>
+        <translation>Se cambió el comentario</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
         <source>Changed description</source>
-        <translation type="unfinished">Se cambió la descripción</translation>
+        <translation>Se cambió la descripción</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
         <source>Changed links</source>
-        <translation type="unfinished">Se cambió el enlace</translation>
+        <translation>Se cambió el enlace</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
         <source>Changed images</source>
-        <translation type="unfinished">Se cambió la imagen</translation>
+        <translation>Se cambió la imagen</translation>
     </message>
     <message>
         <location filename="../gis/wpt/CGisItemWpt.cpp" line="424"/>
         <source>Add image</source>
-        <translation type="unfinished">Añadir Imagen</translation>
+        <translation>Añadir Imagen</translation>
     </message>
 </context>
 <context>
@@ -1427,12 +1436,12 @@
     <message>
         <location filename="../gis/CGisListDB.cpp" line="84"/>
         <source>Due to changes in the database system QMapShack forgot about the filename of your database &apos;%1&apos;. You have to select it again in the next step.</source>
-        <translation type="unfinished"></translation>
+        <translation>Debido a cambios en el sistema de base de datos QMapShack olvidó el nombre de archivo de su base de datos  &apos;%1&apos;. Debe seleccionarlo de nuevo en el siguiente paso.</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="85"/>
         <source>Select database file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar archivo de base de datos.</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="118"/>
@@ -1447,17 +1456,17 @@
     <message>
         <location filename="../gis/CGisListDB.cpp" line="122"/>
         <source>Rename Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Renombrar carpeta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="123"/>
         <source>Copy Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar carpeta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="124"/>
         <source>Move Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover carpeta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="125"/>
@@ -1467,12 +1476,12 @@
     <message>
         <location filename="../gis/CGisListDB.cpp" line="127"/>
         <source>Import from Files...</source>
-        <translation type="unfinished"></translation>
+        <translation>Importar desde archivos..</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="128"/>
         <source>Export to GPX...</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportar a GPX...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="131"/>
@@ -1483,12 +1492,12 @@
     <message>
         <location filename="../gis/CGisListDB.cpp" line="135"/>
         <source>Search Database</source>
-        <translation type="unfinished"></translation>
+        <translation>Buscar base de datos</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="136"/>
         <source>Sync. with Database</source>
-        <translation type="unfinished"></translation>
+        <translation>Sincronizar con base de datos</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="137"/>
@@ -1508,47 +1517,47 @@
     <message>
         <location filename="../gis/CGisListDB.cpp" line="444"/>
         <source>Do you really want to remove &apos;%1&apos; from the list?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Seguro que quiere eliminar &apos;%1&apos; 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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Nombre de carpeta...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="735"/>
         <source>Rename folder:</source>
-        <translation type="unfinished"></translation>
+        <translation>Renombrar carpeta:</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="864"/>
         <source>Are you sure you want to delete &apos;%1&apos; from folder &apos;%2&apos;?</source>
-        <translation type="unfinished">¿Desea realmente eleiminar &apos;%1&apos; de la carpeta &apos;%2&apos;?</translation>
+        <translation>¿Desea realmente eleiminar &apos;%1&apos; de la carpeta &apos;%2&apos;?</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="865"/>
         <source>Delete...</source>
-        <translation type="unfinished">Borrar...</translation>
+        <translation>Borrar...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="1055"/>
         <source>Import GIS Data...</source>
-        <translation type="unfinished"></translation>
+        <translation>Importar datos GIS...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="508"/>
@@ -1608,17 +1617,17 @@
     <message>
         <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Save as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar como...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="155"/>
         <source>Copy Track with Waypoints</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar tracks y waypoints</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="163"/>
         <source>Show Bubble</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar burbuja de texto</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="165"/>
@@ -1633,59 +1642,59 @@
     <message>
         <location filename="../gis/CGisListWks.cpp" line="174"/>
         <source>Route Instructions</source>
-        <translation type="unfinished"></translation>
+        <translation>Instrucciones de ruta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="176"/>
         <source>Calculate Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Calcular ruta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="177"/>
         <source>Reset Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Recalcular ruta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="178"/>
         <source>Edit Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar ruta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="179"/>
         <source>Convert to Track</source>
-        <translation type="unfinished"></translation>
+        <translation>Convertir en track</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="195"/>
         <source>Create Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear ruta</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="196"/>
         <source>Change Icon (sel. waypt. only)</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar icono</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="627"/>
         <source>Drop items...</source>
-        <translation type="unfinished"></translation>
+        <translation>Descartar elementos</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="652"/>
-        <location filename="../gis/CGisListWks.cpp" line="1650"/>
-        <location filename="../gis/CGisListWks.cpp" line="1688"/>
+        <location filename="../gis/CGisListWks.cpp" line="1646"/>
+        <location filename="../gis/CGisListWks.cpp" line="1684"/>
         <source>&lt;b&gt;Update devices&lt;/b&gt;&lt;p&gt;Update %1&lt;br/&gt;Please wait...&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Actualizar dispositivos&lt;/b&gt;&lt;p&gt;Actualizar %1&lt;br/&gt;Por favor espere...&lt;/p&gt;</translation>
+        <translation>&lt;b&gt;Actualizar dispositivos&lt;/b&gt;&lt;p&gt;Actualizar %1&lt;br/&gt;Por favor espere...&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="1197"/>
         <source>Delete project...</source>
-        <translation type="unfinished">Eliminar Proyecto...</translation>
+        <translation>Eliminar Proyecto...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="1197"/>
         <source>Do you really want to delete %1?</source>
-        <translation type="unfinished">¿Desea realmente eliminar %1?</translation>
+        <translation>¿Desea realmente eliminar %1?</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="149"/>
@@ -1695,37 +1704,37 @@
     <message>
         <location filename="../gis/CGisListWks.cpp" line="103"/>
         <source>Show on Map</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar en el mapa</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="104"/>
         <source>Hide from Map</source>
-        <translation type="unfinished"></translation>
+        <translation>Ocultar en el mapa</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="110"/>
         <source>Sort by Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordenar por fecha</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="111"/>
         <source>Sort by Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordenar por nombre</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="116"/>
         <source>Save as GPX 1.1 w/o ext...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar como GPX 1.1 w/o ext...</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="119"/>
         <source>Send to Devices</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar a dispositivo</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="120"/>
         <source>Sync. with Database</source>
-        <translation type="unfinished"></translation>
+        <translation>Sincronizar con base de datos</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="151"/>
@@ -1776,33 +1785,38 @@
     <message>
         <location filename="../gis/CGisListWks.cpp" line="1174"/>
         <source>This will remove all projects from the workspace.</source>
-        <translation>Esto quitará.todos los proyectos.del espacio de trabajo.</translation>
+        <translation>Esto eliminará todos los proyectos del espacio de trabajo.</translation>
     </message>
 </context>
 <context>
     <name>CGisWidget</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>Load project...</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar proyecto</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>The project &quot;%1&quot; is already in the workspace.</source>
-        <translation type="unfinished"></translation>
+        <translation>El proyecto &quot;%1&quot; ya está en el area de trabajo.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="515"/>
+        <location filename="../gis/CGisWidget.cpp" line="554"/>
         <source>Copy items...</source>
-        <translation type="unfinished">Copia elementos....</translation>
+        <translation>Copia elementos....</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="573"/>
+        <source>Change waypoint symbols.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Cut Track...</source>
-        <translation>Partir Track...</translation>
+        <translation>Dividir Track...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Do you want to delete the original track?</source>
         <translation>¿Desea borrar el track original?</translation>
     </message>
@@ -1812,51 +1826,51 @@
     <message>
         <location filename="../gis/gpx/CGpxProject.cpp" line="91"/>
         <source>Failed to load file %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al cargar archivo %1...</translation>
     </message>
     <message>
         <location filename="../gis/gpx/CGpxProject.cpp" line="113"/>
         <source>Failed to open %1</source>
-        <translation type="unfinished">Fallo al abrir %1</translation>
+        <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 type="unfinished">Fallo al leer: %1
+        <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 type="unfinished"></translation>
+        <translation>No es un archivo GPX: %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="268"/>
         <source>File exists ...</source>
-        <translation type="unfinished">El archivo ya existe ...</translation>
+        <translation>El archivo ya existe ...</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="269"/>
         <source>The file exists and it has not been created by QMapShack. If you press &apos;yes&apos; 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. &lt;b&gt;Do you really want to overwrite the file?&lt;/b&gt;</source>
-        <translation type="unfinished">El archivo ya existe y no lo ha creado QMapShack. Si pulsa &apos;sí&apos; 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. &lt;b&gt;¿Quiere realmente sobrescribir el archivo&lt;/b&gt;</translation>
+        <translation>El archivo ya existe y no lo ha creado QMapShack. Si pulsa &apos;sí&apos; 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. &lt;b&gt;¿Quiere realmente sobrescribir el archivo&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="386"/>
         <source>Failed to create file &apos;%1&apos;</source>
-        <translation type="unfinished">Fallo al crear el archivo &apos;%1&apos;</translation>
+        <translation>Fallo al crear el archivo &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="392"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="396"/>
         <source>Failed to write file &apos;%1&apos;</source>
-        <translation type="unfinished">Fallo al escribir en el archivo &apos;%1&apos;</translation>
+        <translation>Fallo al escribir en el archivo &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="404"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="408"/>
         <source>Saving GIS data failed...</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo guardando datos GIS...</translation>
     </message>
 </context>
 <context>
@@ -1885,29 +1899,29 @@
 <context>
     <name>CHistoryListWidget</name>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="62"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="65"/>
         <source> by %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">de %1</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="108"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
         <source>Cut history before</source>
-        <translation type="unfinished"></translation>
+        <translation>Cortar historial antes</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="113"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="38"/>
         <source>Cut history after</source>
-        <translation type="unfinished"></translation>
+        <translation>Cortar historial despues</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="161"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="155"/>
         <source>History removal</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar historial</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="162"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
         <source>The removal is permanent and cannot be undone. &lt;b&gt;Do you really want to delete history before this step?&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>El borrado es permanente y no se puede deshacer. &lt;b&gt;¿Esta seguro de querer borrar el historial anterior a este paso?</translation>
     </message>
 </context>
 <context>
@@ -1915,7 +1929,7 @@
     <message>
         <location filename="../tool/CImportDatabase.cpp" line="29"/>
         <source>Import QLandkarte Database</source>
-        <translation>Importar Base de Datos de Qlandkarte</translation>
+        <translation>Importar Base de Datos de QLandKarteGT</translation>
     </message>
     <message>
         <location filename="../tool/CImportDatabase.cpp" line="75"/>
@@ -1931,66 +1945,94 @@
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Temperatura del aire</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"></translation>
+        <translation>Temperatura del agua</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
         <source>Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
         <source>Heart Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Ritmo cardiaco</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
+        <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 type="unfinished"></translation>
+        <translation>Cadencia</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
         <source>Speed</source>
-        <translation type="unfinished">Velocidad</translation>
+        <translation>Velocidad</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
         <source>Acceleration</source>
-        <translation type="unfinished"></translation>
+        <translation>Aceleración</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
-        <source>Slope*</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
-        <source>Speed*</source>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <source>Sea Level Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Speed (vertical)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
+        <source>Slope*</source>
+        <translation>Pendiente</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
+        <source>Speed*</source>
+        <translation>Velocidad</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
         <source>Elevation</source>
-        <translation type="unfinished">Altitud</translation>
+        <translation>Altitud</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
         <source>Progress</source>
-        <translation type="unfinished">Progreso</translation>
+        <translation>Progreso</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <source>Terrain slope</source>
+        <translation>Pendiente del terreno</translation>
     </message>
 </context>
 <context>
@@ -1998,56 +2040,61 @@
     <message>
         <location filename="../gis/db/CLostFoundProject.cpp" line="39"/>
         <source>Lost &amp; Found</source>
-        <translation type="unfinished">Objetos Perdidos</translation>
+        <translation>Objetos Perdidos</translation>
     </message>
 </context>
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="588"/>
+        <location filename="../CMainWindow.cpp" line="769"/>
         <source>Use &lt;b&gt;Menu-&gt;View-&gt;Add Map View&lt;/b&gt; to open a new view. Or &lt;b&gt;Menu-&gt;File-&gt;Load Map View&lt;/b&gt; to restore a saved one. Or click &lt;a href=&apos;newview&apos;&gt;here&lt;/a&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar &lt;b&gt;Menu-&gt;ver-&gt;Añadir vista de mapa&lt;/b&gt; para abrir nueva vista, o &lt;b&gt;Menu-&gt;archivo-&gt;cargar vista de mapa&lt;/b&gt; para restaurar una vista guardada. Or click &lt;a href=&apos;newview&apos;&gt;here&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="716"/>
+        <location filename="../CMainWindow.cpp" line="897"/>
         <source>Ele: %1%2</source>
         <translation>Alt: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="732"/>
+        <location filename="../CMainWindow.cpp" line="909"/>
+        <source>Slope: %1%2</source>
+        <translation>Pendiente: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="925"/>
         <source>[Grid: %1]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Malla: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="867"/>
+        <location filename="../CMainWindow.cpp" line="1066"/>
         <source>Load GIS Data...</source>
         <translation>Cargar Datos GIS...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
         <source>Select output file</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar archivo de salida</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>QMapShack View (*.view)</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista de QMapShack (*.view)</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>Select file to load</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar archivo a cargar</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1106"/>
+        <location filename="../CMainWindow.cpp" line="1369"/>
         <source>Fatal...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1107"/>
+        <location filename="../CMainWindow.cpp" line="1370"/>
         <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 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>
@@ -2057,7 +2104,9 @@
         <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the &apos;Help! I want maps!&apos; button in the &apos;Maps&apos; dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
 
 If it&apos;s no fun, why don&apos;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 not that much to ask from you. After all the software is distributed without a fee.</source>
-        <translation type="unfinished"></translation>
+        <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 &apos; mapas &apos;,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 para hacer esto. Y pensamos que instalar las cosas por ti mismo no es mucho pedir de ti. Después de todo el software se distribuye sin una cuota.</translation>
     </message>
 </context>
 <context>
@@ -2068,620 +2117,631 @@
         <translation>Falló ...</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="157"/>
+        <location filename="../map/CMapIMG.cpp" line="175"/>
         <source>Unspecified</source>
         <translation>No especificado</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="158"/>
+        <location filename="../map/CMapIMG.cpp" line="176"/>
         <source>French</source>
         <translation>Francés</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="159"/>
+        <location filename="../map/CMapIMG.cpp" line="177"/>
         <source>German</source>
         <translation>Alemán</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="160"/>
+        <location filename="../map/CMapIMG.cpp" line="178"/>
         <source>Dutch</source>
         <translation>Holandés</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="161"/>
+        <location filename="../map/CMapIMG.cpp" line="179"/>
         <source>English</source>
         <translation>Inglés</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="162"/>
+        <location filename="../map/CMapIMG.cpp" line="180"/>
         <source>Italian</source>
         <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="163"/>
+        <location filename="../map/CMapIMG.cpp" line="181"/>
         <source>Finnish</source>
         <translation>Finés</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="164"/>
+        <location filename="../map/CMapIMG.cpp" line="182"/>
         <source>Swedish</source>
         <translation>Sueco</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="165"/>
+        <location filename="../map/CMapIMG.cpp" line="183"/>
         <source>Spanish</source>
         <translation>Español</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="166"/>
+        <location filename="../map/CMapIMG.cpp" line="184"/>
         <source>Basque</source>
         <translation>Euskera</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="167"/>
+        <location filename="../map/CMapIMG.cpp" line="185"/>
         <source>Catalan</source>
         <translation>Catalán</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="168"/>
+        <location filename="../map/CMapIMG.cpp" line="186"/>
         <source>Galician</source>
         <translation>Gallego</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="169"/>
+        <location filename="../map/CMapIMG.cpp" line="187"/>
         <source>Welsh</source>
         <translation>Galés</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="170"/>
+        <location filename="../map/CMapIMG.cpp" line="188"/>
         <source>Gaelic</source>
         <translation>Gaélico</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="171"/>
+        <location filename="../map/CMapIMG.cpp" line="189"/>
         <source>Danish</source>
         <translation>Danés</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="172"/>
+        <location filename="../map/CMapIMG.cpp" line="190"/>
         <source>Norwegian</source>
         <translation>Noruego</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="173"/>
+        <location filename="../map/CMapIMG.cpp" line="191"/>
         <source>Portuguese</source>
         <translation>Portugués</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="174"/>
+        <location filename="../map/CMapIMG.cpp" line="192"/>
         <source>Slovak</source>
         <translation>Eslovaco</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="175"/>
+        <location filename="../map/CMapIMG.cpp" line="193"/>
         <source>Czech</source>
         <translation>Checo</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="176"/>
+        <location filename="../map/CMapIMG.cpp" line="194"/>
         <source>Croatian</source>
         <translation>Croata</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="177"/>
+        <location filename="../map/CMapIMG.cpp" line="195"/>
         <source>Hungarian</source>
         <translation>Húngaro</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="178"/>
+        <location filename="../map/CMapIMG.cpp" line="196"/>
         <source>Polish</source>
         <translation>Polaco</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="179"/>
+        <location filename="../map/CMapIMG.cpp" line="197"/>
         <source>Turkish</source>
         <translation>Turco</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="180"/>
+        <location filename="../map/CMapIMG.cpp" line="198"/>
         <source>Greek</source>
         <translation>Griego</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="181"/>
+        <location filename="../map/CMapIMG.cpp" line="199"/>
         <source>Slovenian</source>
         <translation>Esloveno</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="182"/>
+        <location filename="../map/CMapIMG.cpp" line="200"/>
         <source>Russian</source>
         <translation>Ruso</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="183"/>
+        <location filename="../map/CMapIMG.cpp" line="201"/>
         <source>Estonian</source>
         <translation>Estonio</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="184"/>
+        <location filename="../map/CMapIMG.cpp" line="202"/>
         <source>Latvian</source>
         <translation>Letón</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="185"/>
+        <location filename="../map/CMapIMG.cpp" line="203"/>
         <source>Romanian</source>
         <translation>Rumano</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="186"/>
+        <location filename="../map/CMapIMG.cpp" line="204"/>
         <source>Albanian</source>
         <translation>Albanés</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="187"/>
+        <location filename="../map/CMapIMG.cpp" line="205"/>
         <source>Bosnian</source>
         <translation>Bosnio</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="188"/>
+        <location filename="../map/CMapIMG.cpp" line="206"/>
         <source>Lithuanian</source>
         <translation>Lituano</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="189"/>
+        <location filename="../map/CMapIMG.cpp" line="207"/>
         <source>Serbian</source>
         <translation>Serbio</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="190"/>
+        <location filename="../map/CMapIMG.cpp" line="208"/>
         <source>Macedonian</source>
         <translation>Macedonio</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="191"/>
+        <location filename="../map/CMapIMG.cpp" line="209"/>
         <source>Bulgarian</source>
         <translation>Búlgaro</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="248"/>
+        <location filename="../map/CMapIMG.cpp" line="266"/>
         <source>Major highway</source>
         <translation>Autovía Primaria</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="249"/>
+        <location filename="../map/CMapIMG.cpp" line="267"/>
         <source>Principal highway</source>
         <translation>Autovía secundaria</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="250"/>
+        <location filename="../map/CMapIMG.cpp" line="268"/>
         <source>Other highway</source>
         <translation>Otras autovías</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="251"/>
+        <location filename="../map/CMapIMG.cpp" line="269"/>
         <source>Arterial road</source>
         <translation>Carretera principal</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="252"/>
+        <location filename="../map/CMapIMG.cpp" line="270"/>
         <source>Collector road</source>
         <translation>Carretera secundaria</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="253"/>
+        <location filename="../map/CMapIMG.cpp" line="271"/>
         <source>Residential street</source>
         <translation>Calle residencial</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="254"/>
+        <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="255"/>
+        <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="256"/>
+        <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="257"/>
+        <location filename="../map/CMapIMG.cpp" line="275"/>
         <source>Unpaved road</source>
         <translation>Carretera sin asfaltar</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="258"/>
+        <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="259"/>
+        <location filename="../map/CMapIMG.cpp" line="277"/>
         <source>Roundabout</source>
         <translation>Rotonda</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="260"/>
+        <location filename="../map/CMapIMG.cpp" line="278"/>
         <source>Railroad</source>
         <translation>Ferrocarril</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="261"/>
+        <location filename="../map/CMapIMG.cpp" line="279"/>
         <source>Shoreline</source>
         <translation>Línea de costa</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="262"/>
+        <location filename="../map/CMapIMG.cpp" line="280"/>
         <source>Trail</source>
         <translation>Sendero</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="263"/>
+        <location filename="../map/CMapIMG.cpp" line="281"/>
         <source>Stream</source>
         <translation>Arroyo</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="264"/>
+        <location filename="../map/CMapIMG.cpp" line="282"/>
         <source>Time zone</source>
         <translation>Zona horaria</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="265"/>
-        <location filename="../map/CMapIMG.cpp" line="266"/>
+        <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="267"/>
+        <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="268"/>
+        <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="269"/>
+        <location filename="../map/CMapIMG.cpp" line="287"/>
         <source>International border</source>
         <translation>Frontera internacional</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="270"/>
+        <location filename="../map/CMapIMG.cpp" line="288"/>
         <source>River</source>
         <translation>Río</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="271"/>
+        <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="272"/>
+        <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="273"/>
+        <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="274"/>
+        <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="275"/>
+        <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="276"/>
+        <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="277"/>
+        <location filename="../map/CMapIMG.cpp" line="295"/>
         <source>Intermittent stream</source>
         <translation>Curso intermitente</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="278"/>
-        <location filename="../map/CMapIMG.cpp" line="360"/>
+        <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="279"/>
+        <location filename="../map/CMapIMG.cpp" line="297"/>
         <source>Pipeline</source>
         <translation>Tubería</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="280"/>
+        <location filename="../map/CMapIMG.cpp" line="298"/>
         <source>Powerline</source>
         <translation>Línea eléctrica</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="281"/>
+        <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="282"/>
+        <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="347"/>
+        <location filename="../map/CMapIMG.cpp" line="365"/>
         <source>Large urban area (&amp;gt;200K)</source>
         <translation>�rea urbana grande (&amp;gt;200K)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="348"/>
+        <location filename="../map/CMapIMG.cpp" line="366"/>
         <source>Small urban area (&amp;lt;200K)</source>
         <translation>�rea urbana pequeña (&amp;lt;200K)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="349"/>
+        <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="350"/>
+        <location filename="../map/CMapIMG.cpp" line="368"/>
         <source>Military base</source>
         <translation>Base militar</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="351"/>
+        <location filename="../map/CMapIMG.cpp" line="369"/>
         <source>Parking lot</source>
         <translation>Aparcamiento</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="352"/>
+        <location filename="../map/CMapIMG.cpp" line="370"/>
         <source>Parking garage</source>
         <translation>Garaje</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="353"/>
+        <location filename="../map/CMapIMG.cpp" line="371"/>
         <source>Airport</source>
         <translation>Aeropuerto</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="354"/>
+        <location filename="../map/CMapIMG.cpp" line="372"/>
         <source>Shopping center</source>
         <translation>Centro comercial</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="355"/>
+        <location filename="../map/CMapIMG.cpp" line="373"/>
         <source>Marina</source>
         <translation>Puerto deportivo</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="356"/>
+        <location filename="../map/CMapIMG.cpp" line="374"/>
         <source>University/College</source>
         <translation>Universidad/Facultad</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="357"/>
+        <location filename="../map/CMapIMG.cpp" line="375"/>
         <source>Hospital</source>
         <translation>Hospital</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="358"/>
+        <location filename="../map/CMapIMG.cpp" line="376"/>
         <source>Industrial complex</source>
         <translation>Complejo industrial</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="359"/>
+        <location filename="../map/CMapIMG.cpp" line="377"/>
         <source>Reservation</source>
         <translation>Reserva natural</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="361"/>
+        <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="362"/>
+        <location filename="../map/CMapIMG.cpp" line="380"/>
         <source>Sports complex</source>
         <translation>Complejo deportivo</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="363"/>
+        <location filename="../map/CMapIMG.cpp" line="381"/>
         <source>Golf course</source>
         <translation>Recorrido de golf</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="364"/>
+        <location filename="../map/CMapIMG.cpp" line="382"/>
         <source>Cemetery</source>
         <translation>Cementerio</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="365"/>
-        <location filename="../map/CMapIMG.cpp" line="366"/>
-        <location filename="../map/CMapIMG.cpp" line="367"/>
+        <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="368"/>
+        <location filename="../map/CMapIMG.cpp" line="386"/>
         <source>City park</source>
         <translation>Parque urbano</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="369"/>
-        <location filename="../map/CMapIMG.cpp" line="370"/>
-        <location filename="../map/CMapIMG.cpp" line="371"/>
+        <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="372"/>
+        <location filename="../map/CMapIMG.cpp" line="390"/>
         <source>Forest</source>
         <translation>Bosque</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="373"/>
+        <location filename="../map/CMapIMG.cpp" line="391"/>
         <source>Ocean</source>
         <translation>Océano</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="374"/>
-        <location filename="../map/CMapIMG.cpp" line="376"/>
-        <location filename="../map/CMapIMG.cpp" line="386"/>
+        <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="375"/>
+        <location filename="../map/CMapIMG.cpp" line="393"/>
         <source>Sea</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="377"/>
-        <location filename="../map/CMapIMG.cpp" line="378"/>
-        <location filename="../map/CMapIMG.cpp" line="385"/>
+        <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="379"/>
-        <location filename="../map/CMapIMG.cpp" line="380"/>
+        <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="381"/>
-        <location filename="../map/CMapIMG.cpp" line="382"/>
+        <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="383"/>
-        <location filename="../map/CMapIMG.cpp" line="384"/>
+        <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="387"/>
+        <location filename="../map/CMapIMG.cpp" line="405"/>
         <source>Major River</source>
         <translation>Río Principal</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="388"/>
+        <location filename="../map/CMapIMG.cpp" line="406"/>
         <source>Large River</source>
         <translation>Río Grande</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="389"/>
+        <location filename="../map/CMapIMG.cpp" line="407"/>
         <source>Medium River</source>
         <translation>Río Mediano</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="390"/>
+        <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="393"/>
+        <location filename="../map/CMapIMG.cpp" line="411"/>
         <source>Intermittent water</source>
         <translation>Agua intermitente</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="394"/>
+        <location filename="../map/CMapIMG.cpp" line="412"/>
         <source>Wetland/Swamp</source>
         <translation>Marisma/Ciénaga</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="395"/>
+        <location filename="../map/CMapIMG.cpp" line="413"/>
         <source>Glacier</source>
         <translation>Glaciar</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="396"/>
+        <location filename="../map/CMapIMG.cpp" line="414"/>
         <source>Orchard/Plantation</source>
         <translation>Invernadero/Plantación</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="415"/>
         <source>Scrub</source>
         <translation>Monte bajo</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="398"/>
+        <location filename="../map/CMapIMG.cpp" line="416"/>
         <source>Tundra</source>
         <translation>Tundra</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="417"/>
         <source>Flat</source>
         <translation>Llanura</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="400"/>
+        <location filename="../map/CMapIMG.cpp" line="418"/>
         <source>???</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="436"/>
+        <location filename="../map/CMapIMG.cpp" line="432"/>
+        <source>Read external type file...</source>
+        <translation type="unfinished"></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>
+    </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="479"/>
+        <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="503"/>
-        <location filename="../map/CMapIMG.cpp" line="507"/>
+        <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="596"/>
+        <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="631"/>
+        <location filename="../map/CMapIMG.cpp" line="669"/>
         <source>Loading %1</source>
         <translation>Cargando %1</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="637"/>
+        <location filename="../map/CMapIMG.cpp" line="675"/>
         <source>User abort: </source>
-        <translation>Abortado por el usuario: </translation>
+        <translation>Cancelado por el usuario: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="640"/>
+        <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="731"/>
+        <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 type="unfinished"></translation>
+        <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="2342"/>
-        <location filename="../map/CMapIMG.cpp" line="2348"/>
-        <location filename="../map/CMapIMG.cpp" line="2352"/>
+        <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="2438"/>
+        <location filename="../map/CMapIMG.cpp" line="2484"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2480"/>
-        <location filename="../map/CMapIMG.cpp" line="2488"/>
-        <location filename="../map/CMapIMG.cpp" line="2495"/>
+        <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>
@@ -2701,7 +2761,7 @@
     <message>
         <location filename="../map/CMapList.cpp" line="227"/>
         <source>Where do you want to store maps?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Dónde desea almacenar mapas?</translation>
     </message>
 </context>
 <context>
@@ -2737,6 +2797,14 @@
     <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 type="unfinished"></translation>
     </message>
 </context>
@@ -2757,7 +2825,7 @@
     <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 TwoNav RMAP.</translation>
+        <translation>Éste no es un archivo en formato RMAP de TwoNav.</translation>
     </message>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="57"/>
@@ -2814,7 +2882,7 @@
     <message>
         <location filename="../map/CMapTMS.cpp" line="130"/>
         <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 &lt;a href=&apos;https://www.openssl.org/community/binaries.html&apos;&gt;OpenSSL Homepage&lt;/a&gt; for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
-        <translation type="unfinished"></translation>
+        <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 &lt; a href = &lt; https: //www.openssl.org/community/binaries.html &apos;&gt; OpenSSL Homepage&lt;/a&gt; Para binarios. Tienes que copiar libeay32.dll y ssleay32.dll en el directorio del programa QMapShack.</translation>
     </message>
     <message>
         <location filename="../map/CMapTMS.cpp" line="299"/>
@@ -2870,7 +2938,7 @@
         <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
         <source>!!! done !!!
 </source>
-        <translation type="unfinished"></translation>
+        <translation>¡¡¡ hecho !!!</translation>
     </message>
 </context>
 <context>
@@ -2909,12 +2977,12 @@
     <message>
         <location filename="../map/CMapWMTS.cpp" line="72"/>
         <source>Unexpected service. &apos;* WMTS 1.0.0&apos; is expected. &apos;%1 %2&apos; is read.</source>
-        <translation type="unfinished"></translation>
+        <translation>Servicio inesperado. &apos;* WMTS 1.0.0&apos; es el esperado. &apos;%1 %2&apos; esta cargado</translation>
     </message>
     <message>
         <location filename="../map/CMapWMTS.cpp" line="151"/>
         <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 &lt;a href=&apos;https://www.openssl.org/community/binaries.html&apos;&gt;OpenSSL Homepage&lt;/a&gt; for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
-        <translation type="unfinished"></translation>
+        <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 &lt; a href = &lt; https: //www.openssl.org/community/binaries.html &apos;&gt; OpenSSL Homepage&lt;/a&gt; Para binarios. Tienes que copiar libeay32.dll y ssleay32.dll en el directorio del programa QMapShack.</translation>
     </message>
     <message>
         <location filename="../map/CMapWMTS.cpp" line="217"/>
@@ -2933,17 +3001,17 @@
         <location filename="../mouse/CMouseEditArea.cpp" line="28"/>
         <location filename="../mouse/CMouseEditArea.cpp" line="35"/>
         <source>Area</source>
-        <translation type="unfinished">�rea</translation>
+        <translation>�rea</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditArea.cpp" line="37"/>
         <source>&lt;b&gt;Edit Area&lt;/b&gt;&lt;br/&gt;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.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Editar área&lt;/b&gt;&lt;br/&gt;Seleccione una función y un modo de enrutamiento a través de los botones de herramientas. A continuación, seleccione un punto de la línea. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los que tienen un punto negro son subpuntos introducidos por el enrutamiento.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
         <source>area</source>
-        <translation type="unfinished"></translation>
+        <translation>área</translation>
     </message>
 </context>
 <context>
@@ -2952,17 +3020,17 @@
         <location filename="../mouse/CMouseEditRte.cpp" line="30"/>
         <location filename="../mouse/CMouseEditRte.cpp" line="37"/>
         <source>Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruta</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditRte.cpp" line="39"/>
         <source>&lt;b&gt;Edit Route Points&lt;/b&gt;&lt;br/&gt;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.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;/b&gt;Editar puntos de ruta&lt;br/&gt;Seleccione una función y un modo de enrutamiento a través de los botones de herramientas. A continuación, seleccione un punto de la línea. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los que tienen un punto negro son subpuntos introducidos por el enrutamiento.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
         <source>route</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruta</translation>
     </message>
 </context>
 <context>
@@ -2971,22 +3039,22 @@
         <location filename="../mouse/CMouseEditTrk.cpp" line="28"/>
         <location filename="../mouse/CMouseEditTrk.cpp" line="35"/>
         <source>Track</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditTrk.cpp" line="38"/>
         <source>&lt;b&gt;Edit Track Points&lt;/b&gt;&lt;br/&gt;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.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Editar puntos del track&lt;/b&gt;&lt;br/&gt;Seleccione una función y un modo de enrutamiento a través de los botones de herramientas. A continuación, seleccione un punto del track. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los que tienen un punto negro son subpuntos introducidos por el enrutamiento.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseEditTrk.cpp" line="80"/>
         <source>Warning!</source>
-        <translation type="unfinished">¡Cuidado!</translation>
+        <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 type="unfinished">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>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="112"/>
@@ -2999,7 +3067,7 @@
     <message>
         <location filename="../mouse/CMouseNormal.cpp" line="39"/>
         <source>Add POI as Waypoint</source>
-        <translation type="unfinished"></translation>
+        <translation>Añadir POI como Waypoint </translation>
     </message>
     <message>
         <location filename="../mouse/CMouseNormal.cpp" line="40"/>
@@ -3014,7 +3082,7 @@
     <message>
         <location filename="../mouse/CMouseNormal.cpp" line="42"/>
         <source>Add Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Añadir ruta</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseNormal.cpp" line="43"/>
@@ -3024,7 +3092,7 @@
     <message>
         <location filename="../mouse/CMouseNormal.cpp" line="45"/>
         <source>Select Items On Map</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar elementos del mapa</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseNormal.cpp" line="47"/>
@@ -3034,7 +3102,7 @@
     <message>
         <location filename="../mouse/CMouseNormal.cpp" line="48"/>
         <source>Copy position (Grid)</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar posicion (malla)</translation>
     </message>
 </context>
 <context>
@@ -3042,7 +3110,7 @@
     <message>
         <location filename="../mouse/CMousePrint.cpp" line="31"/>
         <source>&lt;b&gt;Save(Print) Map&lt;/b&gt;&lt;br/&gt;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 type="unfinished"></translation>
+        <translation>&lt;b&gt;Guardar/imprimir mapa&lt;/b&gt;&lt;br/&gt;Seleccionar un area rectangular en el mapa. Pulse el boton izquierdo del ratón y muevalo. Cancele con el boton derecho. Ajuste la seleccion haciendo clic y moviendo las esquinas.</translation>
     </message>
 </context>
 <context>
@@ -3050,7 +3118,7 @@
     <message>
         <location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
         <source>&lt;b&gt;Select Range&lt;/b&gt;&lt;br/&gt;Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Seleccionar rango&lt;/b&gt;&lt;br/&gt;Primero seleccione un punto del track con el botón izquierdo del raton. Despues por segunda vez. Seleccine el rango con un clic del botón derecho del ratón&lt;br/&gt;</translation>
     </message>
 </context>
 <context>
@@ -3058,12 +3126,12 @@
     <message>
         <location filename="../mouse/CMouseSelect.cpp" line="32"/>
         <source>&lt;b&gt;Select Items On Map&lt;/b&gt;&lt;br/&gt;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 type="unfinished"></translation>
+        <translation>&lt;b&gt;Seleccionar elementos en el mapa&lt;/b&gt;&lt;br/&gt;Seleccionar un area rectangular con el boton izquierdo del ratón. Cancelar con clic derecho. Ajuste la seleccion haciendo clic en las esquinas y moviendo.</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseSelect.cpp" line="98"/>
         <source>&lt;b&gt;Selected:&lt;/b&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Seleccionado:&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseSelect.cpp" line="106"/>
@@ -3078,12 +3146,12 @@
     <message>
         <location filename="../mouse/CMouseSelect.cpp" line="111"/>
         <source>%1 routes&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 rutas&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CMouseSelect.cpp" line="116"/>
         <source>%1 areas&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 áreas&lt;br/&gt;</translation>
     </message>
 </context>
 <context>
@@ -3099,12 +3167,12 @@
     <message>
         <location filename="../plot/CPlot.cpp" line="55"/>
         <source>distance [%1]</source>
-        <translation type="unfinished">distancia [%1]</translation>
+        <translation>distancia [%1]</translation>
     </message>
     <message>
         <location filename="../plot/CPlot.cpp" line="60"/>
         <source>time</source>
-        <translation type="unfinished">tiempo</translation>
+        <translation>tiempo</translation>
     </message>
 </context>
 <context>
@@ -3125,22 +3193,22 @@
     <message>
         <location filename="../print/CPrintDialog.cpp" line="67"/>
         <source>Print Map...</source>
-        <translation type="unfinished"></translation>
+        <translation>Imprimir mapa...</translation>
     </message>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="74"/>
         <source>Save Map as Image...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar mapa como imagen...</translation>
     </message>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="94"/>
         <source>Printer Properties...</source>
-        <translation type="unfinished"></translation>
+        <translation>Imprimir propiedades...</translation>
     </message>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="169"/>
         <source>Pages: %1 x %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Páginas: %1 x %2</translation>
     </message>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="170"/>
@@ -3149,17 +3217,21 @@
 %1x%2 pixel
 x: %3 m/px
 y: %4 m/px</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Imprimir páginas.</translation>
     </message>
     <message>
         <location filename="../print/CPrintDialog.cpp" line="260"/>
         <source>Save map...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar mapa...</translation>
     </message>
 </context>
 <context>
@@ -3167,12 +3239,12 @@
     <message>
         <location filename="../helpers/CProgressDialog.cpp" line="40"/>
         <source>Elapsed time: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiempo transcurrido: %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="86"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="87"/>
         <source>Elapsed time: %1 seconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiempo transcurrido: %1 segundos.</translation>
     </message>
 </context>
 <context>
@@ -3262,7 +3334,7 @@
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="564"/>
         <source>Routes:           %1 (Only the basic route will be copied)</source>
-        <translation>Routes:           %1 (Only the basic route will be copied)</translation>
+        <translation>Rutas:           %1 (Sólo se copiará la ruta básica)</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="572"/>
@@ -3272,7 +3344,7 @@
     <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 type="unfinished"></translation>
+        <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"/>
@@ -3297,7 +3369,7 @@
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="605"/>
         <source>------ Abort ------</source>
-        <translation>------ Abortar ------</translation>
+        <translation>------ Cancelar ------</translation>
     </message>
     <message>
         <location filename="../qlgt/CQlgtDb.cpp" line="633"/>
@@ -3343,23 +3415,23 @@
         <location filename="../qlgt/CQlgtTrack.cpp" line="265"/>
         <location filename="../qlgt/CQlgtTrack.cpp" line="291"/>
         <source>Corrupt track ...</source>
-        <translation type="unfinished">Track corrupto...</translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>El número de puntos del track no es igual al número de datos extendidos ocultos.</translation>
     </message>
 </context>
 <context>
@@ -3367,22 +3439,22 @@
     <message>
         <location filename="../qlgt/CQmsDb.cpp" line="47"/>
         <source>Existing file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo existente...</translation>
     </message>
     <message>
         <location filename="../qlgt/CQmsDb.cpp" line="47"/>
         <source>Remove existing %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Eliminar los %1?</translation>
     </message>
     <message>
         <location filename="../qlgt/CQmsDb.cpp" line="52"/>
         <source>Remove existing file %1</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Descartar elemento %2 de la base de datos de QLandKarteGT</translation>
     </message>
 </context>
 <context>
@@ -3391,13 +3463,13 @@
         <location filename="../gis/qms/CQmsProject.cpp" line="48"/>
         <location filename="../gis/qms/CQmsProject.cpp" line="80"/>
         <source>Failed to open...</source>
-        <translation type="unfinished">Fallo al abrir...</translation>
+        <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 type="unfinished">Fallo al abrir %1</translation>
+        <translation>Fallo al abrir %1</translation>
     </message>
 </context>
 <context>
@@ -3410,17 +3482,17 @@
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
         <source>first alternative</source>
-        <translation type="unfinished"></translation>
+        <translation>Primera alternativa</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="51"/>
         <source>second alternative</source>
-        <translation type="unfinished"></translation>
+        <translation>Segunda alternativa</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="52"/>
         <source>third alternative</source>
-        <translation type="unfinished"></translation>
+        <translation>Tercera alternativa</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
@@ -3435,79 +3507,79 @@
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
         <source>profile: %1, alternative: %2</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Mala respuesta del servidor: %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="352"/>
         <source>&lt;b&gt;BRouter&lt;/b&gt;&lt;br/&gt;Routing request sent to server. Please wait...</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;BRouter&lt;/b&gt;&lt;br/&gt;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 type="unfinished"></translation>
+        <translation>Calcular ruta con %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
         <source>&lt;b&gt;BRouter&lt;/b&gt;&lt;br/&gt;Bad response from server:&lt;br/&gt;%1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;BRouter&lt;/b&gt;&lt;br/&gt;Mala respuesta del servidor:&lt;br/&gt;%1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
         <source>&lt;br/&gt;Calculation time: %1s</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiempo empleado en el cálculo: %1s</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="509"/>
         <source>Error</source>
-        <translation type="unfinished">Error</translation>
+        <translation>Error</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="561"/>
         <source>running</source>
-        <translation type="unfinished"></translation>
+        <translation>En marcha</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="553"/>
         <source>starting</source>
-        <translation type="unfinished"></translation>
+        <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&apos;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 BRouter service in this case.</source>
-        <translation type="unfinished"></translation>
+        <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 comprometer su sistema. No recomendamos utilizar el servicio local de BRouter en este caso.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="542"/>
         <source>Warning...</source>
-        <translation type="unfinished">Aviso...</translation>
+        <translation>Aviso...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="547"/>
         <source>I understand the risk. Don&apos;t tell me again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Comprendo el riesgo. No avisar de nuevo</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="568"/>
         <source>stopped</source>
-        <translation type="unfinished"></translation>
+        <translation>Parado</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="579"/>
         <source>not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>No instalado</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
@@ -3520,22 +3592,22 @@
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="479"/>
         <source>%1 not accessible</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 no accessible</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
         <source>%1 invalid result</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Error de red</translation>
     </message>
 </context>
 <context>
@@ -3543,164 +3615,164 @@
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="38"/>
         <source>Restore Default Values</source>
-        <translation type="unfinished"></translation>
+        <translation>Restablecer valores por defecto</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="371"/>
         <source>Open Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir carpeta</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="378"/>
         <source>select Java Executable</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Parece ser un ejecutable Java válido</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
         <source>doesn&apos;t seem to be a valid Java-executable</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Seleccione %1 para descargar e instalar</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="524"/>
         <source>Warning...</source>
-        <translation type="unfinished">Aviso...</translation>
+        <translation>Aviso...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
         <source>Download: %1&lt;br/&gt;&lt;br/&gt;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. &lt;br/&gt;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>Descarga:%1&lt;br/&gt;&lt;br/&gt; 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. &lt;br/&gt; Si no entiende esto o si tiene alguna duda, no proceda y cancele. Utilice la versión web de BRouter en su lugar.</translation>
     </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>Entiendo el riesgo, continuar.</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="553"/>
         <source>download %1 started</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciada descarga %1 </translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="565"/>
         <source>Network Error: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Error de red: %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="586"/>
         <source>download %1 finished</source>
-        <translation type="unfinished"></translation>
+        <translation>Finalizada descarga %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="588"/>
         <source>unzipping:</source>
-        <translation type="unfinished"></translation>
+        <translation>Descomprimiendo:</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="593"/>
         <source>ready.</source>
-        <translation type="unfinished"></translation>
+        <translation>Preparado</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>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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Contenido del perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="729"/>
         <source>Error:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="466"/>
         <source>Error creating directory %1</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Error escribiendo el archivo %1</translation>
     </message>
 </context>
 <context>
@@ -3708,7 +3780,7 @@
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesPage.cpp" line="82"/>
         <source>Continue with Setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Continuar con la configuración</translation>
     </message>
 </context>
 <context>
@@ -3716,140 +3788,140 @@
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="98"/>
         <source>available routing-data is being determined.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Selección caducada</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="109"/>
         <source>Clear Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar selección</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="110"/>
         <source>Delete selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar Selección</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="111"/>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Descargar</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>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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Error al escribir el archivo %1: %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="620"/>
         <source>error renaming file %1 to %2: %3</source>
-        <translation type="unfinished"></translation>
+        <translation>Error renombrando archivo %1 a %2: %3</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+        <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>actualizado: %1 (%2), obsoleto: %3 (%4), Para descargar: %5 (%6)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
         <source>being downloaded: %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Descargando: %1 of %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
         <source>no local data, online available: %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Sin datos locales, disponible online: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+        <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>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 type="unfinished"></translation>
+        <translation>Error eliminando %1: %2</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="321"/>
         <source>Network Error</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Resultado no válido, no se encuentran archivos</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="806"/>
         <source>local data up to date (%1, %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Datos locales actualizados (%1, %2)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="818"/>
         <source>no routing-data available</source>
-        <translation type="unfinished"></translation>
+        <translation>Datos de ruteo no disponibles</translation>
     </message>
 </context>
 <context>
     <name>CRouterBRouterToolShell</name>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
         <source>!!! done !!!
 </source>
-        <translation type="unfinished"></translation>
+        <translation>¡¡¡Hecho!!!</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
         <source>!!! failed !!!
 </source>
-        <translation type="unfinished">!!! fallo !!!</translation>
+        <translation>!!! fallo !!!</translation>
     </message>
 </context>
 <context>
@@ -3857,123 +3929,123 @@
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="37"/>
         <source>Fastest</source>
-        <translation type="unfinished"></translation>
+        <translation>Más rapido</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="38"/>
         <source>Shortest</source>
-        <translation type="unfinished"></translation>
+        <translation>Más corto</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="39"/>
         <source>Bicycle</source>
-        <translation type="unfinished"></translation>
+        <translation>Bicicleta</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="40"/>
         <source>Pedestrian</source>
-        <translation type="unfinished"></translation>
+        <translation>Peatón</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="42"/>
         <source>US English</source>
-        <translation type="unfinished"></translation>
+        <translation>Inglés USA</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="43"/>
         <source>British English</source>
-        <translation type="unfinished"></translation>
+        <translation>Inglés UK</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="44"/>
         <source>Danish</source>
-        <translation type="unfinished">Danés</translation>
+        <translation>Danés</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="45"/>
         <source>Dutch</source>
-        <translation type="unfinished">Holandés</translation>
+        <translation>Holandés</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="46"/>
         <source>French</source>
-        <translation type="unfinished">Francés</translation>
+        <translation>Francés</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="47"/>
         <source>German</source>
-        <translation type="unfinished">Alemán</translation>
+        <translation>Alemán</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="48"/>
         <source>Italian</source>
-        <translation type="unfinished">Italiano</translation>
+        <translation>Italiano</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="49"/>
         <source>Norwegian</source>
-        <translation type="unfinished">Noruego</translation>
+        <translation>Noruego</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="50"/>
         <source>Spanish</source>
-        <translation type="unfinished">Español</translation>
+        <translation>Español</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="51"/>
         <source>Swedish</source>
-        <translation type="unfinished">Sueco</translation>
+        <translation>Sueco</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="110"/>
         <source>mode &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>modo &quot;%1&quot;</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="114"/>
         <source>no highways</source>
-        <translation type="unfinished"></translation>
+        <translation>Evitar autopistas</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="125"/>
         <source>no toll roads</source>
-        <translation type="unfinished"></translation>
+        <translation>Evitar peajes</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="136"/>
         <source>no seasonal</source>
-        <translation type="unfinished"></translation>
+        <translation>Evitar estacionales</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="147"/>
         <source>no unpaved</source>
-        <translation type="unfinished"></translation>
+        <translation>Evitar no pavimentadas</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="158"/>
         <source>no ferry</source>
-        <translation type="unfinished"></translation>
+        <translation>Evitar Ferrys</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="169"/>
         <source>no crossing of country borders</source>
-        <translation type="unfinished"></translation>
+        <translation>No cruzar fronteras</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="301"/>
         <source>&lt;b&gt;MapQuest&lt;/b&gt;&lt;br/&gt;Routing request sent to server. Please wait...</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;MapQuest&lt;/b&gt;&lt;br/&gt;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>&lt;b&gt;MapQuest&lt;/b&gt;&lt;br/&gt;Bad response from server:&lt;br/&gt;%1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;MapQuest&lt;/b&gt;&lt;br/&gt;Mala respuesta del servidor:&lt;br/&gt;%1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterMapQuest.cpp" line="363"/>
         <source>&lt;br/&gt;Calculation time: %1s</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiempo calculando: %1s</translation>
     </message>
 </context>
 <context>
@@ -3981,218 +4053,218 @@
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="78"/>
         <source>Foot</source>
-        <translation type="unfinished"></translation>
+        <translation>A pie</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="79"/>
         <source>Horse</source>
-        <translation type="unfinished"></translation>
+        <translation>A caballo</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="80"/>
         <source>Wheelchair</source>
-        <translation type="unfinished"></translation>
+        <translation>Silla de ruedas</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="81"/>
         <source>Bicycle</source>
-        <translation type="unfinished"></translation>
+        <translation>Bicicleta</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="82"/>
         <source>Moped</source>
-        <translation type="unfinished"></translation>
+        <translation>Ciclomotor</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="83"/>
         <source>Motorcycle</source>
-        <translation type="unfinished"></translation>
+        <translation>Moto</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="84"/>
         <source>Motorcar</source>
-        <translation type="unfinished"></translation>
+        <translation>Automóvil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="85"/>
         <source>Goods</source>
-        <translation type="unfinished"></translation>
+        <translation>Mercancias</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="59"/>
         <source>Shortest</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>El más rápido</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="87"/>
         <source>English</source>
-        <translation type="unfinished">Inglés</translation>
+        <translation>Inglés</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="88"/>
         <source>German</source>
-        <translation type="unfinished">Alemán</translation>
+        <translation>Alemán</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="89"/>
         <source>French</source>
-        <translation type="unfinished">Francés</translation>
+        <translation>Francés</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="90"/>
         <source>Hungarian</source>
-        <translation type="unfinished">Húngaro</translation>
+        <translation>Húngaro</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="91"/>
         <source>Dutch</source>
-        <translation type="unfinished">Holandés</translation>
+        <translation>Holandés</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="92"/>
         <source>Russian</source>
-        <translation type="unfinished">Ruso</translation>
+        <translation>Ruso</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="93"/>
         <source>Polish</source>
-        <translation type="unfinished">Polaco</translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Error desconocido: %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="200"/>
         <source>profile &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>perfil &quot;%1&quot;</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="201"/>
         <source>, mode &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>, modo &quot;%1&quot;</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="55"/>
         <source>Warning...</source>
-        <translation type="unfinished">Aviso...</translation>
+        <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 type="unfinished"></translation>
+        <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="419"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="415"/>
         <source>Calculate route with %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Calcular ruta con %1</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="340"/>
         <source>&lt;br/&gt;Calculation time: %1s</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br/&gt;Tiempo de cálculo: %1s</translation>
     </message>
 </context>
 <context>
@@ -4200,12 +4272,12 @@
     <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Seleccione la carpeta del archivo de datos de enrutamiento</translation>
     </message>
 </context>
 <context>
@@ -4231,23 +4303,23 @@
     <message>
         <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="33"/>
         <source>Create Routino Database</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear base de datos de Routino</translation>
     </message>
     <message>
         <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="57"/>
         <source>Select files...</source>
-        <translation type="unfinished">Seleccionar ficheros de origen...</translation>
+        <translation>Seleccionar ficheros de origen...</translation>
     </message>
     <message>
         <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
         <source>Select target path...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar carpeta de destino</translation>
     </message>
     <message>
         <location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
         <source>!!! done !!!
 </source>
-        <translation type="unfinished"></translation>
+        <translation>¡¡¡Hecho!!!</translation>
     </message>
 </context>
 <context>
@@ -4255,7 +4327,7 @@
     <message>
         <location filename="../mouse/CScrOptRangeTrk.cpp" line="38"/>
         <source>No range selected</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay rango seleccionado</translation>
     </message>
 </context>
 <context>
@@ -4268,37 +4340,37 @@
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="97"/>
         <source>&lt;b&gt;Intersecting Mode&lt;/b&gt;&lt;br/&gt;All selected items have to be inside or at least intersect the selected area.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo de intersección&lt;/b&gt;&lt;br/&gt;Todos los elementos seleccionados deben estar dentro o al menos intersecar el área seleccionada.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="101"/>
         <source>&lt;b&gt;Add Tracks&lt;/b&gt;&lt;br/&gt;Add tracks to list of selected items&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Agregar tracks&lt;/b&gt;&lt;br/&gt;Agregar tracks a la lista de elementos seleccionados&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="105"/>
         <source>&lt;b&gt;Add Waypoints&lt;/b&gt;&lt;br/&gt;Add waypoints to list of selected items&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Agregar waypoints&lt;/b&gt;&lt;br/&gt;Agregar waypoints a la lista de elementos seleccionados&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="109"/>
         <source>&lt;b&gt;Add Routes&lt;/b&gt;&lt;br/&gt;Add routes to list of selected items&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Agregar rutas&lt;/b&gt;&lt;br/&gt;Agregar rutas a la lista de elementos seleccionados &lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="113"/>
         <source>&lt;b&gt;Add Areas&lt;/b&gt;&lt;br/&gt;Add areas to list of selected items&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Agregar áreas&lt;/b&gt;&lt;br/&gt;Agregar áreas a la lista de elementos seleccionados&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="124"/>
         <source>&lt;b&gt;Ignore Tracks&lt;/b&gt;&lt;br/&gt;Ignore tracks in list of selected items&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Ignorar tracks&lt;/b&gt;&lt;br/&gt;Ignorar tracks de la lista de elementos seleccionados&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="128"/>
         <source>&lt;b&gt;Ignore Waypoints&lt;/b&gt;&lt;br/&gt;Ignore waypoints in list of selected items&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Ignorar Waypoints&lt;/b&gt;&lt;br/&gt;Ignorar waypoints de la lista de elementos seleccionados&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="132"/>
@@ -4308,7 +4380,7 @@
     <message>
         <location filename="../mouse/CScrOptSelect.cpp" line="136"/>
         <source>&lt;b&gt;Ignore Areas&lt;/b&gt;&lt;br/&gt;Ignore areas in list of selected items&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Ignorar áreas&lt;/b&gt;&lt;br/&gt;Ignorar áreas de la lista de elementos seleccionados&lt;br/&gt;</translation>
     </message>
 </context>
 <context>
@@ -4316,7 +4388,7 @@
     <message>
         <location filename="../gis/db/CSearchDatabase.cpp" line="38"/>
         <source>Search database &apos;%1&apos;:</source>
-        <translation type="unfinished"></translation>
+        <translation>Buscar base de datos &apos;%1&apos;:</translation>
     </message>
 </context>
 <context>
@@ -4337,12 +4409,12 @@
     <message>
         <location filename="../gis/db/CSetupDatabase.cpp" line="47"/>
         <source>Missing Requirement</source>
-        <translation type="unfinished"></translation>
+        <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.&lt;br /&gt;Please make sure you have installed the corresponding package.&lt;br /&gt;If you don&apos;t know what to do now you should have &lt;a href=&quot;%1&quot;&gt;a look at the wiki&lt;/a&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>SQL no se puede utilizar en este momento, ya que el controlador correspondiente (QMYSQL) no está disponible.&lt;br /&gt;Asegúrese de haber instalado el paquete correspondiente.&lt;br /&gt;Si usted no sabe qué hacer ahora debe &lt;a href=&quot;%1&quot;&gt;consultar la wiki&lt;/a&gt;.</translation>
     </message>
     <message>
         <location filename="../gis/db/CSetupDatabase.cpp" line="102"/>
@@ -4383,7 +4455,7 @@
     <message>
         <location filename="../gis/slf/CSlfProject.cpp" line="42"/>
         <source>Failed to load file %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al cargar el archivo %1</translation>
     </message>
 </context>
 <context>
@@ -4391,46 +4463,46 @@
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="63"/>
         <source>Failed to parse timestamp `%1`</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>%1 no existe</translation>
     </message>
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="81"/>
         <source>Failed to open %1</source>
-        <translation type="unfinished">Fallo al abrir %1</translation>
+        <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 type="unfinished">Fallo al leer: %1
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Revisión no admitida %1: %2</translation>
     </message>
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="181"/>
         <source>Break %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Pausa %1</translation>
     </message>
     <message>
         <location filename="../gis/slf/CSlfReader.cpp" line="185"/>
         <source>Lap %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Vuelta %1</translation>
     </message>
 </context>
 <context>
@@ -4438,7 +4510,7 @@
     <message>
         <location filename="../gis/trk/CTableTrk.cpp" line="99"/>
         <source>Double click to edit elevation value</source>
-        <translation type="unfinished"></translation>
+        <translation>Doble clic para editar datos de altitud</translation>
     </message>
     <message>
         <location filename="../gis/trk/CTableTrk.cpp" line="125"/>
@@ -4456,97 +4528,97 @@
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="51"/>
         <source>Failed to load file %1...</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished">Fallo al abrir %1</translation>
+        <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 type="unfinished">Fallo al leer: %1
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished">El archivo ya existe ...</translation>
+        <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 &apos;yes&apos; 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. &lt;b&gt;Do you really want to overwrite the file?&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>El archivo existe y no ha sido creado por QMapShack. Si pulsa &apos;yes&apos; 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. &lt;b&gt;¿Realmente desea sobrescribir el archivo?&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="315"/>
         <source>The track &lt;b&gt;%1&lt;/b&gt; you have selected contains trackpoints with invalid timestamps. Device might not accept the generated TCX course file if left as is. &lt;b&gt;Do you want to apply a filter with constant speed (10 m/s) and continue?&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>El track &lt;b&gt;%1&lt;/b&gt; 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á &lt;b&gt;¿Desea aplicar un filtro con velocidad constante (10 m / s) y continuar?&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="339"/>
         <source>Course</source>
-        <translation type="unfinished"></translation>
+        <translation>Carrera</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="340"/>
         <source>Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Actividad</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="341"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="314"/>
         <source>Track with invalid timestamps...</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>¿Actividad o carrera?</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="335"/>
         <source>QMapShack does not know how track &lt;b&gt;%1&lt;/b&gt; should be saved. &lt;b&gt;Do you want to save it as a course or as an activity? &lt;/b&gt;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 no sabe cómo &lt;b&gt;%1&lt;/b&gt; Debe ser guardado. &lt;b&gt;¿Desea guardarlo como carrera o como actividad? &lt;/b&gt;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 &apos;%1&apos;</source>
-        <translation type="unfinished">Fallo al crear el archivo &apos;%1&apos;</translation>
+        <translation>Fallo al crear el archivo &apos;%1&apos;</translation>
     </message>
     <message>
         <location filename="../gis/tcx/CTcxProject.cpp" line="453"/>
         <source>Failed to write file &apos;%1&apos;</source>
-        <translation type="unfinished">Fallo al escribir en el archivo &apos;%1&apos;</translation>
+        <translation>Fallo al escribir en el archivo &apos;%1&apos;</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"></translation>
+        <translation>Error al guardar datos GIS</translation>
     </message>
 </context>
 <context>
@@ -4559,7 +4631,20 @@
     <message>
         <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
         <source>Reset format</source>
-        <translation type="unfinished"></translation>
+        <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>
@@ -4574,32 +4659,32 @@
         <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
         <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Error...</source>
-        <translation type="unfinished">Error...</translation>
+        <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 type="unfinished">Fallo al abrir %1.</translation>
+        <translation>Fallo al abrir %1.</translation>
     </message>
     <message>
         <location filename="../gis/tnv/CTwoNavProject.cpp" line="160"/>
         <source>Save GIS data to...</source>
-        <translation type="unfinished">Guardar los datos GIS en...</translation>
+        <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 type="unfinished">Solamente soporta formato lon/lat WGS84.</translation>
+        <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 type="unfinished">Fallo al leer los datos.</translation>
+        <translation>Fallo al leer los datos.</translation>
     </message>
 </context>
 <context>
@@ -4607,7 +4692,7 @@
     <message>
         <location filename="../helpers/CWptIconDialog.cpp" line="161"/>
         <source>Path to user icons...</source>
-        <translation type="unfinished"></translation>
+        <translation>Carpeta de iconos de usuario</translation>
     </message>
 </context>
 <context>
@@ -4629,7 +4714,7 @@
         <location filename="../IAbout.ui" line="141"/>
         <location filename="../IAbout.ui" line="155"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="106"/>
@@ -4654,12 +4739,12 @@
     <message>
         <location filename="../IAbout.ui" line="179"/>
         <source>Czech:</source>
-        <translation type="unfinished"></translation>
+        <translation>checo:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="202"/>
         <source>German:</source>
-        <translation type="unfinished"></translation>
+        <translation>Alemán:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="212"/>
@@ -4669,12 +4754,12 @@
     <message>
         <location filename="../IAbout.ui" line="225"/>
         <source>Dutch:</source>
-        <translation type="unfinished"></translation>
+        <translation>holandés:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="248"/>
         <source>French:</source>
-        <translation type="unfinished"></translation>
+        <translation>Francés:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="258"/>
@@ -4684,7 +4769,7 @@
     <message>
         <location filename="../IAbout.ui" line="295"/>
         <source>Russian:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruso:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="302"/>
@@ -4704,7 +4789,7 @@
     <message>
         <location filename="../IAbout.ui" line="288"/>
         <source>&lt;b&gt;Translation:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Traducción:&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="235"/>
@@ -4714,7 +4799,7 @@
     <message>
         <location filename="../IAbout.ui" line="278"/>
         <source>Spanish:</source>
-        <translation type="unfinished"></translation>
+        <translation>Español:</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="326"/>
@@ -4729,17 +4814,17 @@
     <message>
         <location filename="../IAbout.ui" line="366"/>
         <source>&lt;b&gt;Binaries:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Binarios:&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="395"/>
         <source>&lt;b&gt;Contributors:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Colaboradores:&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="265"/>
         <source>Jose Luis Domingo Lopez</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Jose Luis Domingo, Javi Segovia</translation>
     </message>
     <message>
         <location filename="../IAbout.ui" line="359"/>
@@ -4754,7 +4839,7 @@
     <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 type="unfinished"></translation>
+        <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"/>
@@ -4766,7 +4851,7 @@
     <message>
         <location filename="../IAbout.ui" line="421"/>
         <source>This software is licensed under GPL3 or any later version</source>
-        <translation type="unfinished"></translation>
+        <translation>Este software esta bajo licencia GPL3 o posterior</translation>
     </message>
 </context>
 <context>
@@ -4789,17 +4874,17 @@
     <message>
         <location filename="../canvas/ICanvasSetup.ui" line="53"/>
         <source>Scales</source>
-        <translation type="unfinished"></translation>
+        <translation>Escalas</translation>
     </message>
     <message>
         <location filename="../canvas/ICanvasSetup.ui" line="59"/>
         <source>Logarithmic</source>
-        <translation type="unfinished"></translation>
+        <translation>Logarítmico</translation>
     </message>
     <message>
         <location filename="../canvas/ICanvasSetup.ui" line="66"/>
         <source>Square (optimized for TMS and WTMS tiles)</source>
-        <translation type="unfinished"></translation>
+        <translation>Cuadrado (optimizado para teselas TMS y WTMS)</translation>
     </message>
 </context>
 <context>
@@ -4807,7 +4892,7 @@
     <message>
         <location filename="../widgets/IColorChooser.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Diálogo</translation>
     </message>
 </context>
 <context>
@@ -4820,7 +4905,7 @@
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="24"/>
         <source>Available Tracks</source>
-        <translation type="unfinished"></translation>
+        <translation>Tracks disponibles</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="54"/>
@@ -4833,7 +4918,7 @@
     <message>
         <location filename="../gis/trk/ICombineTrk.ui" line="109"/>
         <source>Combined Tracks</source>
-        <translation type="unfinished"></translation>
+        <translation>Tracks combinados</translation>
     </message>
 </context>
 <context>
@@ -4841,7 +4926,7 @@
     <message>
         <location filename="../units/ICoordFormatSetup.ui" line="14"/>
         <source>Coordinate Format...</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato de coordenadas</translation>
     </message>
     <message>
         <location filename="../units/ICoordFormatSetup.ui" line="36"/>
@@ -4864,13 +4949,13 @@
     <message>
         <location filename="../gis/rte/ICreateRouteFromWpt.ui" line="14"/>
         <source>Create Route from Waypoints</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -4878,27 +4963,27 @@
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="14"/>
         <source>Cut Track</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Modo de división</translation>
     </message>
     <message>
         <location filename="../gis/trk/ICutTrk.ui" line="136"/>
@@ -4907,12 +4992,16 @@
 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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Crear nuevo track</translation>
     </message>
 </context>
 <context>
@@ -4920,58 +5009,62 @@
     <message>
         <location filename="../gis/db/IDB.cpp" line="60"/>
         <source>The internal database format of &apos;%1&apos; has changed. QMapShack will migrate your database, now. After the migration the database won&apos;t be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Compruebe esto para almacenar el resultado en un nuevo track.
+
+Si mantiene ambas partes del track tiene que crear otras nuevas.
+
+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/db/IDB.cpp" line="64"/>
         <source>Migrate database...</source>
-        <translation type="unfinished"></translation>
+        <translation>Migrar base de datos.</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="69"/>
         <source>Migration aborted by user</source>
-        <translation type="unfinished"></translation>
+        <translation>Migracion cancelada por el usuario</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="75"/>
         <source>Failed to migrate &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al migrar &apos;%1&apos;.</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="77"/>
         <location filename="../gis/db/IDB.cpp" line="106"/>
         <source>Error...</source>
-        <translation type="unfinished">Error...</translation>
+        <translation>Error...</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="81"/>
         <source>Migration failed</source>
-        <translation type="unfinished"></translation>
+        <translation>La migración falló</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="88"/>
         <source>The database version of &apos;%1&apos; is more advanced as the one understood by your QMapShack installation. This won&apos;t work.</source>
-        <translation type="unfinished"></translation>
+        <translation>La versión de base de datos &apos;%1&apos; 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 type="unfinished"></translation>
+        <translation>Inicializacion fallida</translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="91"/>
         <source>Wrong database version...</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al iniciar &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
@@ -4979,17 +5072,17 @@
     <message>
         <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password...</source>
-        <translation type="unfinished"></translation>
+        <translation>Contraseña...</translation>
     </message>
     <message>
         <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password for database &apos;%1&apos;:</source>
-        <translation type="unfinished"></translation>
+        <translation>Contraseña de la base de datos</translation>
     </message>
     <message>
         <location filename="../gis/db/IDBMysql.cpp" line="222"/>
         <source>Update to database version 5. Migrate all GIS items.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar base de datos a versión 5. Migrar todos los elementos GIS</translation>
     </message>
 </context>
 <context>
@@ -4997,17 +5090,17 @@
     <message>
         <location filename="../gis/db/IDBSqlite.cpp" line="306"/>
         <source>Update to database version 3. Migrate all GIS items.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Actualizar base de datos a versión 6. Migrar todos los elementos GIS</translation>
     </message>
 </context>
 <context>
@@ -5015,7 +5108,7 @@
     <message>
         <location filename="../dem/IDemPathSetup.ui" line="14"/>
         <source>Setup DEM file paths</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar carpeta de archivos DEM</translation>
     </message>
     <message>
         <location filename="../dem/IDemPathSetup.ui" line="31"/>
@@ -5055,7 +5148,7 @@
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="74"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="87"/>
@@ -5079,7 +5172,7 @@
         <location filename="../dem/IDemPropSetup.ui" line="494"/>
         <location filename="../dem/IDemPropSetup.ui" line="578"/>
         <source>°</source>
-        <translation type="unfinished">º</translation>
+        <translation>º</translation>
     </message>
     <message>
         <location filename="../dem/IDemPropSetup.ui" line="229"/>
@@ -5097,7 +5190,7 @@
         <location filename="../dem/IDemPropSetup.ui" line="438"/>
         <location filename="../dem/IDemPropSetup.ui" line="522"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
 </context>
 <context>
@@ -5110,7 +5203,7 @@
     <message>
         <location filename="../dem/IDemList.ui" line="118"/>
         <source>To add files with elevation data use &lt;b&gt;File-&gt;Setup DEM Paths&lt;/b&gt;.  Or click &lt;a href=&apos;setup&apos;&gt;&lt;b&gt;here&lt;/b&gt;&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Para añadir archivos con datos de altitud &lt;b&gt;File-&gt;configure rutas de DEM&lt;/b&gt;.  O clic &lt;a href=&apos;setup&apos;&gt;&lt;b&gt;aqui&lt;/b&gt;&lt;/a&gt;</translation>
     </message>
     <message>
         <location filename="../dem/IDemList.ui" line="131"/>
@@ -5125,27 +5218,27 @@
     <message>
         <location filename="../dem/IDemList.ui" line="165"/>
         <source>Move Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Subir</translation>
     </message>
     <message>
         <location filename="../dem/IDemList.ui" line="168"/>
         <source>Hide DEM behind previous one</source>
-        <translation type="unfinished"></translation>
+        <translation>Ocultar DEM detrás del anterior</translation>
     </message>
     <message>
         <location filename="../dem/IDemList.ui" line="177"/>
         <source>Move down</source>
-        <translation type="unfinished"></translation>
+        <translation>Bajar</translation>
     </message>
     <message>
         <location filename="../dem/IDemList.ui" line="180"/>
         <source>Show DEM on top of next one</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar DEM encima del siguiente</translation>
     </message>
     <message>
         <location filename="../dem/IDemList.ui" line="189"/>
         <source>Reload DEM</source>
-        <translation type="unfinished"></translation>
+        <translation>Recargar DEM&apos;s</translation>
     </message>
 </context>
 <context>
@@ -5153,7 +5246,7 @@
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="20"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Diálogo</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="47"/>
@@ -5194,7 +5287,7 @@
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="214"/>
         <source>Update spoilers</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar spoilers</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="217"/>
@@ -5210,7 +5303,7 @@
     <message>
         <location filename="../gis/wpt/IDetailsGeoCache.ui" line="324"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
 </context>
 <context>
@@ -5218,17 +5311,17 @@
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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"/>
@@ -5258,7 +5351,7 @@
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="248"/>
         <source>Info</source>
-        <translation type="unfinished">Información</translation>
+        <translation>Información</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IDetailsOvlArea.ui" line="277"/>
@@ -5304,17 +5397,17 @@
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="71"/>
         <source>Keep order of project</source>
-        <translation type="unfinished"></translation>
+        <translation>Mantenga el orden del proyecto</translation>
     </message>
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
         <source>Sort along track (multiple)</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Ordenar a lo largo del track (único)</translation>
     </message>
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
@@ -5332,12 +5425,12 @@
     <message>
         <location filename="../gis/rte/IDetailsRte.ui" line="36"/>
         <source>Info</source>
-        <translation type="unfinished">Información</translation>
+        <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 type="unfinished"></translation>
+        <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"/>
@@ -5347,17 +5440,17 @@
     <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 type="unfinished"></translation>
+        <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 type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../gis/rte/IDetailsRte.ui" line="229"/>
         <source>Hist.</source>
-        <translation type="unfinished">Historial</translation>
+        <translation>Historial</translation>
     </message>
 </context>
 <context>
@@ -5365,7 +5458,7 @@
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="81"/>
@@ -5378,22 +5471,22 @@
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
         <source>Use/edit user defined visibility of arrows for this track</source>
-        <translation type="unfinished"></translation>
+        <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&apos;s visibility of arrows for all tracks</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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&apos;s default factor for all tracks</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilice / edite el factor predeterminado del sistema para todas los tracks</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="855"/>
@@ -5420,7 +5513,7 @@
         <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 type="unfinished"></translation>
+        <translation>Límites definidos por el usuario para este track</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="571"/>
@@ -5428,7 +5521,7 @@
         <location filename="../gis/trk/IDetailsTrk.ui" line="1173"/>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1270"/>
         <source>Automatic limits</source>
-        <translation type="unfinished"></translation>
+        <translation>Límites automáticos</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="600"/>
@@ -5436,7 +5529,7 @@
         <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 type="unfinished"></translation>
+        <translation>Límites definidos por el usuario para todos los track</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
@@ -5446,7 +5539,7 @@
     <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 type="unfinished"></translation>
+        <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"/>
@@ -5472,22 +5565,22 @@
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="387"/>
         <source>Style</source>
-        <translation type="unfinished">Estilo</translation>
+        <translation>Estilo</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="429"/>
         <source>Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Atributo</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="634"/>
         <source>Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Máximo</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="774"/>
         <source>Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>Mínimo</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
@@ -5504,47 +5597,47 @@
     <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>El track que se ha importado a QMapShack ha cambiado. No muestra los datos originales. Consulte historial de cambios</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
         <source>Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Anchura</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="641"/>
         <source>with arrows</source>
-        <translation type="unfinished"></translation>
+        <translation>Con flechas</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="794"/>
         <source>Color</source>
-        <translation type="unfinished">Color</translation>
+        <translation>Color</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="842"/>
         <source>Graphs</source>
-        <translation type="unfinished"></translation>
+        <translation>Gráficos</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
         <source>Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Actividad</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
         <source>Set Track Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Establecer actividad del track</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
         <source>Remove Track Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar actividad del track</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
         <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 type="unfinished"></translation>
+        <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="1430"/>
@@ -5559,7 +5652,7 @@
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
         <source>Ele.</source>
-        <translation>Altitud</translation>
+        <translation>Altitud.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
@@ -5594,12 +5687,12 @@
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
         <source>Ascent</source>
-        <translation type="unfinished"></translation>
+        <translation>Ascenso</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
         <source>Descent</source>
-        <translation type="unfinished"></translation>
+        <translation>Descenso</translation>
     </message>
     <message>
         <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
@@ -5617,17 +5710,17 @@
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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"/>
@@ -5645,7 +5738,7 @@
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="43"/>
         <source>Info</source>
-        <translation type="unfinished">Información</translation>
+        <translation>Información</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="84"/>
@@ -5658,7 +5751,7 @@
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="97"/>
         <source>Ele.</source>
-        <translation></translation>
+        <translation>Altitud.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="123"/>
@@ -5668,7 +5761,7 @@
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="413"/>
         <source>Hist.</source>
-        <translation type="unfinished">Historial</translation>
+        <translation>Historial</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IDetailsWpt.ui" line="339"/>
@@ -5691,7 +5784,7 @@
     <message>
         <location filename="../device/IDevice.cpp" line="292"/>
         <source>There is another project with the same name. If you press &apos;ok&apos; it will be removed and replaced.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hay otro proyecto con el mismo nombre. Si pulsa &apos;ok&apos;será eliminado y reemplazado</translation>
     </message>
 </context>
 <context>
@@ -5727,42 +5820,42 @@
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="14"/>
         <source>Export database to GPX...</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportar base de datos a 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>Carpeta de exportación</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 sin extensiones</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="83"/>
         <source>Start</source>
-        <translation type="unfinished">Comenzar</translation>
+        <translation>Comenzar</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="93"/>
         <source>Abort</source>
-        <translation type="unfinished">Abortar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location filename="../gis/db/IExportDatabase.ui" line="100"/>
         <source>Close</source>
-        <translation type="unfinished">Cerrar</translation>
+        <translation>Cerrar</translation>
     </message>
 </context>
 <context>
@@ -5798,17 +5891,17 @@
     <message>
         <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="51"/>
         <source>&lt;b&gt;Remove Extension from all Track Points&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Eliminar extensión para todos los puntos del track&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="63"/>
         <source>Remove </source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="83"/>
         <source>from all Track Points</source>
-        <translation type="unfinished"></translation>
+        <translation>de todos los puntos del track</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="103"/>
@@ -5859,27 +5952,27 @@
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="51"/>
         <source>&lt;b&gt;Interpolate Elevation Data&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Interpolar datos de altitud&lt;/b&gt;</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>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 type="unfinished"></translation>
+        <translation>Calidad</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="105"/>
         <source>Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista previa</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="112"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -5892,17 +5985,17 @@
     <message>
         <location filename="../gis/trk/filter/IFilterInvalid.ui" line="41"/>
         <source>Hide Invalid Points</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Ocultar puntos con datos inválidos</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInvalid.ui" line="63"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -5920,7 +6013,7 @@
     <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 elevación de los puntos del track con la Mediana de</translation>
+        <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"/>
@@ -5958,7 +6051,7 @@
     <message>
         <location filename="../gis/trk/filter/IFilterNewDate.ui" line="61"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>-</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterNewDate.ui" line="81"/>
@@ -6009,7 +6102,7 @@
     <message>
         <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="51"/>
         <source>&lt;b&gt;Offset Elevation&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Desplazar Elevación&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Desplazar altitud&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="69"/>
@@ -6019,7 +6112,7 @@
     <message>
         <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="95"/>
         <source>to track points elevation.</source>
-        <translation>a la elevación de los puntos del track.</translation>
+        <translation>a la altitud de los puntos del track.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterOffsetElevation.ui" line="115"/>
@@ -6037,12 +6130,12 @@
     <message>
         <location filename="../gis/trk/filter/IFilterReplaceElevation.ui" line="51"/>
         <source>&lt;b&gt;Replace Elevation Data&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Reemplazar Datos de Elevación&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Reemplazar Datos de altitud&lt;/b&gt;</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 elevación de los puntos del track utilizando los valores del fichero DEM cargado.</translation>
+        <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"/>
@@ -6111,17 +6204,17 @@
     <message>
         <location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Split Segments into Tracks&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dividir el track en segmentos&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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 type="unfinished"></translation>
+        <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 type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -6134,17 +6227,40 @@
     <message>
         <location filename="../gis/trk/filter/IFilterSubPt2Pt.ui" line="35"/>
         <source>&lt;b&gt;Convert track subpoints to points&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Convertir subpuntos de track en puntos&lt;/b&gt;</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>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 type="unfinished">...</translation>
+        <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>&lt;b&gt;Calculate Terrain Slope&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Calcular pendiente del terreno&lt;/b&gt;</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>
@@ -6152,12 +6268,12 @@
     <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Error decodificando FIT: Ya existe un campo con el número de definición %1.</translation>
     </message>
 </context>
 <context>
@@ -6165,87 +6281,88 @@
     <message>
         <location filename="../gis/IGisItem.cpp" line="44"/>
         <source>[no name]</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Es posible que deba guardar el elemento</translation>
     </message>
     <message>
         <location filename="../gis/IGisItem.cpp" line="413"/>
         <source>Initial version.</source>
-        <translation type="unfinished">Versión inicial</translation>
+        <translation>Versión inicial</translation>
     </message>
     <message>
         <location filename="../gis/IGisItem.cpp" line="529"/>
         <source>&lt;h3&gt;%1&lt;/h3&gt; 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 &apos;Ok&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h3&gt;%1&lt;/h3&gt; 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 &apos;Ok&apos;.</translation>
     </message>
     <message>
         <location filename="../gis/IGisItem.cpp" line="530"/>
         <source>Read Only Mode...</source>
-        <translation type="unfinished">Modo Sólo Lectura...</translation>
+        <translation>Modo Sólo Lectura...</translation>
     </message>
     <message>
         <location filename="../gis/IGisItem.cpp" line="700"/>
         <location filename="../gis/IGisItem.cpp" line="753"/>
         <source>&lt;h4&gt;Description:&lt;/h4&gt;</source>
-        <translation type="unfinished">&lt;h4&gt;Descripción:&lt;/h4&gt;</translation>
+        <translation>&lt;h4&gt;Descripción:&lt;/h4&gt;</translation>
     </message>
     <message>
         <location filename="../gis/IGisItem.cpp" line="703"/>
         <location filename="../gis/IGisItem.cpp" line="756"/>
         <source>&lt;p&gt;--- no description ---&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;---sin descripción---&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;---sin descripción---&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../gis/IGisItem.cpp" line="714"/>
         <source>&lt;h4&gt;Comment:&lt;/h4&gt;</source>
-        <translation type="unfinished">&lt;h4&gt;Comentario:&lt;/h4&gt;</translation>
+        <translation>&lt;h4&gt;Comentario:&lt;/h4&gt;</translation>
     </message>
     <message>
         <location filename="../gis/IGisItem.cpp" line="717"/>
         <source>&lt;p&gt;--- no comment ---&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;--- Sin comentario ---&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../gis/IGisItem.cpp" line="728"/>
         <location filename="../gis/IGisItem.cpp" line="767"/>
         <source>&lt;h4&gt;Links:&lt;/h4&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h4&gt;Enlaces:&lt;/h4&gt;</translation>
     </message>
     <message>
         <location filename="../gis/IGisItem.cpp" line="731"/>
         <location filename="../gis/IGisItem.cpp" line="770"/>
         <source>&lt;p&gt;--- no links ---&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;--- sin links ---&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;--- sin enlaces ---&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../gis/IGisItem.cpp" line="846"/>
         <source>Edit name...</source>
-        <translation type="unfinished">Editar nombre...</translation>
+        <translation>Editar nombre...</translation>
     </message>
     <message>
         <location filename="../gis/IGisItem.cpp" line="846"/>
         <source>Enter new %1 name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir nuevo nombre de %1</translation>
     </message>
 </context>
 <context>
@@ -6253,39 +6370,40 @@
     <message>
         <location filename="../gis/prj/IGisProject.cpp" line="155"/>
         <source>Save project?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Guardar proyecto?</translation>
     </message>
     <message>
         <location filename="../gis/prj/IGisProject.cpp" line="155"/>
         <source>&lt;h3&gt;%1&lt;/h3&gt;The project was changed. Save before closing it?</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h3&gt;%1&lt;/h3&gt;Ha habido cambios en el proyecto. ¿Guardar antes de cerrar?</translation>
     </message>
     <message>
         <location filename="../gis/prj/IGisProject.cpp" line="329"/>
         <source>%1: Correlate tracks and waypoints.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Correlacionar tracks y waypoints</translation>
     </message>
     <message>
         <location filename="../gis/prj/IGisProject.cpp" line="339"/>
         <source>&lt;h3&gt;%1&lt;/h3&gt;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>
+        <translation>&lt;h3&gt;%1&lt;/h3&gt;¿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="340"/>
         <source>Canceled correlation...</source>
-        <translation type="unfinished"></translation>
+        <translation>Correlación cancelada</translation>
     </message>
     <message>
         <location filename="../gis/prj/IGisProject.cpp" line="385"/>
         <location filename="../gis/prj/IGisProject.cpp" line="442"/>
         <source>Save &quot;%1&quot; to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar &quot;%1&quot; como...</translation>
     </message>
     <message>
         <location filename="../gis/prj/IGisProject.cpp" line="527"/>
         <source>&lt;br/&gt;
 Filename: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br/&gt;
+Nombre de archivo %1</translation>
     </message>
     <message>
         <location filename="../gis/prj/IGisProject.cpp" line="532"/>
@@ -6300,22 +6418,22 @@
     <message>
         <location filename="../gis/prj/IGisProject.cpp" line="540"/>
         <source>Routes: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Rutas: %1</translation>
     </message>
     <message>
         <location filename="../gis/prj/IGisProject.cpp" line="544"/>
         <source>Areas: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>�reas: %1</translation>
     </message>
     <message>
         <location filename="../gis/prj/IGisProject.cpp" line="664"/>
         <source>Are you sure you want to delete &apos;%1&apos; from project &apos;%2&apos;?</source>
-        <translation type="unfinished">¿Desea realmente eleiminar &apos;%1&apos; del proyecto &apos;%2&apos;?</translation>
+        <translation>¿Desea realmente eliminar &apos;%1&apos; del proyecto &apos;%2&apos;?</translation>
     </message>
     <message>
         <location filename="../gis/prj/IGisProject.cpp" line="665"/>
         <source>Delete...</source>
-        <translation type="unfinished">Borrar...</translation>
+        <translation>Borrar...</translation>
     </message>
 </context>
 <context>
@@ -6326,31 +6444,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="49"/>
+        <location filename="../gis/IGisWidget.ui" line="43"/>
         <source>Opacity</source>
-        <translation type="unfinished">Opacidad</translation>
+        <translation>Opacidad</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="56"/>
+        <location filename="../gis/IGisWidget.ui" line="50"/>
         <source>Change the opacity of all GIS Items on the map.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar opacidad para todos los elementos GIS del mapa</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWidget.ui" line="66"/>
+        <source>Filter</source>
+        <translation type="unfinished">Filtro</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="108"/>
-        <location filename="../gis/IGisWidget.ui" line="138"/>
+        <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="143"/>
+        <location filename="../gis/IGisWidget.ui" line="151"/>
         <source>Age</source>
-        <translation type="unfinished"></translation>
+        <translation>Edad</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="177"/>
+        <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <source>Setup Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IGridSetup</name>
@@ -6367,7 +6500,7 @@
     <message>
         <location filename="../grid/IGridSetup.ui" line="37"/>
         <source>restore default</source>
-        <translation>restaurar predeterminado</translation>
+        <translation>restaurar valores predeterminados</translation>
     </message>
     <message>
         <location filename="../grid/IGridSetup.ui" line="40"/>
@@ -6395,7 +6528,7 @@
     <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 malla</translation>
     </message>
 </context>
 <context>
@@ -6443,7 +6576,7 @@
     <message>
         <location filename="../helpers/IInputDialog.ui" line="20"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
 </context>
 <context>
@@ -6451,7 +6584,7 @@
     <message>
         <location filename="../mouse/line/ILineOp.cpp" line="212"/>
         <source>Routing</source>
-        <translation type="unfinished"></translation>
+        <translation>Enrutamiento</translation>
     </message>
 </context>
 <context>
@@ -6459,7 +6592,7 @@
     <message>
         <location filename="../helpers/ILinksDialog.ui" line="14"/>
         <source>Links...</source>
-        <translation>Links...</translation>
+        <translation>Enlaces...</translation>
     </message>
     <message>
         <location filename="../helpers/ILinksDialog.ui" line="23"/>
@@ -6506,337 +6639,362 @@
         <translation>Ventana</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="110"/>
+        <location filename="../IMainWindow.ui" line="112"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="118"/>
+        <location filename="../IMainWindow.ui" line="120"/>
         <source>Project</source>
         <translation>Proyecto</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="129"/>
+        <location filename="../IMainWindow.ui" line="131"/>
         <source>Tool</source>
         <translation>Herramientas</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="154"/>
+        <location filename="../IMainWindow.ui" line="156"/>
         <source>Maps</source>
         <translation>Mapas</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="197"/>
+        <location filename="../IMainWindow.ui" line="199"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation>Modelo Digital del Terreno (DEM)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="236"/>
+        <location filename="../IMainWindow.ui" line="238"/>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="254"/>
+        <location filename="../IMainWindow.ui" line="256"/>
         <source>Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruta</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="286"/>
+        <source>Toolbar</source>
+        <translation>Barra de herramientas</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="288"/>
-        <location filename="../IMainWindow.ui" line="291"/>
+        <location filename="../IMainWindow.ui" line="301"/>
+        <location filename="../IMainWindow.ui" line="304"/>
         <source>Add Map View</source>
         <translation>Añadir Vista de Mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="294"/>
+        <location filename="../IMainWindow.ui" line="307"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="309"/>
+        <location filename="../IMainWindow.ui" line="322"/>
         <source>Show Scale</source>
         <translation>Mostrar Escala</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="321"/>
+        <location filename="../IMainWindow.ui" line="334"/>
         <source>Setup Map Font</source>
         <translation>Configurar Fuente del Mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="336"/>
+        <location filename="../IMainWindow.ui" line="349"/>
         <source>Show Grid</source>
         <translation>Mostrar Malla</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="339"/>
+        <location filename="../IMainWindow.ui" line="352"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="351"/>
+        <location filename="../IMainWindow.ui" line="364"/>
         <source>Setup Grid</source>
         <translation>Configurar Malla</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="354"/>
+        <location filename="../IMainWindow.ui" line="367"/>
         <source>Ctrl+Alt+G</source>
         <translation>Ctrl+Alt+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="382"/>
         <source>Flip Mouse Wheel</source>
         <translation>Invertir la Rueda del Ratón</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="381"/>
-        <location filename="../IMainWindow.ui" line="384"/>
+        <location filename="../IMainWindow.ui" line="394"/>
+        <location filename="../IMainWindow.ui" line="397"/>
         <source>Setup Map Paths</source>
         <translation>Configurar Rutas de Mapas</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="399"/>
+        <location filename="../IMainWindow.ui" line="412"/>
         <source>POI Text</source>
         <translation>Texto del POI</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="414"/>
+        <location filename="../IMainWindow.ui" line="427"/>
         <source>Night / Day</source>
         <translation>Noche / Día</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="429"/>
+        <location filename="../IMainWindow.ui" line="442"/>
         <source>Map Tool Tip</source>
-        <translation>Mostrar Tooltips en los Mapas</translation>
+        <translation>Mostrar descripción emergente en los Mapas</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="432"/>
+        <location filename="../IMainWindow.ui" line="445"/>
         <source>Ctrl+I</source>
         <translation type="unfinished">Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="444"/>
+        <location filename="../IMainWindow.ui" line="457"/>
         <source>Setup DEM Paths</source>
         <translation>Configurar Rutas a los DEM</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="456"/>
+        <location filename="../IMainWindow.ui" line="469"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="468"/>
+        <location filename="../IMainWindow.ui" line="481"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="484"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="483"/>
-        <location filename="../IMainWindow.ui" line="486"/>
+        <location filename="../IMainWindow.ui" line="496"/>
+        <location filename="../IMainWindow.ui" line="499"/>
         <source>Setup Map View</source>
         <translation>Configurar Vista de Mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="630"/>
+        <location filename="../IMainWindow.ui" line="643"/>
         <source>VRT Builder</source>
         <translation>Asistente VRT</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="633"/>
+        <location filename="../IMainWindow.ui" line="646"/>
         <source>GUI front end to gdalbuildvrt</source>
-        <translation type="unfinished"></translation>
+        <translation>GUI front end para gdalbuildvrt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="645"/>
+        <location filename="../IMainWindow.ui" line="658"/>
         <source>Store Map View</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar vista de mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="648"/>
+        <location filename="../IMainWindow.ui" line="661"/>
         <source>Write current active map and DEM list including the properties to a file</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar en un archivo el mapa activo actual y la lista de DEM&apos;s incluyendo sus propiedades</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="660"/>
+        <location filename="../IMainWindow.ui" line="673"/>
         <source>Load Map View</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargar vista de mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="663"/>
+        <location filename="../IMainWindow.ui" line="676"/>
         <source>Restore view with active map and DEM list including the properties from a file</source>
-        <translation type="unfinished"></translation>
+        <translation>Restaurar vista de mapa activo y lista de DEM&apos;s incluyendo sus propiedades desde un archivo</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="678"/>
+        <location filename="../IMainWindow.ui" line="691"/>
         <source>Ext. Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Perfil en ventana externa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="681"/>
+        <location filename="../IMainWindow.ui" line="694"/>
         <source>Ctrl+E</source>
         <translation type="unfinished">Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="693"/>
+        <location filename="../IMainWindow.ui" line="706"/>
         <source>Close</source>
-        <translation type="unfinished">Cerrar</translation>
+        <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="696"/>
+        <location filename="../IMainWindow.ui" line="709"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="708"/>
+        <location filename="../IMainWindow.ui" line="721"/>
         <source>Clone Map View</source>
-        <translation type="unfinished"></translation>
+        <translation>Duplicar vista de mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="711"/>
+        <location filename="../IMainWindow.ui" line="724"/>
         <source>Ctrl+Shift+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="723"/>
+        <location filename="../IMainWindow.ui" line="736"/>
         <source>Create Routino Database</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear base de datos de Routino</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="735"/>
+        <location filename="../IMainWindow.ui" line="748"/>
         <source>Save(Print) Map Screenshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar/Imprimir captura de pantalla de mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="738"/>
+        <location filename="../IMainWindow.ui" line="751"/>
         <source>Print a selected area of the map</source>
-        <translation type="unfinished"></translation>
+        <translation>Imprimir area seleccionada del mapa</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="741"/>
+        <location filename="../IMainWindow.ui" line="754"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="753"/>
+        <location filename="../IMainWindow.ui" line="766"/>
         <source>Setup Coord. Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar formato de coordenadas</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="756"/>
+        <location filename="../IMainWindow.ui" line="769"/>
         <source>Change the format coordinates are displayed</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar el formato de coordenadas que se muestran</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="768"/>
+        <location filename="../IMainWindow.ui" line="781"/>
         <source>Setup Map Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuración del Mapa de Fondo</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="780"/>
+        <location filename="../IMainWindow.ui" line="793"/>
         <source>Setup Waypoint Icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar iconos de Waypoint</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="783"/>
+        <location filename="../IMainWindow.ui" line="796"/>
         <source>Setup path to custom icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar ruta de iconos personalizados</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="792"/>
+        <location filename="../IMainWindow.ui" line="805"/>
         <source>Close Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Cerrar pestaña</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="795"/>
+        <location filename="../IMainWindow.ui" line="808"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="804"/>
+        <location filename="../IMainWindow.ui" line="817"/>
         <source>Quickstart Help</source>
+        <translation>Guia de inicio rápido</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="826"/>
+        <source>Setup Toolbar</source>
+        <translation>Configurar barra de herramientas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="838"/>
+        <source>Toggle Docks</source>
+        <translation>Panel de herramientas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="841"/>
+        <source>Toggle visibility of dockable windows</source>
+        <translation>Ver panel de herramientas</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="844"/>
+        <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="498"/>
+        <location filename="../IMainWindow.ui" line="511"/>
         <source>Load GIS Data</source>
         <translation>Cargar Datos GIS</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="501"/>
+        <location filename="../IMainWindow.ui" line="514"/>
         <source>Load projects from file</source>
         <translation>Cargar proyectos desde archivo</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="504"/>
+        <location filename="../IMainWindow.ui" line="517"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="516"/>
+        <location filename="../IMainWindow.ui" line="529"/>
         <source>Save All GIS Data</source>
-        <translation>Guardar Todos los Datos GIS</translation>
+        <translation>Guardar todos los Datos GIS</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="519"/>
+        <location filename="../IMainWindow.ui" line="532"/>
         <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="522"/>
+        <location filename="../IMainWindow.ui" line="535"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="534"/>
+        <location filename="../IMainWindow.ui" line="547"/>
         <source>Setup Time Zone</source>
         <translation>Configurar Zona Horaria</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="546"/>
+        <location filename="../IMainWindow.ui" line="559"/>
         <source>Add empty project</source>
         <translation>Añadir proyecto vacío</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="561"/>
+        <location filename="../IMainWindow.ui" line="574"/>
         <source>Search Google</source>
         <translation>Buscar en Google</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="573"/>
+        <location filename="../IMainWindow.ui" line="586"/>
         <source>Close all projects</source>
         <translation>Cerrar todos los proyectos</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="576"/>
+        <location filename="../IMainWindow.ui" line="589"/>
         <source>F8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="588"/>
+        <location filename="../IMainWindow.ui" line="601"/>
         <source>Setup Units</source>
         <translation>Configurar Unidades</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="600"/>
+        <location filename="../IMainWindow.ui" line="613"/>
         <source>Setup Workspace</source>
         <translation>Configurar Espacio de trabajo</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="603"/>
+        <location filename="../IMainWindow.ui" line="616"/>
         <source>Setup save on exit.</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar configuración al salir</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="615"/>
+        <location filename="../IMainWindow.ui" line="628"/>
         <source>Import Database from QLandkarte</source>
         <translation>Importar base de datos de Qlandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="618"/>
+        <location filename="../IMainWindow.ui" line="631"/>
         <source>Import QLandkarte GT database</source>
-        <translation type="unfinished"></translation>
+        <translation>Importar base de datos de QLandKarteGT</translation>
     </message>
 </context>
 <context>
@@ -6849,7 +7007,7 @@
     <message>
         <location filename="../map/IMapList.ui" line="103"/>
         <source>To add maps use &lt;b&gt;File-&gt;Setup Map Paths&lt;/b&gt;.  Or click &lt;a href=&apos;setup&apos;&gt;&lt;b&gt;here&lt;/b&gt;&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Para añadir mapas haga&lt;b&gt;Archivo-&gt;Configurar rutas de mapas&lt;/b&gt;.  O haga clic &lt;a href=&apos;setup&apos;&gt;&lt;b&gt;aqui&lt;/b&gt;&lt;/a&gt;</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="116"/>
@@ -6860,7 +7018,8 @@
         <location filename="../map/IMapList.ui" line="129"/>
         <source>Help! I want maps!
 I don&apos;t want to read the documentation!</source>
-        <translation type="unfinished"></translation>
+        <translation>Quiero mapas
+No quiero leer la documentación!</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="149"/>
@@ -6870,27 +7029,27 @@
     <message>
         <location filename="../map/IMapList.ui" line="158"/>
         <source>Move Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Subir</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="161"/>
         <source>Hide map behind previous map</source>
-        <translation type="unfinished"></translation>
+        <translation>Ocultar mapa detrás del anterior</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="170"/>
         <source>Move down</source>
-        <translation type="unfinished"></translation>
+        <translation>Bajar</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="173"/>
         <source>Show map on top of next map</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar mapa encima del siguiente</translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="182"/>
         <source>Reload Maps</source>
-        <translation type="unfinished"></translation>
+        <translation>Recargar mapas</translation>
     </message>
 </context>
 <context>
@@ -6903,7 +7062,7 @@
     <message>
         <location filename="../map/IMapPathSetup.ui" line="20"/>
         <source>Root path of tile cache for online maps:</source>
-        <translation type="unfinished"></translation>
+        <translation>Carpeta para la caché de mapas online</translation>
     </message>
     <message>
         <location filename="../map/IMapPathSetup.ui" line="36"/>
@@ -6916,7 +7075,8 @@
         <location filename="../map/IMapPathSetup.ui" line="185"/>
         <source>Help! I want maps!
 I don&apos;t want to read the documentation!</source>
-        <translation type="unfinished"></translation>
+        <translation>Quiero mapas
+No quiero ver la documentación</translation>
     </message>
     <message>
         <location filename="../map/IMapPathSetup.ui" line="29"/>
@@ -6945,6 +7105,8 @@
     <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>
@@ -6976,7 +7138,7 @@
     <message>
         <location filename="../map/IMapPropSetup.ui" line="170"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalle</translation>
     </message>
     <message>
         <location filename="../map/IMapPropSetup.ui" line="264"/>
@@ -6986,6 +7148,21 @@
     <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="367"/>
+        <source>Forget external type file and use internal types.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="381"/>
+        <source>Load an external type file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7038,67 +7215,67 @@
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="249"/>
         <source>&lt;b&gt;New Line&lt;/b&gt;&lt;br/&gt;Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Nueva linea&lt;/b&gt;&lt;br/&gt;Mueva el ratón y pulse el botón izquierdo del ratón para crear puntos. Para terminar pulse botón derecho del ratón.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="289"/>
         <source>&lt;b&gt;Delete Point&lt;/b&gt;&lt;br/&gt;Move the mouse close to a point and press the left button to delete it.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Borrar punto&lt;/b&gt;&lt;br/&gt;Mueva el ratón hasta un punto y pulse el botón izquierdo para eliminarlo.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="297"/>
         <source>&lt;b&gt;Select Range of Points&lt;/b&gt;&lt;br/&gt;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.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Seleccionar Rango de Puntos&lt;/b&gt;&lt;br/&gt;Haga clic izquierdo en el primer punto para iniciar la selección. Haga clic izquierdo en el segundo punto para completar la selección y elija entre las opciones. Utilice el botón derecho del ratón para cancelar.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="305"/>
         <source>&lt;b&gt;Move Point&lt;/b&gt;&lt;br/&gt;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.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Mover punto&lt;/b&gt;&lt;br/&gt;Mueva el ratón hasta un punto y presione el botón izquierdo para que se adhiera al cursor. Mueve el ratón para mover el punto. Suelte el punto con un clic izquierdo.Botón derecho para terminar.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="313"/>
         <source>&lt;b&gt;Add Point&lt;/b&gt;&lt;br/&gt;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.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Añadir punto&lt;/b&gt;&lt;br/&gt;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 con un clic izquierdo. Utilice el botón derecho del ratón para cancelar.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="321"/>
         <source>&lt;b&gt;No Routing&lt;/b&gt;&lt;br/&gt;All points will be connected with a straight line.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Sin enrutamiento&lt;/b&gt;&lt;br/&gt;Todos los puntos se conectarán con una línea recta.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="327"/>
         <source>&lt;b&gt;Auto Routing&lt;/b&gt;&lt;br/&gt;The current router setup is used to derive a route between points. &lt;b&gt;Note:&lt;/b&gt; The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can&apos;t.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Enrutamiento automático&lt;/b&gt;&lt;br/&gt;La configuración actual del enrutador se utiliza para calcular una ruta entre los puntos. &lt;b&gt;Nota:&lt;/b&gt; El enrutador seleccionado debe ser capaz de trabajar al vuelo,por lo general, solo son capaces de hacerlo los instalados localmente.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
         <source>&lt;b&gt;Vector Routing&lt;/b&gt;&lt;br/&gt;Connect points with a line from a loaded vector map if possible.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Enrutamiento vectorial&lt;/b&gt;&lt;br/&gt;Conecte puntos con una línea de un mapa vectorial.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="504"/>
         <source>&lt;b&gt;%1 Metrics&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Datos %1 &lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="507"/>
         <source>Distance:</source>
-        <translation type="unfinished"></translation>
+        <translation>Distancia:</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="509"/>
         <source>Ascent:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ascenso:</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.cpp" line="511"/>
         <source>Descent:</source>
-        <translation type="unfinished"></translation>
+        <translation>Descenso:</translation>
     </message>
     <message>
         <location filename="../mouse/line/IMouseEditLine.h" line="135"/>
         <source>&lt;br/&gt;&lt;b&gt;Move the map&lt;/b&gt;&lt;br/&gt;If you keep the left mouse button pressed and move the mouse, you will move the map.&lt;br/&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br/&gt;&lt;b&gt;Mover el mapa&lt;/b&gt;&lt;br/&gt;Si mantiene pulsado el botón izquierdo del ratón y mueve, moverá el mapa.&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
 </context>
 <context>
@@ -7120,33 +7297,34 @@
     <message>
         <location filename="../plot/IPlot.cpp" line="94"/>
         <source>Reset Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation>Restablecer zoom</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="95"/>
         <source>Stop Range</source>
-        <translation type="unfinished"></translation>
+        <translation>Rango de parada</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="96"/>
         <source>Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar...</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="98"/>
         <source>Add Waypoint</source>
-        <translation type="unfinished">Añadir Waypoint</translation>
+        <translation>Añadir Waypoint</translation>
     </message>
     <message>
         <location filename="../plot/IPlot.cpp" line="99"/>
         <source>Cut...</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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"/>
@@ -7156,7 +7334,7 @@
     <message>
         <location filename="../plot/IPlot.cpp" line="1298"/>
         <source>Select output file</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione archivo de salida</translation>
     </message>
 </context>
 <context>
@@ -7188,34 +7366,34 @@
     <message>
         <location filename="../print/IPrintDialog.ui" line="20"/>
         <source>Print map...</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Al imprimir mapas en línea asegúrese de que el mapa se ha cargado en la memoria caché en la medida en que desea imprimir</translation>
     </message>
     <message>
         <location filename="../print/IPrintDialog.ui" line="60"/>
         <source>Save</source>
-        <translation type="unfinished">Guardar</translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
     <message>
         <location filename="../print/IPrintDialog.ui" line="118"/>
         <source>Print</source>
-        <translation type="unfinished"></translation>
+        <translation>Imprimir</translation>
     </message>
 </context>
 <context>
@@ -7223,13 +7401,13 @@
     <message>
         <location filename="../helpers/IProgressDialog.ui" line="14"/>
         <source>Please wait...</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
 </context>
 <context>
@@ -7310,7 +7488,7 @@
     <message>
         <location filename="../gis/wpt/IProjWpt.ui" line="54"/>
         <source>Clone waypoint and move by:</source>
-        <translation>Clonar el waypoint y moverlo:</translation>
+        <translation>Duplicar el waypoint y moverlo:</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IProjWpt.ui" line="66"/>
@@ -7333,29 +7511,29 @@
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="28"/>
         <source>Profile</source>
-        <translation type="unfinished">Perfil</translation>
+        <translation>Perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="35"/>
         <source>Alternative</source>
-        <translation type="unfinished"></translation>
+        <translation>Alternativa</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="64"/>
         <source>display selected routing profile</source>
-        <translation type="unfinished"></translation>
+        <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 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>Enrutamiento al vuelo</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
@@ -7365,7 +7543,7 @@
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
         <source>not running</source>
-        <translation type="unfinished"></translation>
+        <translation>Parado</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
@@ -7375,17 +7553,17 @@
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
         <source>show BRouter console</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar consola de BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterBRouter.ui" line="172"/>
         <source>Setup</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>¡Precaución! BRouter está escuchando en todos los puertos para las conexiones.</translation>
     </message>
 </context>
 <context>
@@ -7393,12 +7571,12 @@
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="14"/>
         <source>BRouter Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Perfil de BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterInfo.ui" line="20"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
 </context>
 <context>
@@ -7406,12 +7584,12 @@
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="23"/>
         <source>BRouter Setup</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Elija que BRouter usar</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
@@ -7421,22 +7599,22 @@
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
         <source>local Installation</source>
-        <translation type="unfinished"></translation>
+        <translation>Instalación local</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="68"/>
         <source>Expert Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo experto</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
         <source>local BRouter Installation directory:</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Seleccionar carpeta de instalación</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="106"/>
@@ -7446,7 +7624,7 @@
         <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"/>
@@ -7456,12 +7634,12 @@
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="128"/>
         <source>create or update installation</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear o actualizar instalacion</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="152"/>
         <source>Java Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Ejecutable Java</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="175"/>
@@ -7471,52 +7649,52 @@
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="184"/>
         <source>search for installed java</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Descargar e instalar BRouter</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="255"/>
         <source>about:blank</source>
-        <translation type="unfinished">about:blank</translation>
+        <translation>about:blank</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="263"/>
         <source>File to install</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo para instalar</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="272"/>
         <source>Download and Install</source>
-        <translation type="unfinished"></translation>
+        <translation>Descargar e instalar</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="321"/>
         <source>available Profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Perfiles disponibles </translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="339"/>
         <source>install profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Instalar perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="353"/>
         <source>remove profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="371"/>
         <source>installed Profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Perfiles instalados</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="415"/>
         <source>content of profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Contenido del perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
@@ -7541,42 +7719,42 @@
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Puerto</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="581"/>
         <source>Profile directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Carpeta de perfiles</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="591"/>
         <source>Segments directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Carpeta de segmentos</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="601"/>
         <source>Custom Profiles dir</source>
-        <translation type="unfinished"></translation>
+        <translation>Carpeta de perfiles personalizados</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="611"/>
         <source>Max Runtime</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Número de hilos</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="631"/>
         <source>Java Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opciones de Java</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="551"/>
         <source>Profiles Url</source>
-        <translation type="unfinished"></translation>
+        <translation>URL de perfiles</translation>
     </message>
 </context>
 <context>
@@ -7589,52 +7767,52 @@
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="22"/>
         <source>Highways</source>
-        <translation type="unfinished"></translation>
+        <translation>Autopistas</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="29"/>
         <source>Seasonal</source>
-        <translation type="unfinished"></translation>
+        <translation>Estacional</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="36"/>
         <source>Language</source>
-        <translation type="unfinished"></translation>
+        <translation>Lenguaje</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="43"/>
         <source>Country Border</source>
-        <translation type="unfinished"></translation>
+        <translation>Fronteras</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="53"/>
         <source>Profile</source>
-        <translation type="unfinished">Perfil</translation>
+        <translation>Perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="60"/>
         <source>Avoid:</source>
-        <translation type="unfinished"></translation>
+        <translation>Evitar:</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="67"/>
         <source>Ferry</source>
-        <translation type="unfinished">Ferry</translation>
+        <translation>Ferry</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="74"/>
         <source>Toll Road</source>
-        <translation type="unfinished"></translation>
+        <translation>Carreteras de peaje</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="84"/>
         <source>Unpaved</source>
-        <translation type="unfinished"></translation>
+        <translation>Sin pavimentar</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterMapQuest.ui" line="106"/>
         <source>&lt;p&gt;Directions Courtesy of &lt;a href=&quot;http://www.mapquest.com/&quot; target=&quot;_blank&quot;&gt;MapQuest&lt;/a&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Direcciones cortesía de &lt;a href=&quot;http://www.mapquest.com/&quot; target=&quot;_blank&quot;&gt;MapQuest&lt;/a&gt; &lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -7647,37 +7825,37 @@
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="31"/>
         <source>Profile</source>
-        <translation type="unfinished">Perfil</translation>
+        <translation>Perfil</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="38"/>
         <source>Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="45"/>
         <source>Database</source>
-        <translation type="unfinished"></translation>
+        <translation>Base de datos</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="52"/>
         <source>Add paths with Routino database.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/IRouterRoutino.ui" line="66"/>
         <source>Language</source>
-        <translation type="unfinished"></translation>
+        <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 &lt;b&gt;Tool-&gt;Create Routino Database&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <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  &lt;b&gt;herramienta-&gt;Crear base de datos de Routino&lt;/b&gt;.</translation>
     </message>
 </context>
 <context>
@@ -7685,18 +7863,18 @@
     <message>
         <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
         <source>Setup Routino database...</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="99"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>-</translation>
     </message>
 </context>
 <context>
@@ -7718,32 +7896,32 @@
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="22"/>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="63"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="39"/>
         <source>Select source files:</source>
-        <translation type="unfinished">Seleccionar ficheros de origen:</translation>
+        <translation>Seleccionar ficheros de origen:</translation>
     </message>
     <message>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="54"/>
         <source>Start</source>
-        <translation type="unfinished">Comenzar</translation>
+        <translation>Comenzar</translation>
     </message>
     <message>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="86"/>
         <source>Target Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>Carpeta de destino</translation>
     </message>
     <message>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="93"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>-</translation>
     </message>
     <message>
         <location filename="../tool/IRoutinoDatabaseBuilder.ui" line="100"/>
         <source>File Prefix</source>
-        <translation type="unfinished"></translation>
+        <translation>Prefijo del archivo</translation>
     </message>
 </context>
 <context>
@@ -7761,17 +7939,17 @@
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="47"/>
         <source>Save as new</source>
-        <translation>Guardar como nuevo</translation>
+        <translation>Guardar como nuevo...</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="54"/>
         <source>Abort</source>
-        <translation>Abortar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="89"/>
         <source>Move points. (Ctrl+M)</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover puntos. (Ctrl+M)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="99"/>
@@ -7781,7 +7959,7 @@
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="115"/>
         <source>Add new points. (Ctrl++)</source>
-        <translation type="unfinished"></translation>
+        <translation>Añadir puntos. (Ctrl++)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="125"/>
@@ -7791,7 +7969,7 @@
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="138"/>
         <source>Select a range of points. (Ctrl+R)</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar rango de puntos. (Ctrl+R)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="148"/>
@@ -7801,7 +7979,7 @@
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
         <source>Delete a point. (Ctrl+D)</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar un punto. (Ctrl+D)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
@@ -7811,7 +7989,7 @@
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="215"/>
         <source>No auto-routing or line snapping (Ctrl+O)</source>
-        <translation type="unfinished"></translation>
+        <translation>Sin enrutamiento automático ni ajuste de línea (Ctrl + O)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="225"/>
@@ -7821,7 +7999,7 @@
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="238"/>
         <source>Use auto-routing to between points. (Ctrl+A)</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilice el enrutamiento automático entre los puntos. (Ctrl+A)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="248"/>
@@ -7831,7 +8009,7 @@
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="261"/>
         <source>Snap line along lines of a vector map. (Ctrl+V)</source>
-        <translation type="unfinished"></translation>
+        <translation>Seguir linea de mapa vectorial. (Ctrl+V)</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="92"/>
@@ -7841,7 +8019,7 @@
         <location filename="../mouse/line/IScrOptEditLine.ui" line="300"/>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="317"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
@@ -7861,17 +8039,17 @@
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="271"/>
         <source>Ctrl+V</source>
-        <translation type="unfinished">Ctrl+V</translation>
+        <translation>Ctrl+V</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="297"/>
         <source>Undo last change</source>
-        <translation type="unfinished"></translation>
+        <translation>Deshacer</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptEditLine.ui" line="314"/>
         <source>Redo last change</source>
-        <translation type="unfinished"></translation>
+        <translation>Rehacer</translation>
     </message>
 </context>
 <context>
@@ -7884,7 +8062,7 @@
     <message>
         <location filename="../gis/ovl/IScrOptOvlArea.ui" line="40"/>
         <source>View details and edit.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver detalles y editar.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IScrOptOvlArea.ui" line="43"/>
@@ -7902,17 +8080,17 @@
     <message>
         <location filename="../gis/ovl/IScrOptOvlArea.ui" line="68"/>
         <source>Delete area from project.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Editar el contorno del área.</translation>
     </message>
     <message>
         <location filename="../gis/ovl/IScrOptOvlArea.ui" line="121"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
 </context>
 <context>
@@ -7925,18 +8103,18 @@
     <message>
         <location filename="../mouse/IScrOptPrint.ui" line="35"/>
         <source>Save selected area as image.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptPrint.ui" line="55"/>
         <source>Print selected area.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Imprimir área seleccionada</translation>
     </message>
 </context>
 <context>
@@ -7949,18 +8127,18 @@
     <message>
         <location filename="../mouse/line/IScrOptRangeLine.ui" line="32"/>
         <source>Delete all points between the first and last one.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../mouse/line/IScrOptRangeLine.ui" line="46"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Calculate a route between the first and last selected point.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Calcular una ruta entre el primero y el último punto seleccionado.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
 <context>
@@ -7991,7 +8169,7 @@
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
         <source>Select an activity for the selected range.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar una actividad para el rango seleccionado</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
@@ -8001,7 +8179,7 @@
     <message>
         <location filename="../mouse/IScrOptRangeTrk.ui" line="117"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
 </context>
 <context>
@@ -8031,37 +8209,37 @@
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="40"/>
         <source>View details and edit.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver detalles y editar</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="68"/>
         <source>Delete route from project.</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar ruta del proyecto</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="103"/>
         <source>Calculate route.</source>
-        <translation type="unfinished"></translation>
+        <translation>Calcular ruta</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="117"/>
         <source>Reset route calculation.</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiniciar cálculo de ruta</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="131"/>
         <source>Move route points.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover puntos de ruta</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="145"/>
         <source>Convert route to track</source>
-        <translation type="unfinished"></translation>
+        <translation>Convertir ruta en track</translation>
     </message>
     <message>
         <location filename="../gis/rte/IScrOptRte.ui" line="174"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
 </context>
 <context>
@@ -8074,7 +8252,7 @@
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="59"/>
         <source>Copy all selected items to a project.</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar todos los elementos seleccionados a un proyecto.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="62"/>
@@ -8089,57 +8267,57 @@
         <location filename="../mouse/IScrOptSelect.ui" line="339"/>
         <location filename="../mouse/IScrOptSelect.ui" line="366"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="79"/>
         <source>Create a route from selected waypoints.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Combinar todos los tracks seleccionadas en uno nuevo</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="139"/>
         <source>Delete all selected items.</source>
-        <translation type="unfinished"></translation>
+        <translation>Borrar los elementos seleccionados</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="193"/>
         <source>Select all items that intersect the selected area.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione los elementos que interseccionan el área seleccionada.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="222"/>
-        <source>Select all itmes that are completely inside the selected area.</source>
-        <translation type="unfinished"></translation>
+        <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="282"/>
         <source>Add tracks to selection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Añadir tracks a la selección</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="309"/>
         <source>Add waypoints to selection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Añadir waypoints a la selección.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="336"/>
         <source>Add routes to selection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Añadir rutas a selección.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="363"/>
         <source>Add areas to selection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Añadir áreas a la selección.</translation>
     </message>
 </context>
 <context>
@@ -8162,7 +8340,7 @@
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="40"/>
         <source>View details and edit properties of track.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver detalles y editar propiedades del track. </translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="43"/>
@@ -8186,7 +8364,7 @@
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="68"/>
         <source>Delete track from project.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar track del proyecto</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="106"/>
@@ -8211,17 +8389,22 @@
 * use the track parts to plan a new tour
 * cut a long track into stages
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Divida el track por el punto seleccionado. Puede usar esto para:
+
+*Eliminar puntos erróneos del principio o del final.
+*Utilizar partes del track para planificar otro nuevo.
+*Dividir un track muy largo en varias etapas.
+</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
         <source>Copy track together with all attached waypoints into another project.</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar track junto con todos los waypoints conectados en otro proyecto.</translation>
     </message>
     <message>
         <location filename="../gis/trk/IScrOptTrk.ui" line="210"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
 </context>
 <context>
@@ -8234,7 +8417,7 @@
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="49"/>
         <source>View details and edit.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver detalles y editar.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="52"/>
@@ -8254,27 +8437,27 @@
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="77"/>
         <source>Delete waypoint from project.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar waypoint del proyecto.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="98"/>
         <source>Show content as static bubble.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar contenido en burbuja de texto</translation>
     </message>
     <message>
         <location filename="../gis/wpt/IScrOptWpt.ui" line="115"/>
         <source>Move waypoint to a new location.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
 </context>
 <context>
@@ -8282,28 +8465,29 @@
     <message>
         <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
         <source>Search...</source>
-        <translation type="unfinished"></translation>
+        <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 &apos;word&apos; a search with an exact match is done. If you enter &apos;word*&apos;, &apos;word&apos; has to be at the beginning of a string.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escriba la palabra que desea buscar y pulse botón de busqueda. 
+Si introduce la &apos;palabra&apos; entre apóstrofes se busca una coincidencia exacta . Si introduce &apos;palabra*&apos;, la &apos;palabra&apos; se busca al principio de una cadena.</translation>
     </message>
     <message>
         <location filename="../gis/db/ISearchDatabase.ui" line="51"/>
         <source>Name</source>
-        <translation type="unfinished">Nombre</translation>
+        <translation>Nombre</translation>
     </message>
     <message>
         <location filename="../gis/db/ISearchDatabase.ui" line="79"/>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Buscar</translation>
     </message>
     <message>
         <location filename="../gis/db/ISearchDatabase.ui" line="86"/>
         <source>Close</source>
-        <translation type="unfinished">Cerrar</translation>
+        <translation>Cerrar</translation>
     </message>
 </context>
 <context>
@@ -8311,7 +8495,7 @@
     <message>
         <location filename="../gis/ISelDevices.ui" line="14"/>
         <source>Select devices...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar dispositivos</translation>
     </message>
 </context>
 <context>
@@ -8340,12 +8524,12 @@
         <location filename="../helpers/ISelectCopyAction.ui" line="79"/>
         <location filename="../helpers/ISelectCopyAction.ui" line="89"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <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>
+        <translation>No copiar el elemento</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectCopyAction.ui" line="115"/>
@@ -8378,12 +8562,58 @@
     <message>
         <location filename="../gis/db/ISelectDBFolder.ui" line="14"/>
         <source>Select Parent Folder...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Seleccione la carpeta principal.</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectDBFolder.ui" line="26"/>
         <source>Name</source>
-        <translation type="unfinished">Nombre</translation>
+        <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>
@@ -8401,12 +8631,12 @@
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="33"/>
         <source>New project&apos;s name</source>
-        <translation type="unfinished"></translation>
+        <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 creó como:</translation>
+        <translation>El nuevo proyecto se creará como:</translation>
     </message>
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="93"/>
@@ -8421,7 +8651,7 @@
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="110"/>
         <source>Database</source>
-        <translation type="unfinished"></translation>
+        <translation>Base de datos</translation>
     </message>
 </context>
 <context>
@@ -8429,27 +8659,27 @@
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="20"/>
         <source>Copy item...</source>
-        <translation type="unfinished">Copiar elemento...</translation>
+        <translation>Copiar elemento...</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="35"/>
         <source>Replace existing item</source>
-        <translation type="unfinished">Sustituir el elemento existente</translation>
+        <translation>Sustituir el elemento existente</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="87"/>
         <source>Add a clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Añadir duplicado</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="100"/>
         <source>The clone&apos;s name will be appended with &apos;_Clone&apos;</source>
-        <translation type="unfinished">Se añadirá el sufijo &apos;_Clone&apos; al nombre del duplicado</translation>
+        <translation>Se añadirá el sufijo &apos;_Clone&apos; al nombre del duplicado</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="171"/>
         <source>Replace with:</source>
-        <translation type="unfinished">Sustituir por:</translation>
+        <translation>Sustituir por:</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="42"/>
@@ -8457,22 +8687,22 @@
         <location filename="../gis/db/ISelectSaveAction.ui" line="130"/>
         <location filename="../gis/db/ISelectSaveAction.ui" line="140"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Denominación</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="61"/>
         <source>Do not replace item</source>
-        <translation type="unfinished"></translation>
+        <translation>No sustituir elemento</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="123"/>
         <source>Use item:</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilizar elemento:</translation>
     </message>
     <message>
         <location filename="../gis/db/ISelectSaveAction.ui" line="116"/>
         <source>And for all other items, too.</source>
-        <translation type="unfinished">Hacer igual para todos los elementos.</translation>
+        <translation>Hacer igual para todos los elementos.</translation>
     </message>
 </context>
 <context>
@@ -8495,12 +8725,12 @@
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="252"/>
         <source>&lt;p align=&quot;justify&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Caution!&lt;/span&gt; It is recommended to leave the password blank, as QMapShack will store it as plain text. If you don&apos;t give a password you will be asked for it on each startup.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p align=&quot;justify&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Precación&lt;/span&gt; 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á que en cada inicio.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="239"/>
         <source>Do not use a password.</source>
-        <translation type="unfinished"></translation>
+        <translation>No usar contraseña.</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="153"/>
@@ -8515,12 +8745,12 @@
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="181"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="193"/>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Puerto</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="206"/>
@@ -8530,22 +8760,22 @@
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="215"/>
         <source>User</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuario</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="225"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Contraseña</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="275"/>
         <source>&lt;b&gt;Port:&lt;/b&gt; Leave the port field empty to use the default port.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Puerto:&lt;/b&gt; Dejar vacio para usar el puerto predeterminado.</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="61"/>
         <source>File:</source>
-        <translation type="unfinished"></translation>
+        <translation>Archivo:</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupDatabase.ui" line="75"/>
@@ -8565,16 +8795,39 @@
     </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="45"/>
+        <source>name only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="52"/>
+        <source>complete text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ISetupFolder</name>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="14"/>
         <source>Database Folder...</source>
-        <translation type="unfinished"></translation>
+        <translation>Carpeta de base de datos</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="20"/>
         <source>Folder name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de la carpeta</translation>
     </message>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="30"/>
@@ -8597,22 +8850,22 @@
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="14"/>
         <source>New Waypoint...</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo waypoint.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="22"/>
         <source>Symbol</source>
-        <translation type="unfinished"></translation>
+        <translation>Símbolo.</translation>
     </message>
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="29"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="39"/>
         <source>Position</source>
-        <translation type="unfinished">Posición</translation>
+        <translation>Posición</translation>
     </message>
     <message>
         <location filename="../gis/wpt/ISetupNewWpt.ui" line="49"/>
@@ -8625,7 +8878,7 @@
 &quot;[N|S] ddd mm.sss [W|E] ddd mm.sss&quot;
 or
 &quot;[N|S] ddd.ddd [W|E] ddd.ddd&quot;</source>
-        <translation type="unfinished">Formato de posición incorrecto. Debe ser: 
+        <translation>Formato de posición incorrecto. Debe ser: 
 &quot;[N|S] ggg mm.sss [W|E] ggg mm.sss&quot;
 o
 &quot;[N|S] ggg.ggg [W|E] ggg.ggg&quot;</translation>
@@ -8651,7 +8904,7 @@
     <message>
         <location filename="../gis/db/ISetupWorkspace.ui" line="56"/>
         <source>listen for database changes from other instances of QMapShack. On port</source>
-        <translation type="unfinished"></translation>
+        <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"/>
@@ -8764,42 +9017,42 @@
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="270"/>
         <source>Bullet List (Disc)</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de viñetas (Disco)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="275"/>
         <source>Bullet List (Circle)</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de viñetas (círculos)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="280"/>
         <source>Bullet List (Square)</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de viñetas(cuadrados)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="285"/>
         <source>Ordered List (Decimal)</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista ordenada(decimal)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="290"/>
         <source>Ordered List (Alpha lower)</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista ordenada (alfabético descendente)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="295"/>
         <source>Ordered List (Alpha upper)</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista ordenada (alfabético ascendente)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="300"/>
         <source>Ordered List (Roman lower)</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista ordenada (números romanos descendente)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="305"/>
         <source>Ordered List (Roman upper)</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista ordenada (números romanos ascendente)</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="378"/>
@@ -8879,18 +9132,18 @@
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="495"/>
         <source>Plain</source>
-        <translation type="unfinished"></translation>
+        <translation>Plano</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="498"/>
         <source>Reset the text&apos;s format before pasting</source>
-        <translation type="unfinished"></translation>
+        <translation>Restablecer el formato del texto antes del pegado</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="503"/>
         <location filename="../widgets/ITextEditWidget.ui" line="506"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar todo</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="509"/>
@@ -8901,19 +9154,19 @@
         <location filename="../widgets/ITextEditWidget.ui" line="514"/>
         <location filename="../widgets/ITextEditWidget.ui" line="517"/>
         <source>Delete</source>
-        <translation type="unfinished">Borrar</translation>
+        <translation>Borrar</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="522"/>
         <location filename="../widgets/ITextEditWidget.ui" line="525"/>
         <source>Reset Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Restablecer fuente</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="530"/>
         <location filename="../widgets/ITextEditWidget.ui" line="533"/>
         <source>Reset Layout</source>
-        <translation type="unfinished"></translation>
+        <translation>Restablecer diseño</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="545"/>
@@ -8923,7 +9176,7 @@
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="548"/>
         <source>Paste without resetting the text&apos;s format</source>
-        <translation type="unfinished"></translation>
+        <translation>Pegar sin restablecer el formato del texto</translation>
     </message>
 </context>
 <context>
@@ -8946,17 +9199,17 @@
     <message>
         <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="101"/>
         <source>Cut</source>
-        <translation type="unfinished">Cortar</translation>
+        <translation>Cortar</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="114"/>
         <source>Copy</source>
-        <translation type="unfinished">Copiar</translation>
+        <translation>Copiar</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="127"/>
         <source>Paste</source>
-        <translation type="unfinished">Pegar</translation>
+        <translation>Pegar</translation>
     </message>
 </context>
 <context>
@@ -8964,7 +9217,7 @@
     <message>
         <location filename="../units/ITimeZoneSetup.ui" line="14"/>
         <source>Setup Time Zone ...</source>
-        <translation>Configurar la Zona Horaria...</translation>
+        <translation>Configurar la Zona Horaria.</translation>
     </message>
     <message>
         <location filename="../units/ITimeZoneSetup.ui" line="22"/>
@@ -8984,17 +9237,25 @@
     <message>
         <location filename="../units/ITimeZoneSetup.ui" line="75"/>
         <source>Print date/time in </source>
-        <translation type="unfinished"></translation>
+        <translation>Imprimir fecha y hora en</translation>
     </message>
     <message>
         <location filename="../units/ITimeZoneSetup.ui" line="82"/>
         <source>long format, or</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato largo, o</translation>
     </message>
     <message>
         <location filename="../units/ITimeZoneSetup.ui" line="92"/>
         <source>short format</source>
-        <translation type="unfinished"></translation>
+        <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>
 </context>
 <context>
@@ -9002,37 +9263,39 @@
     <message>
         <location filename="../tool/IToolShell.cpp" line="46"/>
         <source>Execution of external program `%1` failed: </source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>El proceso externo falló.
+</translation>
     </message>
     <message>
         <location filename="../tool/IToolShell.cpp" line="59"/>
         <source>An unknown error occurred.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>A ocurrido un error desconocido</translation>
     </message>
     <message>
         <location filename="../tool/IToolShell.cpp" line="172"/>
         <source>!!! failed !!!
 </source>
-        <translation type="unfinished">!!! fallo !!!</translation>
+        <translation>!!!falló!!!</translation>
     </message>
 </context>
 <context>
@@ -9041,7 +9304,7 @@
         <location filename="../units/IUnit.cpp" line="728"/>
         <location filename="../units/IUnit.cpp" line="734"/>
         <source>Error</source>
-        <translation type="unfinished">Error</translation>
+        <translation>Error</translation>
     </message>
     <message>
         <location filename="../units/IUnit.cpp" line="728"/>
@@ -9051,7 +9314,7 @@
     <message>
         <location filename="../units/IUnit.cpp" line="734"/>
         <source>Position values out of bounds. </source>
-        <translation type="unfinished">Valores de posición fuera del límite.</translation>
+        <translation>Valores de posición fuera del límite.</translation>
     </message>
 </context>
 <context>
@@ -9069,7 +9332,7 @@
     <message>
         <location filename="../units/IUnitsSetup.ui" line="47"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; For some GUI elements changing the units will not take effect until you restart QMapShack.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Nota:&lt;/b&gt; 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"/>
@@ -9087,27 +9350,27 @@
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="14"/>
         <source>Icons...</source>
-        <translation>Iconos...</translation>
+        <translation>Iconos.</translation>
     </message>
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="68"/>
         <source>External Icons:</source>
-        <translation type="unfinished"></translation>
+        <translation>Iconos:</translation>
     </message>
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="75"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>-</translation>
     </message>
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="82"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../helpers/IWptIconDialog.ui" line="95"/>
         <source>All custom icons have to be *.bmp or *.png format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Los iconos personalizados deben de ser BMP o PNG</translation>
     </message>
 </context>
 </TS>
diff -Nru qmapshack-1.8.1/src/locale/qmapshack_fr.ts qmapshack-1.9.0/src/locale/qmapshack_fr.ts
--- qmapshack-1.8.1/src/locale/qmapshack_fr.ts	2017-04-15 15:35:44.000000000 +0000
+++ qmapshack-1.9.0/src/locale/qmapshack_fr.ts	2017-07-23 13:41:03.000000000 +0000
@@ -122,7 +122,7 @@
         <translation>Vue %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="695"/>
+        <location filename="../canvas/CCanvas.cpp" line="705"/>
         <source>Setup Map Background</source>
         <translation>Réglage de l&apos;arrière-plan de la carte</translation>
     </message>
@@ -559,32 +559,32 @@
 <context>
     <name>CDetailsTrk</name>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Reduce visible track points</source>
         <translation>Réduire les points visibles de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change elevation of track points</source>
         <translation>Modifier l&apos;altitude des points de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Change timestamp of track points</source>
         <translation>Modifier l&apos;horodatage des points de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
         <source>Color</source>
         <translation>Couleur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
         <source>Activity</source>
         <translation>Activité</translation>
     </message>
@@ -615,7 +615,7 @@
         <translation>Image%1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="1063"/>
+        <location filename="../gis/gpx/serialization.cpp" line="1068"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
@@ -728,7 +728,7 @@
 <context>
     <name>CFitDecoder</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="119"/>
+        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="132"/>
         <source>FIT decoding error: unexpected end of file %1.</source>
         <translation>erreur de décodage FIT : fin de fichier inatendue %1.</translation>
     </message>
@@ -744,12 +744,12 @@
 <context>
     <name>CFitFieldDataState</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="115"/>
+        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
         <source>Missing field definition for development field.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="207"/>
+        <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>
     </message>
@@ -788,7 +788,7 @@
         <translation>Erreur de décodage FIT : architecture %1 non supportée</translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="107"/>
+        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="110"/>
         <source>FIT decoding error: invalid offset %1 for state &apos;record content&apos;</source>
         <translation>Erreur de décodage FIT : décalage invalide %1 pour l&apos;état &apos;contenu d&apos;enregistrement&apos;</translation>
     </message>
@@ -972,7 +972,7 @@
 <context>
     <name>CGisItemTrk</name>
     <message>
-        <location filename="../gis/fit/serialization.cpp" line="247"/>
+        <location filename="../gis/fit/serialization.cpp" line="246"/>
         <source>FIT file %1 contains no GPS data.</source>
         <translation>Le fichier FIT %1 ne contient pas de donnée GPS.</translation>
     </message>
@@ -1228,37 +1228,37 @@
         <translation>Afficher les points.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
         <source>Changed name</source>
         <translation>Nom modifié</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
         <source>Changed comment</source>
         <translation>Commentaire modifié</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
         <source>Changed description</source>
         <translation>Description modifiée</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
         <source>Changed links</source>
         <translation>Liens modifiés</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
         <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="2047"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2041"/>
         <source>Changed activity to &apos;%1&apos; for complete track.</source>
         <translation>Acirvité modifiée pour &apos;%1&apos; pour la trace complète.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
         <source>Changed activity to &apos;%1&apos; for range(%2..%3).</source>
         <translation>Activité modifiée pur &apos;%1&apos; for la plage (%2..%3).</translation>
     </message>
@@ -1289,51 +1289,56 @@
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="221"/>
+        <source>Added terrain slope from DEM file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="243"/>
         <source>Replaced elevation data with data from DEM files.</source>
         <translation>Les altitudes ont été remplacées  par les données des fichiers MNT</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="239"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="261"/>
         <source>Replaced elevation data with interpolated values. (M=%1, RMSErr=%2)</source>
         <translation>Les altitudes ont été remplacées  par des valeurs interpolées. (M=%1, RMSErr=%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="255"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="277"/>
         <source>Offset elevation data by %1%2.</source>
         <translation>Décaler les altitudes de %1%2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="268"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="290"/>
         <source>Changed start of track to %1.</source>
         <translation>Début de la trace modifié à %1.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="281"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="303"/>
         <source>Remove timestamps.</source>
         <translation>Horodatage supprimé.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="298"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="320"/>
         <source>Set artificial timestamps with delta of %1 sec.</source>
         <translation>Horodatage artificiel ajouté avec un décalage de %1 sec.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="324"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="346"/>
         <source>Changed speed to %1%2.</source>
         <translation>Vitesse modifiée à %1%2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="343"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="365"/>
         <source>%1 (Segment %2)</source>
         <translation>%1 (Segment %2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="361"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="383"/>
         <source>Removed extension %1 from all Track Points</source>
         <translation>Extension %1 supprimée de tous les points</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="372"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="394"/>
         <source>Converted subpoints from routing to track points</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1346,17 +1351,17 @@
 <context>
     <name>CGisItemWpt</name>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="604"/>
+        <location filename="../gis/gpx/serialization.cpp" line="609"/>
         <source>Archived</source>
         <translation>Archivé</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="608"/>
+        <location filename="../gis/gpx/serialization.cpp" line="613"/>
         <source>Available</source>
         <translation>Disponible</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="612"/>
+        <location filename="../gis/gpx/serialization.cpp" line="617"/>
         <source>Not Available</source>
         <translation>Non disponible</translation>
     </message>
@@ -1777,8 +1782,8 @@
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="652"/>
-        <location filename="../gis/CGisListWks.cpp" line="1650"/>
-        <location filename="../gis/CGisListWks.cpp" line="1688"/>
+        <location filename="../gis/CGisListWks.cpp" line="1646"/>
+        <location filename="../gis/CGisListWks.cpp" line="1684"/>
         <source>&lt;b&gt;Update devices&lt;/b&gt;&lt;p&gt;Update %1&lt;br/&gt;Please wait...&lt;/p&gt;</source>
         <translation>&lt;b&gt;Mise à jour des appareils&lt;/b&gt;&lt;p&gt;Mise à jour de %1&lt;br/&gt;Patientez...&lt;/p&gt;</translation>
     </message>
@@ -1786,27 +1791,32 @@
 <context>
     <name>CGisWidget</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>Load project...</source>
         <translation>Charger le projet...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>The project &quot;%1&quot; is already in the workspace.</source>
         <translation>Le projet &quot;%1&quot; est déjà présent dans l&apos;espace de travail.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="515"/>
+        <location filename="../gis/CGisWidget.cpp" line="554"/>
         <source>Copy items...</source>
         <translation>Copier les éléments...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="573"/>
+        <source>Change waypoint symbols.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Cut Track...</source>
         <translation>Couper la trace...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Do you want to delete the original track?</source>
         <translation>Voulez-vous supprimer la trace originale?</translation>
     </message>
@@ -1838,27 +1848,27 @@
         <translation>Ce n&apos;est pas un fichier GPX: %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="268"/>
         <source>File exists ...</source>
         <translation>Le fichier existe...</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="269"/>
         <source>The file exists and it has not been created by QMapShack. If you press &apos;yes&apos; 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. &lt;b&gt;Do you really want to overwrite the file?&lt;/b&gt;</source>
         <translation>Le fichier existe et n&apos;a pas été créé par QMapShack. Si vous cliquez sur &apos;oui&apos; tous les données de ce fichier seront perdues. Même si ce fichier contient des données GPX et sera ouvert par QMapShack certains éléments de ce fichier ne pourront pas être lus ou enregistrés. Ces élements seront perdus. Il est conseillé d&apos;utiliser un autre fichier.&lt;b&gt;Voulez-vous vraiment écraser ce fichier ?&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="386"/>
         <source>Failed to create file &apos;%1&apos;</source>
         <translation>Impossible de créer le fichier: &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="392"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="396"/>
         <source>Failed to write file &apos;%1&apos;</source>
         <translation>Impossible d&apos;écrire le fichier: &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="404"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="408"/>
         <source>Saving GIS data failed...</source>
         <translation>Impossible de sauvegarder les données SIG</translation>
     </message>
@@ -1889,27 +1899,27 @@
 <context>
     <name>CHistoryListWidget</name>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="62"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="65"/>
         <source> by %1</source>
         <translation>par %1</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="108"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
         <source>Cut history before</source>
         <translation>Tronquer l&apos;historique antérieur</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="113"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="38"/>
         <source>Cut history after</source>
         <translation>Tronquer l&apos;historique postérieur</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="161"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="155"/>
         <source>History removal</source>
         <translation>Supression de l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="162"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
         <source>The removal is permanent and cannot be undone. &lt;b&gt;Do you really want to delete history before this step?&lt;/b&gt;</source>
         <translation>La suppression est permanente et ne peut être annulée. &lt;b&gt;Voulez-vous vraiment supprimer l&apos;historique antérieur à cette étape ?&lt;/b&gt;</translation>
     </message>
@@ -1935,66 +1945,94 @@
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
         <source>Air Temperature</source>
         <translation>Température de l&apos;air</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
         <source>Water Temperature</source>
         <translation>Température de l&apos;eau</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
         <source>Heart Rate</source>
         <translation>Fréquence cardiaque</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
+        <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>Cadence</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
         <source>Speed</source>
         <translation>Vitesse</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
         <source>Acceleration</source>
         <translation>Accélération</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
         <source>Course</source>
         <translation>Cap</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <source>Temperature</source>
+        <translation>Température</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <source>Distance</source>
+        <translation>Distance</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <source>Sea Level Pressure</source>
+        <translation>Pression au niveau de la mer</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Speed (vertical)</source>
+        <translation>Vitesse (verticale)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
         <source>Slope*</source>
         <translation>Pente*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
         <source>Speed*</source>
         <translation>Vitesse*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
         <source>Elevation</source>
         <translation>Altitude</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
         <source>Progress</source>
-        <translation>Progrès</translation>
+        <translation>Progression</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <source>Terrain slope</source>
+        <translation>Pente du terrain</translation>
     </message>
 </context>
 <context>
@@ -2008,48 +2046,53 @@
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="588"/>
+        <location filename="../CMainWindow.cpp" line="769"/>
         <source>Use &lt;b&gt;Menu-&gt;View-&gt;Add Map View&lt;/b&gt; to open a new view. Or &lt;b&gt;Menu-&gt;File-&gt;Load Map View&lt;/b&gt; to restore a saved one. Or click &lt;a href=&apos;newview&apos;&gt;here&lt;/a&gt;.</source>
         <translation>Utilisez &lt;b&gt;Menu-&gt;Vue-&gt;Add Map View&lt;/b&gt; pour ouvrir une nouvelle vue. Ou &lt;b&gt;Menu-&gt;Fichier-&gt;Charger une vue cartographique&lt;/b&gt; pour charger une vue sauvegardée. Ou cliquez &lt;a href=&apos;newview&apos;&gt;ici&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="716"/>
+        <location filename="../CMainWindow.cpp" line="897"/>
         <source>Ele: %1%2</source>
         <translation>Altitude: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="732"/>
+        <location filename="../CMainWindow.cpp" line="909"/>
+        <source>Slope: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="925"/>
         <source>[Grid: %1]</source>
         <translation>[Grille: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="867"/>
+        <location filename="../CMainWindow.cpp" line="1066"/>
         <source>Load GIS Data...</source>
         <translation>Charger des données SIG...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
         <source>Select output file</source>
         <translation>Sélectionner le fichier de sortie</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>QMapShack View (*.view)</source>
         <translation>Vue QMapShack (*.view)</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>Select file to load</source>
         <translation>Sélectionner le fichier à charger</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1106"/>
+        <location filename="../CMainWindow.cpp" line="1369"/>
         <source>Fatal...</source>
         <translation>Fatal...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1107"/>
+        <location filename="../CMainWindow.cpp" line="1370"/>
         <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>
@@ -2072,620 +2115,631 @@
         <translation>Échec...</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="157"/>
+        <location filename="../map/CMapIMG.cpp" line="175"/>
         <source>Unspecified</source>
         <translation>Non défini</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="158"/>
+        <location filename="../map/CMapIMG.cpp" line="176"/>
         <source>French</source>
         <translation>Français</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="159"/>
+        <location filename="../map/CMapIMG.cpp" line="177"/>
         <source>German</source>
         <translation>Deutsch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="160"/>
+        <location filename="../map/CMapIMG.cpp" line="178"/>
         <source>Dutch</source>
         <translation>Néerlandais</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="161"/>
+        <location filename="../map/CMapIMG.cpp" line="179"/>
         <source>English</source>
         <translation>Anglais</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="162"/>
+        <location filename="../map/CMapIMG.cpp" line="180"/>
         <source>Italian</source>
         <translation>Italien</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="163"/>
+        <location filename="../map/CMapIMG.cpp" line="181"/>
         <source>Finnish</source>
         <translation>Finlandais</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="164"/>
+        <location filename="../map/CMapIMG.cpp" line="182"/>
         <source>Swedish</source>
         <translation>Suédois</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="165"/>
+        <location filename="../map/CMapIMG.cpp" line="183"/>
         <source>Spanish</source>
         <translation>Espagnol</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="166"/>
+        <location filename="../map/CMapIMG.cpp" line="184"/>
         <source>Basque</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="167"/>
+        <location filename="../map/CMapIMG.cpp" line="185"/>
         <source>Catalan</source>
         <translation>Catalan</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="168"/>
+        <location filename="../map/CMapIMG.cpp" line="186"/>
         <source>Galician</source>
         <translation>Galicien</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="169"/>
+        <location filename="../map/CMapIMG.cpp" line="187"/>
         <source>Welsh</source>
         <translation>Gallois</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="170"/>
+        <location filename="../map/CMapIMG.cpp" line="188"/>
         <source>Gaelic</source>
         <translation>Gaëlic</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="171"/>
+        <location filename="../map/CMapIMG.cpp" line="189"/>
         <source>Danish</source>
         <translation>Danois</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="172"/>
+        <location filename="../map/CMapIMG.cpp" line="190"/>
         <source>Norwegian</source>
         <translation>Norvégien</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="173"/>
+        <location filename="../map/CMapIMG.cpp" line="191"/>
         <source>Portuguese</source>
         <translation>Portugais</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="174"/>
+        <location filename="../map/CMapIMG.cpp" line="192"/>
         <source>Slovak</source>
         <translation>Slovaque</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="175"/>
+        <location filename="../map/CMapIMG.cpp" line="193"/>
         <source>Czech</source>
         <translation>Tchèque</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="176"/>
+        <location filename="../map/CMapIMG.cpp" line="194"/>
         <source>Croatian</source>
         <translation>Croate</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="177"/>
+        <location filename="../map/CMapIMG.cpp" line="195"/>
         <source>Hungarian</source>
         <translation>Hongrois</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="178"/>
+        <location filename="../map/CMapIMG.cpp" line="196"/>
         <source>Polish</source>
         <translation>Polonais</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="179"/>
+        <location filename="../map/CMapIMG.cpp" line="197"/>
         <source>Turkish</source>
         <translation>Turque</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="180"/>
+        <location filename="../map/CMapIMG.cpp" line="198"/>
         <source>Greek</source>
         <translation>Grèc</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="181"/>
+        <location filename="../map/CMapIMG.cpp" line="199"/>
         <source>Slovenian</source>
         <translation>Slovène</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="182"/>
+        <location filename="../map/CMapIMG.cpp" line="200"/>
         <source>Russian</source>
         <translation>Russe</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="183"/>
+        <location filename="../map/CMapIMG.cpp" line="201"/>
         <source>Estonian</source>
         <translation>Estonien</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="184"/>
+        <location filename="../map/CMapIMG.cpp" line="202"/>
         <source>Latvian</source>
         <translation>Letton</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="185"/>
+        <location filename="../map/CMapIMG.cpp" line="203"/>
         <source>Romanian</source>
         <translation>Roumain</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="186"/>
+        <location filename="../map/CMapIMG.cpp" line="204"/>
         <source>Albanian</source>
         <translation>Albanais</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="187"/>
+        <location filename="../map/CMapIMG.cpp" line="205"/>
         <source>Bosnian</source>
         <translation>Bosnien</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="188"/>
+        <location filename="../map/CMapIMG.cpp" line="206"/>
         <source>Lithuanian</source>
         <translation>Lituanien</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="189"/>
+        <location filename="../map/CMapIMG.cpp" line="207"/>
         <source>Serbian</source>
         <translation>Serbe</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="190"/>
+        <location filename="../map/CMapIMG.cpp" line="208"/>
         <source>Macedonian</source>
         <translation>Macédonien</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="191"/>
+        <location filename="../map/CMapIMG.cpp" line="209"/>
         <source>Bulgarian</source>
         <translation>Bulgare</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="248"/>
+        <location filename="../map/CMapIMG.cpp" line="266"/>
         <source>Major highway</source>
         <translation>Route majeure</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="249"/>
+        <location filename="../map/CMapIMG.cpp" line="267"/>
         <source>Principal highway</source>
         <translation>Route principale</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="250"/>
+        <location filename="../map/CMapIMG.cpp" line="268"/>
         <source>Other highway</source>
         <translation>Autre route</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="251"/>
+        <location filename="../map/CMapIMG.cpp" line="269"/>
         <source>Arterial road</source>
         <translation>Artère urbaine</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="252"/>
+        <location filename="../map/CMapIMG.cpp" line="270"/>
         <source>Collector road</source>
         <translation>Rue principale</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="253"/>
+        <location filename="../map/CMapIMG.cpp" line="271"/>
         <source>Residential street</source>
         <translation>Rue résidentielle</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="254"/>
+        <location filename="../map/CMapIMG.cpp" line="272"/>
         <source>Alley/Private road</source>
         <translation>Ruelle/Route privée</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="255"/>
+        <location filename="../map/CMapIMG.cpp" line="273"/>
         <source>Highway ramp, low speed</source>
         <translation>Bretelle d&apos;accès, basse vitesse</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="256"/>
+        <location filename="../map/CMapIMG.cpp" line="274"/>
         <source>Highway ramp, high speed</source>
         <translation>Bretelle d&apos;accès, grande vitesse</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="257"/>
+        <location filename="../map/CMapIMG.cpp" line="275"/>
         <source>Unpaved road</source>
         <translation>Route non bitumé</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="258"/>
+        <location filename="../map/CMapIMG.cpp" line="276"/>
         <source>Major highway connector</source>
         <translation>Bretelle majeure</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="259"/>
+        <location filename="../map/CMapIMG.cpp" line="277"/>
         <source>Roundabout</source>
         <translation>Rond-point</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="260"/>
+        <location filename="../map/CMapIMG.cpp" line="278"/>
         <source>Railroad</source>
         <translation>Voie ferrée</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="261"/>
+        <location filename="../map/CMapIMG.cpp" line="279"/>
         <source>Shoreline</source>
         <translation>Ligne côtière</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="262"/>
+        <location filename="../map/CMapIMG.cpp" line="280"/>
         <source>Trail</source>
         <translation>Sentier</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="263"/>
+        <location filename="../map/CMapIMG.cpp" line="281"/>
         <source>Stream</source>
         <translation>Ruisseau</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="264"/>
+        <location filename="../map/CMapIMG.cpp" line="282"/>
         <source>Time zone</source>
         <translation>Fuseau horaire</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="265"/>
-        <location filename="../map/CMapIMG.cpp" line="266"/>
+        <location filename="../map/CMapIMG.cpp" line="283"/>
+        <location filename="../map/CMapIMG.cpp" line="284"/>
         <source>Ferry</source>
         <translation>Bac</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="267"/>
+        <location filename="../map/CMapIMG.cpp" line="285"/>
         <source>State/province border</source>
         <translation>Frontière de province</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="268"/>
+        <location filename="../map/CMapIMG.cpp" line="286"/>
         <source>County/parish border</source>
         <translation>Frontière de canton</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="269"/>
+        <location filename="../map/CMapIMG.cpp" line="287"/>
         <source>International border</source>
         <translation>Frontière internationale</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="270"/>
+        <location filename="../map/CMapIMG.cpp" line="288"/>
         <source>River</source>
         <translation>Rivière</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="271"/>
+        <location filename="../map/CMapIMG.cpp" line="289"/>
         <source>Minor land contour</source>
         <translation>Courbe de niveau mineure</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="272"/>
+        <location filename="../map/CMapIMG.cpp" line="290"/>
         <source>Intermediate land contour</source>
         <translation>Courbe de niveau intermédiaire</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="273"/>
+        <location filename="../map/CMapIMG.cpp" line="291"/>
         <source>Major land contour</source>
         <translation>Courbe de niveau majeure</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="274"/>
+        <location filename="../map/CMapIMG.cpp" line="292"/>
         <source>Minor depth contour</source>
         <translation>Courbe isobathe mineure</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="275"/>
+        <location filename="../map/CMapIMG.cpp" line="293"/>
         <source>Intermediate depth contour</source>
         <translation>Courbe isobathe intermédiaire</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="276"/>
+        <location filename="../map/CMapIMG.cpp" line="294"/>
         <source>Major depth contour</source>
         <translation>Courbe isobathe majeure</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="277"/>
+        <location filename="../map/CMapIMG.cpp" line="295"/>
         <source>Intermittent stream</source>
         <translation>Ruisseau intermittent</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="278"/>
-        <location filename="../map/CMapIMG.cpp" line="360"/>
+        <location filename="../map/CMapIMG.cpp" line="296"/>
+        <location filename="../map/CMapIMG.cpp" line="378"/>
         <source>Airport runway</source>
         <translation>Tarmac</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="279"/>
+        <location filename="../map/CMapIMG.cpp" line="297"/>
         <source>Pipeline</source>
         <translation>Oléoduc</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="280"/>
+        <location filename="../map/CMapIMG.cpp" line="298"/>
         <source>Powerline</source>
         <translation>Ligne à haute tension</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="281"/>
+        <location filename="../map/CMapIMG.cpp" line="299"/>
         <source>Marine boundary</source>
         <translation>Frontière maritime</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="282"/>
+        <location filename="../map/CMapIMG.cpp" line="300"/>
         <source>Hazard boundary</source>
         <translation>Limite de zone à risque</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="347"/>
+        <location filename="../map/CMapIMG.cpp" line="365"/>
         <source>Large urban area (&amp;gt;200K)</source>
         <translation>Grande agglomération urbaine (&amp;gt;200K)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="348"/>
+        <location filename="../map/CMapIMG.cpp" line="366"/>
         <source>Small urban area (&amp;lt;200K)</source>
         <translation>Petite agglomération urbaine (&amp;lt;200K)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="349"/>
+        <location filename="../map/CMapIMG.cpp" line="367"/>
         <source>Rural housing area</source>
         <translation>Zone résidentielle rurale</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="350"/>
+        <location filename="../map/CMapIMG.cpp" line="368"/>
         <source>Military base</source>
         <translation>Base militaire</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="351"/>
+        <location filename="../map/CMapIMG.cpp" line="369"/>
         <source>Parking lot</source>
         <translation>Parking</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="352"/>
+        <location filename="../map/CMapIMG.cpp" line="370"/>
         <source>Parking garage</source>
         <translation>Parking couvert</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="353"/>
+        <location filename="../map/CMapIMG.cpp" line="371"/>
         <source>Airport</source>
         <translation>Aéroport</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="354"/>
+        <location filename="../map/CMapIMG.cpp" line="372"/>
         <source>Shopping center</source>
         <translation>Centre commercial</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="355"/>
+        <location filename="../map/CMapIMG.cpp" line="373"/>
         <source>Marina</source>
         <translation>Marina</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="356"/>
+        <location filename="../map/CMapIMG.cpp" line="374"/>
         <source>University/College</source>
         <translation>Université</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="357"/>
+        <location filename="../map/CMapIMG.cpp" line="375"/>
         <source>Hospital</source>
         <translation>Hôpital</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="358"/>
+        <location filename="../map/CMapIMG.cpp" line="376"/>
         <source>Industrial complex</source>
         <translation>Complexe industriel</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="359"/>
+        <location filename="../map/CMapIMG.cpp" line="377"/>
         <source>Reservation</source>
         <translation>Reserve naturelle</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="361"/>
+        <location filename="../map/CMapIMG.cpp" line="379"/>
         <source>Man-made area</source>
         <translation>Zone industrielle</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="362"/>
+        <location filename="../map/CMapIMG.cpp" line="380"/>
         <source>Sports complex</source>
         <translation>Complexe sportif</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="363"/>
+        <location filename="../map/CMapIMG.cpp" line="381"/>
         <source>Golf course</source>
         <translation>Golf</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="364"/>
+        <location filename="../map/CMapIMG.cpp" line="382"/>
         <source>Cemetery</source>
         <translation>Cimetière</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="365"/>
-        <location filename="../map/CMapIMG.cpp" line="366"/>
-        <location filename="../map/CMapIMG.cpp" line="367"/>
+        <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>Parc national</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="368"/>
+        <location filename="../map/CMapIMG.cpp" line="386"/>
         <source>City park</source>
         <translation>Parc urbain</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="369"/>
-        <location filename="../map/CMapIMG.cpp" line="370"/>
-        <location filename="../map/CMapIMG.cpp" line="371"/>
+        <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>Parc régional</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="372"/>
+        <location filename="../map/CMapIMG.cpp" line="390"/>
         <source>Forest</source>
         <translation>Forêt</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="373"/>
+        <location filename="../map/CMapIMG.cpp" line="391"/>
         <source>Ocean</source>
         <translation>Océan</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="374"/>
-        <location filename="../map/CMapIMG.cpp" line="376"/>
-        <location filename="../map/CMapIMG.cpp" line="386"/>
+        <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></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="375"/>
+        <location filename="../map/CMapIMG.cpp" line="393"/>
         <source>Sea</source>
         <translation>Mer</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="377"/>
-        <location filename="../map/CMapIMG.cpp" line="378"/>
-        <location filename="../map/CMapIMG.cpp" line="385"/>
+        <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>Grand lac</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="379"/>
-        <location filename="../map/CMapIMG.cpp" line="380"/>
+        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="398"/>
         <source>Medium lake</source>
         <translation>Lac moyen</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="381"/>
-        <location filename="../map/CMapIMG.cpp" line="382"/>
+        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="400"/>
         <source>Small lake</source>
         <translation>Petit lac</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="383"/>
-        <location filename="../map/CMapIMG.cpp" line="384"/>
+        <location filename="../map/CMapIMG.cpp" line="401"/>
+        <location filename="../map/CMapIMG.cpp" line="402"/>
         <source>Major lake</source>
         <translation>Lac majeur</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="387"/>
+        <location filename="../map/CMapIMG.cpp" line="405"/>
         <source>Major River</source>
         <translation>Rivière majeure</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="388"/>
+        <location filename="../map/CMapIMG.cpp" line="406"/>
         <source>Large River</source>
         <translation>Grande rivière</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="389"/>
+        <location filename="../map/CMapIMG.cpp" line="407"/>
         <source>Medium River</source>
         <translation>Rivière moyenne</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="390"/>
+        <location filename="../map/CMapIMG.cpp" line="408"/>
         <source>Small River</source>
         <translation>Petite rivière</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="393"/>
+        <location filename="../map/CMapIMG.cpp" line="411"/>
         <source>Intermittent water</source>
         <translation>Cours d&apos;eau intermittent</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="394"/>
+        <location filename="../map/CMapIMG.cpp" line="412"/>
         <source>Wetland/Swamp</source>
         <translation>Marais</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="395"/>
+        <location filename="../map/CMapIMG.cpp" line="413"/>
         <source>Glacier</source>
         <translation>Glacier</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="396"/>
+        <location filename="../map/CMapIMG.cpp" line="414"/>
         <source>Orchard/Plantation</source>
         <translation>Verger</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="415"/>
         <source>Scrub</source>
         <translation>Broussaille</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="398"/>
+        <location filename="../map/CMapIMG.cpp" line="416"/>
         <source>Tundra</source>
         <translation>Tundra</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="417"/>
         <source>Flat</source>
         <translation>Plaine</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="400"/>
+        <location filename="../map/CMapIMG.cpp" line="418"/>
         <source>???</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="436"/>
+        <location filename="../map/CMapIMG.cpp" line="432"/>
+        <source>Read external type file...</source>
+        <translation type="unfinished"></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>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="474"/>
         <source>Failed to read: </source>
         <translation>Erreur de lecture : </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="479"/>
+        <location filename="../map/CMapIMG.cpp" line="517"/>
         <source>Failed to open: </source>
         <translation>Échec d&apos;ouverture : </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="503"/>
-        <location filename="../map/CMapIMG.cpp" line="507"/>
+        <location filename="../map/CMapIMG.cpp" line="541"/>
+        <location filename="../map/CMapIMG.cpp" line="545"/>
         <source>Bad file format: </source>
         <translation>Format de fichier invalide : </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="596"/>
+        <location filename="../map/CMapIMG.cpp" line="634"/>
         <source>Failed to read file structure: </source>
         <translation>Erreur de lecture de la structure du fichier : </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="631"/>
+        <location filename="../map/CMapIMG.cpp" line="669"/>
         <source>Loading %1</source>
         <translation>Chargement de %1</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="637"/>
+        <location filename="../map/CMapIMG.cpp" line="675"/>
         <source>User abort: </source>
         <translation>Interruption par l&apos;utilisateur : </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="640"/>
+        <location filename="../map/CMapIMG.cpp" line="678"/>
         <source>File is NT format. QMapShack is unable to read map files with NT format: </source>
         <translation>Le fichier est au format NT. QMapShack ne peut pas lire des fichiers au format NT : </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="731"/>
+        <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>Le fichier contient des données verrouillées / cryptées. Garmin ne vous autorise pas à utiliser ce fichier avec un logiciel non fourni par Garmin.</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2342"/>
-        <location filename="../map/CMapIMG.cpp" line="2348"/>
-        <location filename="../map/CMapIMG.cpp" line="2352"/>
+        <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>Point d&apos;intérêt</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2438"/>
+        <location filename="../map/CMapIMG.cpp" line="2484"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2480"/>
-        <location filename="../map/CMapIMG.cpp" line="2488"/>
-        <location filename="../map/CMapIMG.cpp" line="2495"/>
+        <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>Surface</translation>
     </message>
@@ -2745,6 +2799,14 @@
     </message>
 </context>
 <context>
+    <name>CMapPropSetup</name>
+    <message>
+        <location filename="../map/CMapPropSetup.cpp" line="196"/>
+        <source>Select type file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CMapRMAP</name>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="48"/>
@@ -3178,7 +3240,7 @@
         <translation>Temps écoulé : %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="86"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="87"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation>Temps écoulé : %1 secondes</translation>
     </message>
@@ -3795,27 +3857,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="620"/>
         <source>error renaming file %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+        <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>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
         <source>being downloaded: %1 of %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
         <source>no local data, online available: %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="798"/>
         <source>local data outdated (%1, %2 - remote %3, %4)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3835,12 +3897,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="806"/>
         <source>local data up to date (%1, %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="818"/>
         <source>no routing-data available</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3848,13 +3910,13 @@
 <context>
     <name>CRouterBRouterToolShell</name>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
         <source>!!! done !!!
 </source>
         <translation type="unfinished">!!! fait !!!</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
         <source>!!! failed !!!
 </source>
         <translation type="unfinished">!!! échec !!!</translation>
@@ -4193,7 +4255,7 @@
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="415"/>
         <source>Calculate route with %1</source>
         <translation>Calculer l&apos;itinéraire avec %1</translation>
     </message>
@@ -4571,6 +4633,19 @@
     </message>
 </context>
 <context>
+    <name>CToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="43"/>
+        <source>Available Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="44"/>
+        <source>Selected Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CTwoNavProject</name>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
@@ -6161,6 +6236,29 @@
     </message>
 </context>
 <context>
+    <name>IFilterTerrainSlope</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulaire</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="51"/>
+        <source>&lt;b&gt;Calculate Terrain Slope&lt;/b&gt;</source>
+        <translation type="unfinished"></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>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="70"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+</context>
+<context>
     <name>IFitDecoderState</name>
     <message>
         <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="31"/>
@@ -6340,31 +6438,46 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="49"/>
+        <location filename="../gis/IGisWidget.ui" line="43"/>
         <source>Opacity</source>
         <translation>Opacité</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="56"/>
+        <location filename="../gis/IGisWidget.ui" line="50"/>
         <source>Change the opacity of all GIS Items on the map.</source>
         <translation>Modifier l&apos;opacité de tous les objets SIG sur la carte</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="108"/>
-        <location filename="../gis/IGisWidget.ui" line="138"/>
+        <location filename="../gis/IGisWidget.ui" line="66"/>
+        <source>Filter</source>
+        <translation type="unfinished">Filtre</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWidget.ui" line="116"/>
+        <location filename="../gis/IGisWidget.ui" line="146"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="143"/>
+        <location filename="../gis/IGisWidget.ui" line="151"/>
         <source>Age</source>
         <translation>Age</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="177"/>
+        <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"/>
+        <source>Clear Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <source>Setup Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IGridSetup</name>
@@ -6520,338 +6633,363 @@
         <translation>Fenêtre</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="110"/>
+        <location filename="../IMainWindow.ui" line="112"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="118"/>
+        <location filename="../IMainWindow.ui" line="120"/>
         <source>Project</source>
         <translation>Projet</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="129"/>
+        <location filename="../IMainWindow.ui" line="131"/>
         <source>Tool</source>
         <translation>Outils</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="154"/>
+        <location filename="../IMainWindow.ui" line="156"/>
         <source>Maps</source>
         <translation>Cartes</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="197"/>
+        <location filename="../IMainWindow.ui" line="199"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation>Modèle numérique de terrain (DEM)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="236"/>
+        <location filename="../IMainWindow.ui" line="238"/>
         <source>Data</source>
         <translation>Données</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="254"/>
+        <location filename="../IMainWindow.ui" line="256"/>
         <source>Route</source>
         <translation>Calcul d&apos;itinéraire</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="288"/>
-        <location filename="../IMainWindow.ui" line="291"/>
+        <location filename="../IMainWindow.ui" line="286"/>
+        <source>Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="301"/>
+        <location filename="../IMainWindow.ui" line="304"/>
         <source>Add Map View</source>
         <translation>Ajouter une vue cartographique</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="294"/>
+        <location filename="../IMainWindow.ui" line="307"/>
         <source>Ctrl+T</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="309"/>
+        <location filename="../IMainWindow.ui" line="322"/>
         <source>Show Scale</source>
         <translation>Afficher l&apos;échelle</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="321"/>
+        <location filename="../IMainWindow.ui" line="334"/>
         <source>Setup Map Font</source>
         <translation>Configurer la police de la carte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="336"/>
+        <location filename="../IMainWindow.ui" line="349"/>
         <source>Show Grid</source>
         <translation>Afficher la grille</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="339"/>
+        <location filename="../IMainWindow.ui" line="352"/>
         <source>Ctrl+G</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="351"/>
+        <location filename="../IMainWindow.ui" line="364"/>
         <source>Setup Grid</source>
         <translation>Configurer la grille</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="354"/>
+        <location filename="../IMainWindow.ui" line="367"/>
         <source>Ctrl+Alt+G</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="382"/>
         <source>Flip Mouse Wheel</source>
         <translation>Inverser le sens de la molette de souris</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="381"/>
-        <location filename="../IMainWindow.ui" line="384"/>
+        <location filename="../IMainWindow.ui" line="394"/>
+        <location filename="../IMainWindow.ui" line="397"/>
         <source>Setup Map Paths</source>
         <translation>Configurer les répertoires des cartes</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="399"/>
+        <location filename="../IMainWindow.ui" line="412"/>
         <source>POI Text</source>
         <translation>Libellés des points d&apos;interêt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="414"/>
+        <location filename="../IMainWindow.ui" line="427"/>
         <source>Night / Day</source>
         <translation>Jour / Nuit</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="429"/>
+        <location filename="../IMainWindow.ui" line="442"/>
         <source>Map Tool Tip</source>
         <translation>Infobulles sur la carte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="432"/>
+        <location filename="../IMainWindow.ui" line="445"/>
         <source>Ctrl+I</source>
         <translation>CTRL + I</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="444"/>
+        <location filename="../IMainWindow.ui" line="457"/>
         <source>Setup DEM Paths</source>
         <translation>Configurer les répertoires DEM</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="456"/>
+        <location filename="../IMainWindow.ui" line="469"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="468"/>
+        <location filename="../IMainWindow.ui" line="481"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="484"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="483"/>
-        <location filename="../IMainWindow.ui" line="486"/>
+        <location filename="../IMainWindow.ui" line="496"/>
+        <location filename="../IMainWindow.ui" line="499"/>
         <source>Setup Map View</source>
         <translation>Configurer la vue cartographique</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="498"/>
+        <location filename="../IMainWindow.ui" line="511"/>
         <source>Load GIS Data</source>
         <translation>Charger des données SIG...</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="501"/>
+        <location filename="../IMainWindow.ui" line="514"/>
         <source>Load projects from file</source>
         <translation>Charger un fichier projet</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="504"/>
+        <location filename="../IMainWindow.ui" line="517"/>
         <source>Ctrl+L</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="516"/>
+        <location filename="../IMainWindow.ui" line="529"/>
         <source>Save All GIS Data</source>
         <translation>Enregistrer toutes les données SIG</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="519"/>
+        <location filename="../IMainWindow.ui" line="532"/>
         <source>Save all projects in the workspace</source>
         <translation>Enregistrer tous les projets de l&apos;espace de travail</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="522"/>
+        <location filename="../IMainWindow.ui" line="535"/>
         <source>Ctrl+S</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="534"/>
+        <location filename="../IMainWindow.ui" line="547"/>
         <source>Setup Time Zone</source>
         <translation>Configurer le fuseau horaire</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="546"/>
+        <location filename="../IMainWindow.ui" line="559"/>
         <source>Add empty project</source>
         <translation>Ajouter un projet vide</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="561"/>
+        <location filename="../IMainWindow.ui" line="574"/>
         <source>Search Google</source>
         <translation>Recherche Google</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="573"/>
+        <location filename="../IMainWindow.ui" line="586"/>
         <source>Close all projects</source>
         <translation>Fermer tous les projets</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="576"/>
+        <location filename="../IMainWindow.ui" line="589"/>
         <source>F8</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="588"/>
+        <location filename="../IMainWindow.ui" line="601"/>
         <source>Setup Units</source>
         <translation>Configurer les unités</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="600"/>
+        <location filename="../IMainWindow.ui" line="613"/>
         <source>Setup Workspace</source>
         <translation>Configurer l&apos;espace de travail</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="603"/>
+        <location filename="../IMainWindow.ui" line="616"/>
         <source>Setup save on exit.</source>
         <translation>Sauvegarde de la configuration en quittant</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="615"/>
+        <location filename="../IMainWindow.ui" line="628"/>
         <source>Import Database from QLandkarte</source>
         <translation>Importer une base de données QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="618"/>
+        <location filename="../IMainWindow.ui" line="631"/>
         <source>Import QLandkarte GT database</source>
         <translation>Importer une base de données QLandkarte GT</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="630"/>
+        <location filename="../IMainWindow.ui" line="643"/>
         <source>VRT Builder</source>
         <translation>Générateur de VRT</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="633"/>
+        <location filename="../IMainWindow.ui" line="646"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation>Interface utilisateur pour gdalbuildvrt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="645"/>
+        <location filename="../IMainWindow.ui" line="658"/>
         <source>Store Map View</source>
         <translation>Enregistrer une vue cartographique</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="648"/>
+        <location filename="../IMainWindow.ui" line="661"/>
         <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="660"/>
+        <location filename="../IMainWindow.ui" line="673"/>
         <source>Load Map View</source>
         <translation>Charger une vue cartographique</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="663"/>
+        <location filename="../IMainWindow.ui" line="676"/>
         <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&apos;un fichier</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="678"/>
+        <location filename="../IMainWindow.ui" line="691"/>
         <source>Ext. Profile</source>
         <translation>Profile externe</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="681"/>
+        <location filename="../IMainWindow.ui" line="694"/>
         <source>Ctrl+E</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="693"/>
+        <location filename="../IMainWindow.ui" line="706"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="696"/>
+        <location filename="../IMainWindow.ui" line="709"/>
         <source>Ctrl+Q</source>
         <translation>CTRL + Q</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="708"/>
+        <location filename="../IMainWindow.ui" line="721"/>
         <source>Clone Map View</source>
         <translation>Dupliquer une vue cartographique</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="711"/>
+        <location filename="../IMainWindow.ui" line="724"/>
         <source>Ctrl+Shift+T</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="723"/>
+        <location filename="../IMainWindow.ui" line="736"/>
         <source>Create Routino Database</source>
         <translation>Créer une base de données Routino</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="735"/>
+        <location filename="../IMainWindow.ui" line="748"/>
         <source>Save(Print) Map Screenshot</source>
         <translation>Sauvegarder (Imprimer) une capture d&apos;écran de la carte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="738"/>
+        <location filename="../IMainWindow.ui" line="751"/>
         <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="741"/>
+        <location filename="../IMainWindow.ui" line="754"/>
         <source>Ctrl+P</source>
         <translation>CTRL + P</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="753"/>
+        <location filename="../IMainWindow.ui" line="766"/>
         <source>Setup Coord. Format</source>
         <translation>Choisir le format de coordonnées</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="756"/>
+        <location filename="../IMainWindow.ui" line="769"/>
         <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="768"/>
+        <location filename="../IMainWindow.ui" line="781"/>
         <source>Setup Map Background</source>
         <translation>Modifier l&apos;arrière-plan de la carte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="780"/>
+        <location filename="../IMainWindow.ui" line="793"/>
         <source>Setup Waypoint Icons</source>
         <translation>Modifer les icônes des waypoints</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="783"/>
+        <location filename="../IMainWindow.ui" line="796"/>
         <source>Setup path to custom icons</source>
         <translation>Modifier le chemin des icônes personnalisés</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="792"/>
+        <location filename="../IMainWindow.ui" line="805"/>
         <source>Close Tab</source>
         <translation>Fermer l&apos;onglet</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="795"/>
+        <location filename="../IMainWindow.ui" line="808"/>
         <source>Ctrl+W</source>
         <translation>CTRL + W</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="804"/>
+        <location filename="../IMainWindow.ui" line="817"/>
         <source>Quickstart Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="826"/>
+        <source>Setup Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="838"/>
+        <source>Toggle Docks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="841"/>
+        <source>Toggle visibility of dockable windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="844"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished">CTRL + D</translation>
+    </message>
 </context>
 <context>
     <name>IMapList</name>
@@ -6961,6 +7099,8 @@
     <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>
@@ -7005,6 +7145,21 @@
         <translation>Répertoire du cache</translation>
     </message>
     <message>
+        <location filename="../map/IMapPropSetup.ui" line="353"/>
+        <source>Type File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="367"/>
+        <source>Forget external type file and use internal types.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="381"/>
+        <source>Load an external type file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../map/IMapPropSetup.ui" line="227"/>
         <source>Cache Size (MB)</source>
         <translation>Taille du cache (MO)</translation>
@@ -8133,8 +8288,8 @@
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="222"/>
-        <source>Select all itmes that are completely inside the selected area.</source>
-        <translation>Sélectionner tous les objets qui sont totalement inclus  dans la zone sélectionnée</translation>
+        <source>Select all items that are completely inside the selected area.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="282"/>
@@ -8409,6 +8564,52 @@
     </message>
 </context>
 <context>
+    <name>ISelectDoubleListWidget</name>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulaire</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="22"/>
+        <source>Available</source>
+        <translation type="unfinished">Disponible</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="46"/>
+        <source>Add to selected items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="60"/>
+        <source>Remove from selected items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="78"/>
+        <source>Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="102"/>
+        <source>Move selected items up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="116"/>
+        <source>Move selected items down</source>
+        <translation type="unfinished"></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 type="unfinished">...</translation>
+    </message>
+</context>
+<context>
     <name>ISelectProjectDialog</name>
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="14"/>
@@ -8587,6 +8788,29 @@
     </message>
 </context>
 <context>
+    <name>ISetupFilter</name>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulaire</translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="38"/>
+        <source>Apply filter to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="45"/>
+        <source>name only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="52"/>
+        <source>complete text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ISetupFolder</name>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="14"/>
@@ -9017,6 +9241,14 @@
     </message>
 </context>
 <context>
+    <name>IToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/IToolBarSetupDialog.ui" line="14"/>
+        <source>Setup Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IToolShell</name>
     <message>
         <location filename="../tool/IToolShell.cpp" line="46"/>
diff -Nru qmapshack-1.8.1/src/locale/qmapshack_nl.ts qmapshack-1.9.0/src/locale/qmapshack_nl.ts
--- qmapshack-1.8.1/src/locale/qmapshack_nl.ts	2017-04-15 15:35:44.000000000 +0000
+++ qmapshack-1.9.0/src/locale/qmapshack_nl.ts	2017-07-23 13:41:03.000000000 +0000
@@ -122,7 +122,7 @@
         <translation>Venster %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="695"/>
+        <location filename="../canvas/CCanvas.cpp" line="705"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
@@ -559,32 +559,32 @@
 <context>
     <name>CDetailsTrk</name>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Reduce visible track points</source>
         <translation>Reduceer zichtbare trackpunten</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change elevation of track points</source>
         <translation>Verander hoogte van trackpunten</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Change timestamp of track points</source>
         <translation>Verander tijdstempels van trackpunten</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
         <source>Color</source>
         <translation>Kleur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
         <source>Activity</source>
         <translation>Activiteit</translation>
     </message>
@@ -615,7 +615,7 @@
         <translation>Afbeelding%1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="1063"/>
+        <location filename="../gis/gpx/serialization.cpp" line="1068"/>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
@@ -728,7 +728,7 @@
 <context>
     <name>CFitDecoder</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="119"/>
+        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="132"/>
         <source>FIT decoding error: unexpected end of file %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -744,12 +744,12 @@
 <context>
     <name>CFitFieldDataState</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="115"/>
+        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
         <source>Missing field definition for development field.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="207"/>
+        <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>
     </message>
@@ -788,7 +788,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="107"/>
+        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="110"/>
         <source>FIT decoding error: invalid offset %1 for state &apos;record content&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -972,7 +972,7 @@
 <context>
     <name>CGisItemTrk</name>
     <message>
-        <location filename="../gis/fit/serialization.cpp" line="247"/>
+        <location filename="../gis/fit/serialization.cpp" line="246"/>
         <source>FIT file %1 contains no GPS data.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1228,37 +1228,37 @@
         <translation>Toon punten.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
         <source>Changed name</source>
         <translation>Naam aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
         <source>Changed comment</source>
         <translation>Notitie aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
         <source>Changed description</source>
         <translation>Beschrijving aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
         <source>Changed links</source>
         <translation>Link aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2047"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2041"/>
         <source>Changed activity to &apos;%1&apos; for complete track.</source>
         <translation>Activiteit aangepast naar &apos;%1&apos; voor gehele track.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
         <source>Changed activity to &apos;%1&apos; for range(%2..%3).</source>
         <translation>Activiteit aangepast naar &apos;%1&apos; voor bereik(%2..%3).</translation>
     </message>
@@ -1289,51 +1289,56 @@
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="221"/>
+        <source>Added terrain slope from DEM file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="243"/>
         <source>Replaced elevation data with data from DEM files.</source>
         <translation>Vervang hoogte gegevens met gegevens van DEM bestanden.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="239"/>
+        <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>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="255"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="277"/>
         <source>Offset elevation data by %1%2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="268"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="290"/>
         <source>Changed start of track to %1.</source>
         <translation>Start van track veranderd naar %1.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="281"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="303"/>
         <source>Remove timestamps.</source>
         <translation>Verwijder tijdstempels.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="298"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="320"/>
         <source>Set artificial timestamps with delta of %1 sec.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="324"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="346"/>
         <source>Changed speed to %1%2.</source>
         <translation>Snelheid veranderd naar %1%2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="343"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="365"/>
         <source>%1 (Segment %2)</source>
         <translation>%1 (Segment %2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="361"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="383"/>
         <source>Removed extension %1 from all Track Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="372"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="394"/>
         <source>Converted subpoints from routing to track points</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1346,17 +1351,17 @@
 <context>
     <name>CGisItemWpt</name>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="604"/>
+        <location filename="../gis/gpx/serialization.cpp" line="609"/>
         <source>Archived</source>
         <translation>Gearchiveerd</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="608"/>
+        <location filename="../gis/gpx/serialization.cpp" line="613"/>
         <source>Available</source>
         <translation>Beschikbaar</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="612"/>
+        <location filename="../gis/gpx/serialization.cpp" line="617"/>
         <source>Not Available</source>
         <translation>Niet beschikbaar</translation>
     </message>
@@ -1747,8 +1752,8 @@
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="652"/>
-        <location filename="../gis/CGisListWks.cpp" line="1650"/>
-        <location filename="../gis/CGisListWks.cpp" line="1688"/>
+        <location filename="../gis/CGisListWks.cpp" line="1646"/>
+        <location filename="../gis/CGisListWks.cpp" line="1684"/>
         <source>&lt;b&gt;Update devices&lt;/b&gt;&lt;p&gt;Update %1&lt;br/&gt;Please wait...&lt;/p&gt;</source>
         <translation>&lt;b&gt;Updaten GPS&lt;/b&gt;&lt;p&gt;Updaten %1&lt;br/&gt;Moment geduld...&lt;/p&gt;</translation>
     </message>
@@ -1786,27 +1791,32 @@
 <context>
     <name>CGisWidget</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>Load project...</source>
         <translation>Project laden...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>The project &quot;%1&quot; is already in the workspace.</source>
         <translation>Het project &quot;%1&quot; is al geopend.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="515"/>
+        <location filename="../gis/CGisWidget.cpp" line="554"/>
         <source>Copy items...</source>
         <translation type="unfinished">Kopieer elementen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="573"/>
+        <source>Change waypoint symbols.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Cut Track...</source>
         <translation>Track knippen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Do you want to delete the original track?</source>
         <translation>Moet de orginele track verwijderd worden?</translation>
     </message>
@@ -1838,27 +1848,27 @@
         <translation type="unfinished">Geen GPX bestand: %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="268"/>
         <source>File exists ...</source>
         <translation type="unfinished">Bestand bestaat al...</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="269"/>
         <source>The file exists and it has not been created by QMapShack. If you press &apos;yes&apos; 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. &lt;b&gt;Do you really want to overwrite the file?&lt;/b&gt;</source>
         <translation type="unfinished">Dit bestand bestaat al en is niet in QMapShack gemaakt. Wanneer op &apos;Ja&apos; geklikt wordt zullen er gegevens verloren gaan. Alhoewel QMapShack dit GPX bestand kan openen is het mogelijk dat niet alle elementen opgeslagen kunnen worden. Geadviseerd wordt om een ander bestand te kiezen. &lt;b&gt;Moet dit bestand werkelijk overschreven worden?&lt;b/&gt;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="386"/>
         <source>Failed to create file &apos;%1&apos;</source>
         <translation type="unfinished">Maken bestand mislukt &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="392"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="396"/>
         <source>Failed to write file &apos;%1&apos;</source>
         <translation type="unfinished">Schrijven bestand mislukt &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="404"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="408"/>
         <source>Saving GIS data failed...</source>
         <translation type="unfinished">Opslaan GIS gegevens mislukt...</translation>
     </message>
@@ -1889,27 +1899,27 @@
 <context>
     <name>CHistoryListWidget</name>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="62"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="65"/>
         <source> by %1</source>
         <translation> per %1</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="108"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
         <source>Cut history before</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="113"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="38"/>
         <source>Cut history after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="161"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="155"/>
         <source>History removal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="162"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
         <source>The removal is permanent and cannot be undone. &lt;b&gt;Do you really want to delete history before this step?&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1935,67 +1945,95 @@
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
         <source>Air Temperature</source>
         <translation>Luchttemperatuur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
         <source>Water Temperature</source>
         <translation>Watertemperatuur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
         <source>Heart Rate</source>
         <translation>Hartslag</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
+        <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>Cadans</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
         <source>Speed</source>
         <translation>Snelheid</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
         <source>Acceleration</source>
         <translation>Versnelling</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
         <source>Course</source>
         <translation>Richting</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <source>Temperature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <source>Sea Level Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Speed (vertical)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
         <source>Slope*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
         <source>Speed*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
         <source>Elevation</source>
         <translation>Hoogte</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
         <source>Progress</source>
         <translation>Voortgang</translation>
     </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <source>Terrain slope</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CLostFoundProject</name>
@@ -2008,48 +2046,53 @@
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="588"/>
+        <location filename="../CMainWindow.cpp" line="769"/>
         <source>Use &lt;b&gt;Menu-&gt;View-&gt;Add Map View&lt;/b&gt; to open a new view. Or &lt;b&gt;Menu-&gt;File-&gt;Load Map View&lt;/b&gt; to restore a saved one. Or click &lt;a href=&apos;newview&apos;&gt;here&lt;/a&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="716"/>
+        <location filename="../CMainWindow.cpp" line="897"/>
         <source>Ele: %1%2</source>
         <translation>Hoogte: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="732"/>
+        <location filename="../CMainWindow.cpp" line="909"/>
+        <source>Slope: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="925"/>
         <source>[Grid: %1]</source>
         <translation>[Raster: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="867"/>
+        <location filename="../CMainWindow.cpp" line="1066"/>
         <source>Load GIS Data...</source>
         <translation>GIS gegevens laden...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
         <source>Select output file</source>
         <translation>Selecteer bestand</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>QMapShack View (*.view)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>Select file to load</source>
         <translation>Selecteer bestand</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1106"/>
+        <location filename="../CMainWindow.cpp" line="1369"/>
         <source>Fatal...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1107"/>
+        <location filename="../CMainWindow.cpp" line="1370"/>
         <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>
@@ -2072,620 +2115,631 @@
         <translation>Mislukt...</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="157"/>
+        <location filename="../map/CMapIMG.cpp" line="175"/>
         <source>Unspecified</source>
         <translation>Ongespecificeerd</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="158"/>
+        <location filename="../map/CMapIMG.cpp" line="176"/>
         <source>French</source>
         <translation>Frans</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="159"/>
+        <location filename="../map/CMapIMG.cpp" line="177"/>
         <source>German</source>
         <translation>Duits</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="160"/>
+        <location filename="../map/CMapIMG.cpp" line="178"/>
         <source>Dutch</source>
         <translation>Nederlands</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="161"/>
+        <location filename="../map/CMapIMG.cpp" line="179"/>
         <source>English</source>
         <translation>Engels</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="162"/>
+        <location filename="../map/CMapIMG.cpp" line="180"/>
         <source>Italian</source>
         <translation>Italiaans</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="163"/>
+        <location filename="../map/CMapIMG.cpp" line="181"/>
         <source>Finnish</source>
         <translation>Fins</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="164"/>
+        <location filename="../map/CMapIMG.cpp" line="182"/>
         <source>Swedish</source>
         <translation>Zweeds</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="165"/>
+        <location filename="../map/CMapIMG.cpp" line="183"/>
         <source>Spanish</source>
         <translation>Spaans</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="166"/>
+        <location filename="../map/CMapIMG.cpp" line="184"/>
         <source>Basque</source>
         <translation>Baskisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="167"/>
+        <location filename="../map/CMapIMG.cpp" line="185"/>
         <source>Catalan</source>
         <translation>Catalaans</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="168"/>
+        <location filename="../map/CMapIMG.cpp" line="186"/>
         <source>Galician</source>
         <translation>Galicisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="169"/>
+        <location filename="../map/CMapIMG.cpp" line="187"/>
         <source>Welsh</source>
         <translation>Wels</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="170"/>
+        <location filename="../map/CMapIMG.cpp" line="188"/>
         <source>Gaelic</source>
         <translation>Gaelisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="171"/>
+        <location filename="../map/CMapIMG.cpp" line="189"/>
         <source>Danish</source>
         <translation>Deens</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="172"/>
+        <location filename="../map/CMapIMG.cpp" line="190"/>
         <source>Norwegian</source>
         <translation>Noors</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="173"/>
+        <location filename="../map/CMapIMG.cpp" line="191"/>
         <source>Portuguese</source>
         <translation>Portugees</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="174"/>
+        <location filename="../map/CMapIMG.cpp" line="192"/>
         <source>Slovak</source>
         <translation>Slowaaks</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="175"/>
+        <location filename="../map/CMapIMG.cpp" line="193"/>
         <source>Czech</source>
         <translation>Tsjechisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="176"/>
+        <location filename="../map/CMapIMG.cpp" line="194"/>
         <source>Croatian</source>
         <translation>Kroatisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="177"/>
+        <location filename="../map/CMapIMG.cpp" line="195"/>
         <source>Hungarian</source>
         <translation>Hongaars</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="178"/>
+        <location filename="../map/CMapIMG.cpp" line="196"/>
         <source>Polish</source>
         <translation>Pools</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="179"/>
+        <location filename="../map/CMapIMG.cpp" line="197"/>
         <source>Turkish</source>
         <translation>Turks</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="180"/>
+        <location filename="../map/CMapIMG.cpp" line="198"/>
         <source>Greek</source>
         <translation>Grieks</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="181"/>
+        <location filename="../map/CMapIMG.cpp" line="199"/>
         <source>Slovenian</source>
         <translation>Sloveens</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="182"/>
+        <location filename="../map/CMapIMG.cpp" line="200"/>
         <source>Russian</source>
         <translation>Russisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="183"/>
+        <location filename="../map/CMapIMG.cpp" line="201"/>
         <source>Estonian</source>
         <translation>Ests</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="184"/>
+        <location filename="../map/CMapIMG.cpp" line="202"/>
         <source>Latvian</source>
         <translation>Lets</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="185"/>
+        <location filename="../map/CMapIMG.cpp" line="203"/>
         <source>Romanian</source>
         <translation>Roemeens</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="186"/>
+        <location filename="../map/CMapIMG.cpp" line="204"/>
         <source>Albanian</source>
         <translation>Albanisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="187"/>
+        <location filename="../map/CMapIMG.cpp" line="205"/>
         <source>Bosnian</source>
         <translation>Bosnisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="188"/>
+        <location filename="../map/CMapIMG.cpp" line="206"/>
         <source>Lithuanian</source>
         <translation>Litouws</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="189"/>
+        <location filename="../map/CMapIMG.cpp" line="207"/>
         <source>Serbian</source>
         <translation>Servisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="190"/>
+        <location filename="../map/CMapIMG.cpp" line="208"/>
         <source>Macedonian</source>
         <translation>Macedonisch</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="191"/>
+        <location filename="../map/CMapIMG.cpp" line="209"/>
         <source>Bulgarian</source>
         <translation>Bulgaars</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="248"/>
+        <location filename="../map/CMapIMG.cpp" line="266"/>
         <source>Major highway</source>
         <translation>Belangrijke snelweg</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="249"/>
+        <location filename="../map/CMapIMG.cpp" line="267"/>
         <source>Principal highway</source>
         <translation>Gewone snelweg</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="250"/>
+        <location filename="../map/CMapIMG.cpp" line="268"/>
         <source>Other highway</source>
         <translation>Andere snelweg</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="251"/>
+        <location filename="../map/CMapIMG.cpp" line="269"/>
         <source>Arterial road</source>
         <translation>Uitvalsweg</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="252"/>
+        <location filename="../map/CMapIMG.cpp" line="270"/>
         <source>Collector road</source>
         <translation>Verzamelweg</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="253"/>
+        <location filename="../map/CMapIMG.cpp" line="271"/>
         <source>Residential street</source>
         <translation>Woonstraat</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="254"/>
+        <location filename="../map/CMapIMG.cpp" line="272"/>
         <source>Alley/Private road</source>
         <translation>Laan/privéweg</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="255"/>
+        <location filename="../map/CMapIMG.cpp" line="273"/>
         <source>Highway ramp, low speed</source>
         <translation>Snelweg oprit, langzame snelheid</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="256"/>
+        <location filename="../map/CMapIMG.cpp" line="274"/>
         <source>Highway ramp, high speed</source>
         <translation>Snelweg oprit, hoge snelheid</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="257"/>
+        <location filename="../map/CMapIMG.cpp" line="275"/>
         <source>Unpaved road</source>
         <translation>Onverharde weg</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="258"/>
+        <location filename="../map/CMapIMG.cpp" line="276"/>
         <source>Major highway connector</source>
         <translation>Belangrijke snelwegknooppunt</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="259"/>
+        <location filename="../map/CMapIMG.cpp" line="277"/>
         <source>Roundabout</source>
         <translation>Rotonde</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="260"/>
+        <location filename="../map/CMapIMG.cpp" line="278"/>
         <source>Railroad</source>
         <translation>Spoorlijn</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="261"/>
+        <location filename="../map/CMapIMG.cpp" line="279"/>
         <source>Shoreline</source>
         <translation>Kustlijn</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="262"/>
+        <location filename="../map/CMapIMG.cpp" line="280"/>
         <source>Trail</source>
         <translation>Pad</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="263"/>
+        <location filename="../map/CMapIMG.cpp" line="281"/>
         <source>Stream</source>
         <translation>Stroom</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="264"/>
+        <location filename="../map/CMapIMG.cpp" line="282"/>
         <source>Time zone</source>
         <translation>Tijdzone</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="265"/>
-        <location filename="../map/CMapIMG.cpp" line="266"/>
+        <location filename="../map/CMapIMG.cpp" line="283"/>
+        <location filename="../map/CMapIMG.cpp" line="284"/>
         <source>Ferry</source>
         <translation>Veerdienst</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="267"/>
+        <location filename="../map/CMapIMG.cpp" line="285"/>
         <source>State/province border</source>
         <translation>Staat/provinciegrens</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="268"/>
+        <location filename="../map/CMapIMG.cpp" line="286"/>
         <source>County/parish border</source>
         <translation>Provincie/gemeentegrens</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="269"/>
+        <location filename="../map/CMapIMG.cpp" line="287"/>
         <source>International border</source>
         <translation>Internationale grens</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="270"/>
+        <location filename="../map/CMapIMG.cpp" line="288"/>
         <source>River</source>
         <translation>Rivier</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="271"/>
+        <location filename="../map/CMapIMG.cpp" line="289"/>
         <source>Minor land contour</source>
         <translation>Klein hoogteverschil</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="272"/>
+        <location filename="../map/CMapIMG.cpp" line="290"/>
         <source>Intermediate land contour</source>
         <translation>Gemiddeld hoogteverschil</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="273"/>
+        <location filename="../map/CMapIMG.cpp" line="291"/>
         <source>Major land contour</source>
         <translation>Groot hoogteverschil</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="274"/>
+        <location filename="../map/CMapIMG.cpp" line="292"/>
         <source>Minor depth contour</source>
         <translation>Klein diepteverschil</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="275"/>
+        <location filename="../map/CMapIMG.cpp" line="293"/>
         <source>Intermediate depth contour</source>
         <translation>Gemiddeld diepteverschil</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="276"/>
+        <location filename="../map/CMapIMG.cpp" line="294"/>
         <source>Major depth contour</source>
         <translation>Groot diepteverschil</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="277"/>
+        <location filename="../map/CMapIMG.cpp" line="295"/>
         <source>Intermittent stream</source>
         <translation>Intermitterende beek</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="278"/>
-        <location filename="../map/CMapIMG.cpp" line="360"/>
+        <location filename="../map/CMapIMG.cpp" line="296"/>
+        <location filename="../map/CMapIMG.cpp" line="378"/>
         <source>Airport runway</source>
         <translation>Landingsbaan</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="279"/>
+        <location filename="../map/CMapIMG.cpp" line="297"/>
         <source>Pipeline</source>
         <translation>Pijplijn</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="280"/>
+        <location filename="../map/CMapIMG.cpp" line="298"/>
         <source>Powerline</source>
         <translation>Hoogspanningsleiding</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="281"/>
+        <location filename="../map/CMapIMG.cpp" line="299"/>
         <source>Marine boundary</source>
         <translation>Zeegrens</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="282"/>
+        <location filename="../map/CMapIMG.cpp" line="300"/>
         <source>Hazard boundary</source>
         <translation>Gevaarlijke grens</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="347"/>
+        <location filename="../map/CMapIMG.cpp" line="365"/>
         <source>Large urban area (&amp;gt;200K)</source>
         <translation>Groot bevolkt gebied (&amp;gt;200K)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="348"/>
+        <location filename="../map/CMapIMG.cpp" line="366"/>
         <source>Small urban area (&amp;lt;200K)</source>
         <translation>Klein bevolt gebied (&amp;lt;200K)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="349"/>
+        <location filename="../map/CMapIMG.cpp" line="367"/>
         <source>Rural housing area</source>
         <translation>Landelijk woongebied</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="350"/>
+        <location filename="../map/CMapIMG.cpp" line="368"/>
         <source>Military base</source>
         <translation>Militaire basis</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="351"/>
+        <location filename="../map/CMapIMG.cpp" line="369"/>
         <source>Parking lot</source>
         <translation>Parkeerterrein</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="352"/>
+        <location filename="../map/CMapIMG.cpp" line="370"/>
         <source>Parking garage</source>
         <translation>Parkeergarage</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="353"/>
+        <location filename="../map/CMapIMG.cpp" line="371"/>
         <source>Airport</source>
         <translation>Vliegveld</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="354"/>
+        <location filename="../map/CMapIMG.cpp" line="372"/>
         <source>Shopping center</source>
         <translation>Winkelcentrum</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="355"/>
+        <location filename="../map/CMapIMG.cpp" line="373"/>
         <source>Marina</source>
         <translation>Jachthaven</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="356"/>
+        <location filename="../map/CMapIMG.cpp" line="374"/>
         <source>University/College</source>
         <translation>Universiteit/College</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="357"/>
+        <location filename="../map/CMapIMG.cpp" line="375"/>
         <source>Hospital</source>
         <translation>Ziekenhuis</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="358"/>
+        <location filename="../map/CMapIMG.cpp" line="376"/>
         <source>Industrial complex</source>
         <translation>Industrie</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="359"/>
+        <location filename="../map/CMapIMG.cpp" line="377"/>
         <source>Reservation</source>
         <translation>Reservaat</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="361"/>
+        <location filename="../map/CMapIMG.cpp" line="379"/>
         <source>Man-made area</source>
         <translation>Gemaakt gebied</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="362"/>
+        <location filename="../map/CMapIMG.cpp" line="380"/>
         <source>Sports complex</source>
         <translation>Sprtcomplex</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="363"/>
+        <location filename="../map/CMapIMG.cpp" line="381"/>
         <source>Golf course</source>
         <translation>Golfbaan</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="364"/>
+        <location filename="../map/CMapIMG.cpp" line="382"/>
         <source>Cemetery</source>
         <translation>Begraafplaats</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="365"/>
-        <location filename="../map/CMapIMG.cpp" line="366"/>
-        <location filename="../map/CMapIMG.cpp" line="367"/>
+        <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>Nationaal park</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="368"/>
+        <location filename="../map/CMapIMG.cpp" line="386"/>
         <source>City park</source>
         <translation>Stadspark</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="369"/>
-        <location filename="../map/CMapIMG.cpp" line="370"/>
-        <location filename="../map/CMapIMG.cpp" line="371"/>
+        <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>Staatspark</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="372"/>
+        <location filename="../map/CMapIMG.cpp" line="390"/>
         <source>Forest</source>
         <translation>Bos</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="373"/>
+        <location filename="../map/CMapIMG.cpp" line="391"/>
         <source>Ocean</source>
         <translation>Oceaan</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="374"/>
-        <location filename="../map/CMapIMG.cpp" line="376"/>
-        <location filename="../map/CMapIMG.cpp" line="386"/>
+        <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>Blauw (onbekend</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="375"/>
+        <location filename="../map/CMapIMG.cpp" line="393"/>
         <source>Sea</source>
         <translation>Zee</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="377"/>
-        <location filename="../map/CMapIMG.cpp" line="378"/>
-        <location filename="../map/CMapIMG.cpp" line="385"/>
+        <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>Groot meer</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="379"/>
-        <location filename="../map/CMapIMG.cpp" line="380"/>
+        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="398"/>
         <source>Medium lake</source>
         <translation>Middelmatig meer</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="381"/>
-        <location filename="../map/CMapIMG.cpp" line="382"/>
+        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="400"/>
         <source>Small lake</source>
         <translation>Klein meer</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="383"/>
-        <location filename="../map/CMapIMG.cpp" line="384"/>
+        <location filename="../map/CMapIMG.cpp" line="401"/>
+        <location filename="../map/CMapIMG.cpp" line="402"/>
         <source>Major lake</source>
         <translation>Belangrijk meer</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="387"/>
+        <location filename="../map/CMapIMG.cpp" line="405"/>
         <source>Major River</source>
         <translation>Belangrijke rivier</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="388"/>
+        <location filename="../map/CMapIMG.cpp" line="406"/>
         <source>Large River</source>
         <translation>Groot rivier</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="389"/>
+        <location filename="../map/CMapIMG.cpp" line="407"/>
         <source>Medium River</source>
         <translation>Middelmatig rivier</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="390"/>
+        <location filename="../map/CMapIMG.cpp" line="408"/>
         <source>Small River</source>
         <translation>Klein rivier</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="393"/>
+        <location filename="../map/CMapIMG.cpp" line="411"/>
         <source>Intermittent water</source>
         <translation>Intermitterende water</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="394"/>
+        <location filename="../map/CMapIMG.cpp" line="412"/>
         <source>Wetland/Swamp</source>
         <translation>Moeras</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="395"/>
+        <location filename="../map/CMapIMG.cpp" line="413"/>
         <source>Glacier</source>
         <translation>Gletsjer</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="396"/>
+        <location filename="../map/CMapIMG.cpp" line="414"/>
         <source>Orchard/Plantation</source>
         <translation>Boomgaard/Plantage</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="415"/>
         <source>Scrub</source>
         <translation>Struikgewas</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="398"/>
+        <location filename="../map/CMapIMG.cpp" line="416"/>
         <source>Tundra</source>
         <translation>Toendra</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="417"/>
         <source>Flat</source>
         <translation>Vlak</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="400"/>
+        <location filename="../map/CMapIMG.cpp" line="418"/>
         <source>???</source>
         <translation>???</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="436"/>
+        <location filename="../map/CMapIMG.cpp" line="432"/>
+        <source>Read external type file...</source>
+        <translation type="unfinished"></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>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="474"/>
         <source>Failed to read: </source>
         <translation>Lezen mislukt:</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="479"/>
+        <location filename="../map/CMapIMG.cpp" line="517"/>
         <source>Failed to open: </source>
         <translation>Openen mislukt:</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="503"/>
-        <location filename="../map/CMapIMG.cpp" line="507"/>
+        <location filename="../map/CMapIMG.cpp" line="541"/>
+        <location filename="../map/CMapIMG.cpp" line="545"/>
         <source>Bad file format: </source>
         <translation>Verkeerd bestandsformaat:</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="596"/>
+        <location filename="../map/CMapIMG.cpp" line="634"/>
         <source>Failed to read file structure: </source>
         <translation>Lezen bestandsstructuur mislukt:</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="631"/>
+        <location filename="../map/CMapIMG.cpp" line="669"/>
         <source>Loading %1</source>
         <translation>Laden %1</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="637"/>
+        <location filename="../map/CMapIMG.cpp" line="675"/>
         <source>User abort: </source>
         <translation>Afgebroken door gebruiker: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="640"/>
+        <location filename="../map/CMapIMG.cpp" line="678"/>
         <source>File is NT format. QMapShack is unable to read map files with NT format: </source>
         <translation>Bestand is in NT formaat. QMapShack kan geen kaarten lezen met NT formaat:</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="731"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2342"/>
-        <location filename="../map/CMapIMG.cpp" line="2348"/>
-        <location filename="../map/CMapIMG.cpp" line="2352"/>
+        <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>Interessant punt</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2438"/>
+        <location filename="../map/CMapIMG.cpp" line="2484"/>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2480"/>
-        <location filename="../map/CMapIMG.cpp" line="2488"/>
-        <location filename="../map/CMapIMG.cpp" line="2495"/>
+        <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>Gebied</translation>
     </message>
@@ -2745,6 +2799,14 @@
     </message>
 </context>
 <context>
+    <name>CMapPropSetup</name>
+    <message>
+        <location filename="../map/CMapPropSetup.cpp" line="196"/>
+        <source>Select type file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CMapRMAP</name>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="48"/>
@@ -3179,7 +3241,7 @@
         <translation>Verstreken tijd: %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="86"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="87"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation>Verstreken tijd: %1 seconden.</translation>
     </message>
@@ -3796,27 +3858,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="620"/>
         <source>error renaming file %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+        <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>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
         <source>being downloaded: %1 of %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
         <source>no local data, online available: %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="798"/>
         <source>local data outdated (%1, %2 - remote %3, %4)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3836,12 +3898,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="806"/>
         <source>local data up to date (%1, %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="818"/>
         <source>no routing-data available</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3849,14 +3911,14 @@
 <context>
     <name>CRouterBRouterToolShell</name>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
         <source>!!! done !!!
 </source>
         <translation type="unfinished">!!! klaar !!!
 </translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
         <source>!!! failed !!!
 </source>
         <translation type="unfinished">!!! Mislukt !!!
@@ -4196,7 +4258,7 @@
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="415"/>
         <source>Calculate route with %1</source>
         <translation>Bereken route met %1</translation>
     </message>
@@ -4575,6 +4637,19 @@
     </message>
 </context>
 <context>
+    <name>CToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="43"/>
+        <source>Available Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="44"/>
+        <source>Selected Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CTwoNavProject</name>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
@@ -6164,6 +6239,29 @@
     </message>
 </context>
 <context>
+    <name>IFilterTerrainSlope</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulier</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="51"/>
+        <source>&lt;b&gt;Calculate Terrain Slope&lt;/b&gt;</source>
+        <translation type="unfinished"></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>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="70"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+</context>
+<context>
     <name>IFitDecoderState</name>
     <message>
         <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="31"/>
@@ -6343,31 +6441,46 @@
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="49"/>
+        <location filename="../gis/IGisWidget.ui" line="43"/>
         <source>Opacity</source>
         <translation type="unfinished">Transparantie</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="56"/>
+        <location filename="../gis/IGisWidget.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="108"/>
-        <location filename="../gis/IGisWidget.ui" line="138"/>
+        <location filename="../gis/IGisWidget.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"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="143"/>
+        <location filename="../gis/IGisWidget.ui" line="151"/>
         <source>Age</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="177"/>
+        <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"/>
+        <source>Clear Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <source>Setup Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IGridSetup</name>
@@ -6523,338 +6636,363 @@
         <translation>Venster</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="110"/>
+        <location filename="../IMainWindow.ui" line="112"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="118"/>
+        <location filename="../IMainWindow.ui" line="120"/>
         <source>Project</source>
         <translation>Project</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="129"/>
+        <location filename="../IMainWindow.ui" line="131"/>
         <source>Tool</source>
         <translation>Extra</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="154"/>
+        <location filename="../IMainWindow.ui" line="156"/>
         <source>Maps</source>
         <translation>Kaarten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="197"/>
+        <location filename="../IMainWindow.ui" line="199"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation>Dig. Elev. Model (DEM)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="236"/>
+        <location filename="../IMainWindow.ui" line="238"/>
         <source>Data</source>
         <translation>Gegevens</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="254"/>
+        <location filename="../IMainWindow.ui" line="256"/>
         <source>Route</source>
         <translation>Route</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="288"/>
-        <location filename="../IMainWindow.ui" line="291"/>
+        <location filename="../IMainWindow.ui" line="286"/>
+        <source>Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="301"/>
+        <location filename="../IMainWindow.ui" line="304"/>
         <source>Add Map View</source>
         <translation>Nieuw venster</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="294"/>
+        <location filename="../IMainWindow.ui" line="307"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="309"/>
+        <location filename="../IMainWindow.ui" line="322"/>
         <source>Show Scale</source>
         <translation>Toon schaal</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="321"/>
+        <location filename="../IMainWindow.ui" line="334"/>
         <source>Setup Map Font</source>
         <translation>Lettertype kaart instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="336"/>
+        <location filename="../IMainWindow.ui" line="349"/>
         <source>Show Grid</source>
         <translation>Toon raster</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="339"/>
+        <location filename="../IMainWindow.ui" line="352"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="351"/>
+        <location filename="../IMainWindow.ui" line="364"/>
         <source>Setup Grid</source>
         <translation>Raster instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="354"/>
+        <location filename="../IMainWindow.ui" line="367"/>
         <source>Ctrl+Alt+G</source>
         <translation>Ctrl+Alt+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="382"/>
         <source>Flip Mouse Wheel</source>
         <translation>Draai muiswiel om</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="381"/>
-        <location filename="../IMainWindow.ui" line="384"/>
+        <location filename="../IMainWindow.ui" line="394"/>
+        <location filename="../IMainWindow.ui" line="397"/>
         <source>Setup Map Paths</source>
         <translation>Map met kaarten instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="399"/>
+        <location filename="../IMainWindow.ui" line="412"/>
         <source>POI Text</source>
         <translation>POI tekst</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="414"/>
+        <location filename="../IMainWindow.ui" line="427"/>
         <source>Night / Day</source>
         <translation>Dag/Nacht</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="429"/>
+        <location filename="../IMainWindow.ui" line="442"/>
         <source>Map Tool Tip</source>
         <translation>Map Tool Tip</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="432"/>
+        <location filename="../IMainWindow.ui" line="445"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="444"/>
+        <location filename="../IMainWindow.ui" line="457"/>
         <source>Setup DEM Paths</source>
         <translation>Map DEM instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="456"/>
+        <location filename="../IMainWindow.ui" line="469"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="468"/>
+        <location filename="../IMainWindow.ui" line="481"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="484"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="483"/>
-        <location filename="../IMainWindow.ui" line="486"/>
+        <location filename="../IMainWindow.ui" line="496"/>
+        <location filename="../IMainWindow.ui" line="499"/>
         <source>Setup Map View</source>
         <translation>Kaartinstellingen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="498"/>
+        <location filename="../IMainWindow.ui" line="511"/>
         <source>Load GIS Data</source>
         <translation>GIS gegevens laden</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="501"/>
+        <location filename="../IMainWindow.ui" line="514"/>
         <source>Load projects from file</source>
         <translation>Project laden uit bestand</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="504"/>
+        <location filename="../IMainWindow.ui" line="517"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="516"/>
+        <location filename="../IMainWindow.ui" line="529"/>
         <source>Save All GIS Data</source>
         <translation>GIS gegevens opslaan</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="519"/>
+        <location filename="../IMainWindow.ui" line="532"/>
         <source>Save all projects in the workspace</source>
         <translation>Sla alle projecten op in werkruimte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="522"/>
+        <location filename="../IMainWindow.ui" line="535"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="534"/>
+        <location filename="../IMainWindow.ui" line="547"/>
         <source>Setup Time Zone</source>
         <translation>Tijdzone instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="546"/>
+        <location filename="../IMainWindow.ui" line="559"/>
         <source>Add empty project</source>
         <translation>Nieuw leeg project</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="561"/>
+        <location filename="../IMainWindow.ui" line="574"/>
         <source>Search Google</source>
         <translation>Zoeken Google</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="573"/>
+        <location filename="../IMainWindow.ui" line="586"/>
         <source>Close all projects</source>
         <translation>Sluit alle projecten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="576"/>
+        <location filename="../IMainWindow.ui" line="589"/>
         <source>F8</source>
         <translation>F8</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="588"/>
+        <location filename="../IMainWindow.ui" line="601"/>
         <source>Setup Units</source>
         <translation>Eenheden instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="600"/>
+        <location filename="../IMainWindow.ui" line="613"/>
         <source>Setup Workspace</source>
         <translation>Werkruimte instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="603"/>
+        <location filename="../IMainWindow.ui" line="616"/>
         <source>Setup save on exit.</source>
         <translation>Oplaan bij afsluiten instellen.</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="615"/>
+        <location filename="../IMainWindow.ui" line="628"/>
         <source>Import Database from QLandkarte</source>
         <translation>Database van QLandkarte importeren</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="618"/>
+        <location filename="../IMainWindow.ui" line="631"/>
         <source>Import QLandkarte GT database</source>
         <translation>QLandkarte database importeren</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="630"/>
+        <location filename="../IMainWindow.ui" line="643"/>
         <source>VRT Builder</source>
         <translation>VRT maken</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="633"/>
+        <location filename="../IMainWindow.ui" line="646"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation>GUI front end naar gdalbuildvrt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="645"/>
+        <location filename="../IMainWindow.ui" line="658"/>
         <source>Store Map View</source>
         <translation>Kaart opslaan</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="648"/>
+        <location filename="../IMainWindow.ui" line="661"/>
         <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="660"/>
+        <location filename="../IMainWindow.ui" line="673"/>
         <source>Load Map View</source>
         <translation>Kaart laden</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="663"/>
+        <location filename="../IMainWindow.ui" line="676"/>
         <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="678"/>
+        <location filename="../IMainWindow.ui" line="691"/>
         <source>Ext. Profile</source>
         <translation>Ext. profiel</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="681"/>
+        <location filename="../IMainWindow.ui" line="694"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="693"/>
+        <location filename="../IMainWindow.ui" line="706"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="696"/>
+        <location filename="../IMainWindow.ui" line="709"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="708"/>
+        <location filename="../IMainWindow.ui" line="721"/>
         <source>Clone Map View</source>
         <translation>Kloon venster</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="711"/>
+        <location filename="../IMainWindow.ui" line="724"/>
         <source>Ctrl+Shift+T</source>
         <translation>Ctrl+Shift+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="723"/>
+        <location filename="../IMainWindow.ui" line="736"/>
         <source>Create Routino Database</source>
         <translation>Maak Routino database</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="735"/>
+        <location filename="../IMainWindow.ui" line="748"/>
         <source>Save(Print) Map Screenshot</source>
         <translation>Kaartdeel opslaan/afdrukken</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="738"/>
+        <location filename="../IMainWindow.ui" line="751"/>
         <source>Print a selected area of the map</source>
         <translation>Geselecteerde deel van kaart afdrukken</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="741"/>
+        <location filename="../IMainWindow.ui" line="754"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="753"/>
+        <location filename="../IMainWindow.ui" line="766"/>
         <source>Setup Coord. Format</source>
         <translation>Coördinaat formaat instellen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="756"/>
+        <location filename="../IMainWindow.ui" line="769"/>
         <source>Change the format coordinates are displayed</source>
         <translation>Getoonde coördinaat formaat aanpassen</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="768"/>
+        <location filename="../IMainWindow.ui" line="781"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="780"/>
+        <location filename="../IMainWindow.ui" line="793"/>
         <source>Setup Waypoint Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="783"/>
+        <location filename="../IMainWindow.ui" line="796"/>
         <source>Setup path to custom icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="792"/>
+        <location filename="../IMainWindow.ui" line="805"/>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="795"/>
+        <location filename="../IMainWindow.ui" line="808"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="804"/>
+        <location filename="../IMainWindow.ui" line="817"/>
         <source>Quickstart Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="826"/>
+        <source>Setup Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="838"/>
+        <source>Toggle Docks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="841"/>
+        <source>Toggle visibility of dockable windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="844"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished">Ctrl+D</translation>
+    </message>
 </context>
 <context>
     <name>IMapList</name>
@@ -6964,6 +7102,8 @@
     <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>
@@ -7017,6 +7157,21 @@
         <source>Cache Path</source>
         <translation>Cachemap</translation>
     </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="353"/>
+        <source>Type File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="367"/>
+        <source>Forget external type file and use internal types.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="381"/>
+        <source>Load an external type file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IMapVrtBuilder</name>
@@ -8137,7 +8292,7 @@
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="222"/>
-        <source>Select all itmes that are completely inside the selected area.</source>
+        <source>Select all items that are completely inside the selected area.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8411,6 +8566,52 @@
     </message>
 </context>
 <context>
+    <name>ISelectDoubleListWidget</name>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulier</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="22"/>
+        <source>Available</source>
+        <translation type="unfinished">Beschikbaar</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="46"/>
+        <source>Add to selected items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="60"/>
+        <source>Remove from selected items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="78"/>
+        <source>Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="102"/>
+        <source>Move selected items up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="116"/>
+        <source>Move selected items down</source>
+        <translation type="unfinished"></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 type="unfinished">...</translation>
+    </message>
+</context>
+<context>
     <name>ISelectProjectDialog</name>
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="14"/>
@@ -8589,6 +8790,29 @@
     </message>
 </context>
 <context>
+    <name>ISetupFilter</name>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulier</translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="38"/>
+        <source>Apply filter to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="45"/>
+        <source>name only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="52"/>
+        <source>complete text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ISetupFolder</name>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="14"/>
@@ -9022,6 +9246,14 @@
     </message>
 </context>
 <context>
+    <name>IToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/IToolBarSetupDialog.ui" line="14"/>
+        <source>Setup Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IToolShell</name>
     <message>
         <location filename="../tool/IToolShell.cpp" line="46"/>
diff -Nru qmapshack-1.8.1/src/locale/qmapshack_ru.ts qmapshack-1.9.0/src/locale/qmapshack_ru.ts
--- qmapshack-1.8.1/src/locale/qmapshack_ru.ts	2017-04-24 17:31:48.000000000 +0000
+++ qmapshack-1.9.0/src/locale/qmapshack_ru.ts	2017-07-24 15:41:33.000000000 +0000
@@ -122,7 +122,7 @@
         <translation>Вид %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="695"/>
+        <location filename="../canvas/CCanvas.cpp" line="705"/>
         <source>Setup Map Background</source>
         <translation>�а�тройка фона карт</translation>
     </message>
@@ -559,32 +559,32 @@
 <context>
     <name>CDetailsTrk</name>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Reduce visible track points</source>
         <translation>Уменьшить чи�ло видимых точек трека</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change elevation of track points</source>
         <translation>Изменить вы�оту точек трека</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Change timestamp of track points</source>
         <translation>Изменить метки времени точек трека</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Miscellaneous</source>
         <translation>Разное</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
         <source>Activity</source>
         <translation>Меропри�тие</translation>
     </message>
@@ -615,7 +615,7 @@
         <translation>Изображение %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="1063"/>
+        <location filename="../gis/gpx/serialization.cpp" line="1068"/>
         <source>Unknown</source>
         <translation>�еизве�тно</translation>
     </message>
@@ -728,7 +728,7 @@
 <context>
     <name>CFitDecoder</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="119"/>
+        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="132"/>
         <source>FIT decoding error: unexpected end of file %1.</source>
         <translation>Ошибка декодировани� FIT: неожиданный конец файла %1.</translation>
     </message>
@@ -744,12 +744,12 @@
 <context>
     <name>CFitFieldDataState</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="115"/>
+        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
         <source>Missing field definition for development field.</source>
         <translation>От�ут�твует определение пол� дл� пол� развити�.</translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="207"/>
+        <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>Ошибка декодировани� FIT: неправильный номер определени� пол� %1 при �оздании профил� пол� развити�.</translation>
     </message>
@@ -788,7 +788,7 @@
         <translation>Ошибка декодировани� FIT: архитектура %1 не поддерживает��.</translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="107"/>
+        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="110"/>
         <source>FIT decoding error: invalid offset %1 for state &apos;record content&apos;</source>
         <translation>Ошибка декодировани� FIT: неправильное �мещение %1 дл� �о�то�ни� &apos;�одержимое запи�и&apos;</translation>
     </message>
@@ -972,7 +972,7 @@
 <context>
     <name>CGisItemTrk</name>
     <message>
-        <location filename="../gis/fit/serialization.cpp" line="247"/>
+        <location filename="../gis/fit/serialization.cpp" line="246"/>
         <source>FIT file %1 contains no GPS data.</source>
         <translation>FIT файл %1 не �одержит данных GPS.</translation>
     </message>
@@ -1100,7 +1100,7 @@
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="513"/>
         <source> slope: %1%3 (%2%)</source>
-        <translation> наклон: %1%3 (%2%)</translation>
+        <translation> �клон: %1%3 (%2%)</translation>
     </message>
     <message>
         <location filename="../gis/trk/CGisItemTrk.cpp" line="518"/>
@@ -1228,37 +1228,37 @@
         <translation>Показать точки.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
         <source>Changed name</source>
         <translation>Изменено им�</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
         <source>Changed comment</source>
         <translation>Изменен комментарий</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
         <source>Changed description</source>
         <translation>Изменено опи�ание</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
         <source>Changed links</source>
         <translation>Изменены ��ылки</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation>Изменена вы�ота точки %1 на %2 %3</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2047"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2041"/>
         <source>Changed activity to &apos;%1&apos; for complete track.</source>
         <translation>Изменено меропри�тие на &apos;%1&apos; дл� в�его трека.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
         <source>Changed activity to &apos;%1&apos; for range(%2..%3).</source>
         <translation>Изменено меропри�тие на &apos;%1&apos; дл� интервала (%2..%3).</translation>
     </message>
@@ -1289,51 +1289,56 @@
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="221"/>
+        <source>Added terrain slope from DEM file.</source>
+        <translation>Добавлен �клон ме�тно�ти � файла ЦМР.</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="243"/>
         <source>Replaced elevation data with data from DEM files.</source>
         <translation>Заменены вы�оты данными файлов ЦМР.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="239"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="261"/>
         <source>Replaced elevation data with interpolated values. (M=%1, RMSErr=%2)</source>
         <translation>Заменены вы�оты интерполированными значени�ми. (M=%1, RMSErr=%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="255"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="277"/>
         <source>Offset elevation data by %1%2.</source>
         <translation>Добавить %1 %2 к вы�оте.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="268"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="290"/>
         <source>Changed start of track to %1.</source>
         <translation>Изменено начало трека на %1.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="281"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="303"/>
         <source>Remove timestamps.</source>
         <translation>Удалить метки времени.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="298"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="320"/>
         <source>Set artificial timestamps with delta of %1 sec.</source>
         <translation>У�тановить и�ку��твенные метки времени � интервалом в %1 �екунд.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="324"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="346"/>
         <source>Changed speed to %1%2.</source>
         <translation>Изменена �коро�ть на %1 %2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="343"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="365"/>
         <source>%1 (Segment %2)</source>
         <translation>%1 (�егмент %2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="361"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="383"/>
         <source>Removed extension %1 from all Track Points</source>
         <translation>Удалено ра�ширение %1 �о в�ех точек трека</translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="372"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="394"/>
         <source>Converted subpoints from routing to track points</source>
         <translation>Преобразованы подточки � маршрутных в точки трека</translation>
     </message>
@@ -1346,17 +1351,17 @@
 <context>
     <name>CGisItemWpt</name>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="604"/>
+        <location filename="../gis/gpx/serialization.cpp" line="609"/>
         <source>Archived</source>
         <translation>�рхивировано</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="608"/>
+        <location filename="../gis/gpx/serialization.cpp" line="613"/>
         <source>Available</source>
         <translation>До�тупно</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="612"/>
+        <location filename="../gis/gpx/serialization.cpp" line="617"/>
         <source>Not Available</source>
         <translation>�е до�тупно</translation>
     </message>
@@ -1747,8 +1752,8 @@
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="652"/>
-        <location filename="../gis/CGisListWks.cpp" line="1650"/>
-        <location filename="../gis/CGisListWks.cpp" line="1688"/>
+        <location filename="../gis/CGisListWks.cpp" line="1646"/>
+        <location filename="../gis/CGisListWks.cpp" line="1684"/>
         <source>&lt;b&gt;Update devices&lt;/b&gt;&lt;p&gt;Update %1&lt;br/&gt;Please wait...&lt;/p&gt;</source>
         <translation>&lt;b&gt;Обновить у�трой�тва&lt;/b&gt;&lt;p&gt;Обновить %1&lt;br/&gt;Подождите...&lt;/p&gt;</translation>
     </message>
@@ -1786,27 +1791,32 @@
 <context>
     <name>CGisWidget</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>Load project...</source>
         <translation>Загрузить проект...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>The project &quot;%1&quot; is already in the workspace.</source>
         <translation>Проект &quot;%1&quot; уже находит�� в рабочей обла�ти.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="515"/>
+        <location filename="../gis/CGisWidget.cpp" line="554"/>
         <source>Copy items...</source>
         <translation>Копировать �лемент ...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="573"/>
+        <source>Change waypoint symbols.</source>
+        <translation>Изменить �имволов путевых точек.</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Cut Track...</source>
         <translation>Вырезать трек...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Do you want to delete the original track?</source>
         <translation>Желаете удалить изначальный трек?</translation>
     </message>
@@ -1838,27 +1848,27 @@
         <translation>�ет файла GPX: %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="268"/>
         <source>File exists ...</source>
         <translation>Файл �уще�твует...</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="269"/>
         <source>The file exists and it has not been created by QMapShack. If you press &apos;yes&apos; 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. &lt;b&gt;Do you really want to overwrite the file?&lt;/b&gt;</source>
         <translation>Файл �уще�твует и не �оздан в QMapShack. Е�ли нажать &apos;да&apos; в�е данные в �том файле будут потер�ны. Даже е�ли �тот файл �одержит данные GPX и был загружен в QMapShack, QMapShack не может загрузить и �охранить в�е �лементы �того файла. Такие �лементы будут потер�ны. Рекомендует�� и�пользовать другой файл. &lt;b&gt;Вы дей�твительно хотите перезапи�ать �тот файл?&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="386"/>
         <source>Failed to create file &apos;%1&apos;</source>
         <translation>�е удало�ь �оздать файл &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="392"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="396"/>
         <source>Failed to write file &apos;%1&apos;</source>
         <translation>�е удало�ь запи�ать файл &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="404"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="408"/>
         <source>Saving GIS data failed...</source>
         <translation>�е удало�ь �охранить данные GIS...</translation>
     </message>
@@ -1889,27 +1899,27 @@
 <context>
     <name>CHistoryListWidget</name>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="62"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="65"/>
         <source> by %1</source>
         <translation>от %1</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="108"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
         <source>Cut history before</source>
         <translation>Удалить и�торию до �того шага</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="113"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="38"/>
         <source>Cut history after</source>
         <translation>Удалить и�торию по�ле �того шага</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="161"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="155"/>
         <source>History removal</source>
         <translation>Удалить и�торию</translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="162"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
         <source>The removal is permanent and cannot be undone. &lt;b&gt;Do you really want to delete history before this step?&lt;/b&gt;</source>
         <translation>Удаление �вл�ет�� по�то�нным и не может быть отменено. &lt;b&gt;Вы дей�твительно хотите удалить и�торию перед �тим шагом?&lt;/b&gt;</translation>
     </message>
@@ -1935,67 +1945,95 @@
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
         <source>Air Temperature</source>
         <translation>Температура воздуха</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
         <source>Water Temperature</source>
         <translation>Температура воды</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
         <source>Heart Rate</source>
         <translation>Пуль�</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
+        <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>Каденци�</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
         <source>Speed</source>
         <translation>Скоро�ть</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
         <source>Acceleration</source>
         <translation>У�корение</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
         <source>Course</source>
         <translation>Кур�</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <source>Temperature</source>
+        <translation>Температура</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <source>Distance</source>
+        <translation>Ра��то�ние</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <source>Sea Level Pressure</source>
+        <translation>Давление на уровень мор�</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Speed (vertical)</source>
+        <translation>Скоро�ть (вертикальна�)</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
         <source>Slope*</source>
         <translation>�аклон*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
         <source>Speed*</source>
         <translation>Скоро�ть*</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
         <source>Elevation</source>
         <translation>Вы�ота</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
         <source>Progress</source>
         <translation>Выполнение</translation>
     </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <source>Terrain slope</source>
+        <translation>Склон ме�тно�ти</translation>
+    </message>
 </context>
 <context>
     <name>CLostFoundProject</name>
@@ -2008,48 +2046,53 @@
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="588"/>
+        <location filename="../CMainWindow.cpp" line="769"/>
         <source>Use &lt;b&gt;Menu-&gt;View-&gt;Add Map View&lt;/b&gt; to open a new view. Or &lt;b&gt;Menu-&gt;File-&gt;Load Map View&lt;/b&gt; to restore a saved one. Or click &lt;a href=&apos;newview&apos;&gt;here&lt;/a&gt;.</source>
         <translation>И�пользовать &lt;b&gt;Меню-&gt;Вид-&gt;Добавить окно карты&lt;/b&gt; дл� добавлени� нового вида. Или &lt;b&gt;Меню-&gt;Файл-&gt;Загрузить вид карты&lt;/b&gt; дл� во��тановлени� �охраненного вида. Или нажмите &lt;a href=&apos;newview&apos;&gt;зде�ь&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="716"/>
+        <location filename="../CMainWindow.cpp" line="897"/>
         <source>Ele: %1%2</source>
         <translation>Вы�ота: %1%2</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="732"/>
+        <location filename="../CMainWindow.cpp" line="909"/>
+        <source>Slope: %1%2</source>
+        <translation>Склон: %1%2</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="925"/>
         <source>[Grid: %1]</source>
         <translation>[Координатна� �етка: %1]</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="867"/>
+        <location filename="../CMainWindow.cpp" line="1066"/>
         <source>Load GIS Data...</source>
         <translation>Загрузить данные GIS...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
         <source>Select output file</source>
         <translation>Выбрать выходной файл</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>QMapShack View (*.view)</source>
         <translation>QMapShack вид (*.view)</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>Select file to load</source>
         <translation>Выбрать файл дл� загрузки</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1106"/>
+        <location filename="../CMainWindow.cpp" line="1369"/>
         <source>Fatal...</source>
         <translation>�еу�транима� ошибка...</translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1107"/>
+        <location filename="../CMainWindow.cpp" line="1370"/>
         <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>
@@ -2074,620 +2117,632 @@
         <translation>�е удало�ь...</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="157"/>
+        <location filename="../map/CMapIMG.cpp" line="175"/>
         <source>Unspecified</source>
         <translation>�е указано</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="158"/>
+        <location filename="../map/CMapIMG.cpp" line="176"/>
         <source>French</source>
         <translation>Француз�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="159"/>
+        <location filename="../map/CMapIMG.cpp" line="177"/>
         <source>German</source>
         <translation>�емецкий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="160"/>
+        <location filename="../map/CMapIMG.cpp" line="178"/>
         <source>Dutch</source>
         <translation>Голланд�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="161"/>
+        <location filename="../map/CMapIMG.cpp" line="179"/>
         <source>English</source>
         <translation>�нглий�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="162"/>
+        <location filename="../map/CMapIMG.cpp" line="180"/>
         <source>Italian</source>
         <translation>Италь�н�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="163"/>
+        <location filename="../map/CMapIMG.cpp" line="181"/>
         <source>Finnish</source>
         <translation>Фин�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="164"/>
+        <location filename="../map/CMapIMG.cpp" line="182"/>
         <source>Swedish</source>
         <translation>Швед�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="165"/>
+        <location filename="../map/CMapIMG.cpp" line="183"/>
         <source>Spanish</source>
         <translation>И�пан�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="166"/>
+        <location filename="../map/CMapIMG.cpp" line="184"/>
         <source>Basque</source>
         <translation>Ба�к�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="167"/>
+        <location filename="../map/CMapIMG.cpp" line="185"/>
         <source>Catalan</source>
         <translation>Каталон�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="168"/>
+        <location filename="../map/CMapIMG.cpp" line="186"/>
         <source>Galician</source>
         <translation>Гали�ий�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="169"/>
+        <location filename="../map/CMapIMG.cpp" line="187"/>
         <source>Welsh</source>
         <translation>Валлий�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="170"/>
+        <location filename="../map/CMapIMG.cpp" line="188"/>
         <source>Gaelic</source>
         <translation>Г�ль�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="171"/>
+        <location filename="../map/CMapIMG.cpp" line="189"/>
         <source>Danish</source>
         <translation>Дат�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="172"/>
+        <location filename="../map/CMapIMG.cpp" line="190"/>
         <source>Norwegian</source>
         <translation>�орвеж�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="173"/>
+        <location filename="../map/CMapIMG.cpp" line="191"/>
         <source>Portuguese</source>
         <translation>Португаль�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="174"/>
+        <location filename="../map/CMapIMG.cpp" line="192"/>
         <source>Slovak</source>
         <translation>Словацкий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="175"/>
+        <location filename="../map/CMapIMG.cpp" line="193"/>
         <source>Czech</source>
         <translation>Чеш�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="176"/>
+        <location filename="../map/CMapIMG.cpp" line="194"/>
         <source>Croatian</source>
         <translation>Хорват�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="177"/>
+        <location filename="../map/CMapIMG.cpp" line="195"/>
         <source>Hungarian</source>
         <translation>Венгер�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="178"/>
+        <location filename="../map/CMapIMG.cpp" line="196"/>
         <source>Polish</source>
         <translation>Поль�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="179"/>
+        <location filename="../map/CMapIMG.cpp" line="197"/>
         <source>Turkish</source>
         <translation>Турецкий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="180"/>
+        <location filename="../map/CMapIMG.cpp" line="198"/>
         <source>Greek</source>
         <translation>Грече�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="181"/>
+        <location filename="../map/CMapIMG.cpp" line="199"/>
         <source>Slovenian</source>
         <translation>Словен�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="182"/>
+        <location filename="../map/CMapIMG.cpp" line="200"/>
         <source>Russian</source>
         <translation>Ру��кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="183"/>
+        <location filename="../map/CMapIMG.cpp" line="201"/>
         <source>Estonian</source>
         <translation>Э�тон�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="184"/>
+        <location filename="../map/CMapIMG.cpp" line="202"/>
         <source>Latvian</source>
         <translation>Латвий�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="185"/>
+        <location filename="../map/CMapIMG.cpp" line="203"/>
         <source>Romanian</source>
         <translation>Румын�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="186"/>
+        <location filename="../map/CMapIMG.cpp" line="204"/>
         <source>Albanian</source>
         <translation>�лбан�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="187"/>
+        <location filename="../map/CMapIMG.cpp" line="205"/>
         <source>Bosnian</source>
         <translation>Бо�ний�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="188"/>
+        <location filename="../map/CMapIMG.cpp" line="206"/>
         <source>Lithuanian</source>
         <translation>Литов�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="189"/>
+        <location filename="../map/CMapIMG.cpp" line="207"/>
         <source>Serbian</source>
         <translation>Серб�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="190"/>
+        <location filename="../map/CMapIMG.cpp" line="208"/>
         <source>Macedonian</source>
         <translation>Македон�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="191"/>
+        <location filename="../map/CMapIMG.cpp" line="209"/>
         <source>Bulgarian</source>
         <translation>Болгар�кий</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="248"/>
+        <location filename="../map/CMapIMG.cpp" line="266"/>
         <source>Major highway</source>
         <translation>�втомаги�траль</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="249"/>
+        <location filename="../map/CMapIMG.cpp" line="267"/>
         <source>Principal highway</source>
         <translation>Шо��е о�новное</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="250"/>
+        <location filename="../map/CMapIMG.cpp" line="268"/>
         <source>Other highway</source>
         <translation>Прочие загородные дороги</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="251"/>
+        <location filename="../map/CMapIMG.cpp" line="269"/>
         <source>Arterial road</source>
         <translation>Город�ка� маги�траль</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="252"/>
+        <location filename="../map/CMapIMG.cpp" line="270"/>
         <source>Collector road</source>
         <translation>Улица крупна�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="253"/>
+        <location filename="../map/CMapIMG.cpp" line="271"/>
         <source>Residential street</source>
         <translation>Улица мала�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="254"/>
+        <location filename="../map/CMapIMG.cpp" line="272"/>
         <source>Alley/Private road</source>
         <translation>Переулок, внутриквартальный проезд</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="255"/>
+        <location filename="../map/CMapIMG.cpp" line="273"/>
         <source>Highway ramp, low speed</source>
         <translation>�аклонный �ъезд � путепровода</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="256"/>
+        <location filename="../map/CMapIMG.cpp" line="274"/>
         <source>Highway ramp, high speed</source>
         <translation>�аклонный �ъезд � путепровода �коро�тной</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="257"/>
+        <location filename="../map/CMapIMG.cpp" line="275"/>
         <source>Unpaved road</source>
         <translation>Грунтова� дорога</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="258"/>
+        <location filename="../map/CMapIMG.cpp" line="276"/>
         <source>Major highway connector</source>
         <translation>Соединительное шо��е</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="259"/>
+        <location filename="../map/CMapIMG.cpp" line="277"/>
         <source>Roundabout</source>
         <translation>Круговое движение</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="260"/>
+        <location filename="../map/CMapIMG.cpp" line="278"/>
         <source>Railroad</source>
         <translation>Железна� дорога</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="261"/>
+        <location filename="../map/CMapIMG.cpp" line="279"/>
         <source>Shoreline</source>
         <translation>Берегова� лини�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="262"/>
+        <location filename="../map/CMapIMG.cpp" line="280"/>
         <source>Trail</source>
         <translation>Тропа</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="263"/>
+        <location filename="../map/CMapIMG.cpp" line="281"/>
         <source>Stream</source>
         <translation>Ручей</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="264"/>
+        <location filename="../map/CMapIMG.cpp" line="282"/>
         <source>Time zone</source>
         <translation>Граница ча�ового по��а</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="265"/>
-        <location filename="../map/CMapIMG.cpp" line="266"/>
+        <location filename="../map/CMapIMG.cpp" line="283"/>
+        <location filename="../map/CMapIMG.cpp" line="284"/>
         <source>Ferry</source>
         <translation>Паром</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="267"/>
+        <location filename="../map/CMapIMG.cpp" line="285"/>
         <source>State/province border</source>
         <translation>Граница обла�ти</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="268"/>
+        <location filename="../map/CMapIMG.cpp" line="286"/>
         <source>County/parish border</source>
         <translation>Граница района, округа</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="269"/>
+        <location filename="../map/CMapIMG.cpp" line="287"/>
         <source>International border</source>
         <translation>Международна� граница</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="270"/>
+        <location filename="../map/CMapIMG.cpp" line="288"/>
         <source>River</source>
         <translation>Река</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="271"/>
+        <location filename="../map/CMapIMG.cpp" line="289"/>
         <source>Minor land contour</source>
         <translation>Изолини� вы�оты, в�помогательна�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="272"/>
+        <location filename="../map/CMapIMG.cpp" line="290"/>
         <source>Intermediate land contour</source>
         <translation>Изолини� вы�оты, о�новна�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="273"/>
+        <location filename="../map/CMapIMG.cpp" line="291"/>
         <source>Major land contour</source>
         <translation>Изолини� вы�оты, утолщённа�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="274"/>
+        <location filename="../map/CMapIMG.cpp" line="292"/>
         <source>Minor depth contour</source>
         <translation>Изолини� глубины, в�помогательна�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="275"/>
+        <location filename="../map/CMapIMG.cpp" line="293"/>
         <source>Intermediate depth contour</source>
         <translation>Изолини� глубины, о�новна�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="276"/>
+        <location filename="../map/CMapIMG.cpp" line="294"/>
         <source>Major depth contour</source>
         <translation>Изолини� глубины, утолщённа�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="277"/>
+        <location filename="../map/CMapIMG.cpp" line="295"/>
         <source>Intermittent stream</source>
         <translation>Пере�ыхающа� река, ручей или канава</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="278"/>
-        <location filename="../map/CMapIMG.cpp" line="360"/>
+        <location filename="../map/CMapIMG.cpp" line="296"/>
+        <location filename="../map/CMapIMG.cpp" line="378"/>
         <source>Airport runway</source>
         <translation>Взлетно-по�адочна� поло�а</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="279"/>
+        <location filename="../map/CMapIMG.cpp" line="297"/>
         <source>Pipeline</source>
         <translation>Трубопровод</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="280"/>
+        <location filename="../map/CMapIMG.cpp" line="298"/>
         <source>Powerline</source>
         <translation>Лини� �лектропередачи</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="281"/>
+        <location filename="../map/CMapIMG.cpp" line="299"/>
         <source>Marine boundary</source>
         <translation>Мор�ка� граница</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="282"/>
+        <location filename="../map/CMapIMG.cpp" line="300"/>
         <source>Hazard boundary</source>
         <translation>Опа�но�ть дл� плавани�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="347"/>
+        <location filename="../map/CMapIMG.cpp" line="365"/>
         <source>Large urban area (&amp;gt;200K)</source>
         <translation>Город�ка� за�тройка (&amp;gt;200 ты�.ж)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="348"/>
+        <location filename="../map/CMapIMG.cpp" line="366"/>
         <source>Small urban area (&amp;lt;200K)</source>
         <translation>Город�ка� за�тройка (&amp;lt;200 ты�.ж)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="349"/>
+        <location filename="../map/CMapIMG.cpp" line="367"/>
         <source>Rural housing area</source>
         <translation>За�тройка �ель�кого типа</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="350"/>
+        <location filename="../map/CMapIMG.cpp" line="368"/>
         <source>Military base</source>
         <translation>Военна� база</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="351"/>
+        <location filename="../map/CMapIMG.cpp" line="369"/>
         <source>Parking lot</source>
         <translation>�вто�то�нка</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="352"/>
+        <location filename="../map/CMapIMG.cpp" line="370"/>
         <source>Parking garage</source>
         <translation>Гараж</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="353"/>
+        <location filename="../map/CMapIMG.cpp" line="371"/>
         <source>Airport</source>
         <translation>��ропорт</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="354"/>
+        <location filename="../map/CMapIMG.cpp" line="372"/>
         <source>Shopping center</source>
         <translation>Ме�то дл� торговли</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="355"/>
+        <location filename="../map/CMapIMG.cpp" line="373"/>
         <source>Marina</source>
         <translation>При�тань</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="356"/>
+        <location filename="../map/CMapIMG.cpp" line="374"/>
         <source>University/College</source>
         <translation>Универ�итета или колледж</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="357"/>
+        <location filename="../map/CMapIMG.cpp" line="375"/>
         <source>Hospital</source>
         <translation>Больница</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="358"/>
+        <location filename="../map/CMapIMG.cpp" line="376"/>
         <source>Industrial complex</source>
         <translation>Промышленна� зона</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="359"/>
+        <location filename="../map/CMapIMG.cpp" line="377"/>
         <source>Reservation</source>
         <translation>Резерваци�, заповедник</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="361"/>
+        <location filename="../map/CMapIMG.cpp" line="379"/>
         <source>Man-made area</source>
         <translation>Здание, и�ку��твенное �ооружение</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="362"/>
+        <location filename="../map/CMapIMG.cpp" line="380"/>
         <source>Sports complex</source>
         <translation>Спортивный комплек�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="363"/>
+        <location filename="../map/CMapIMG.cpp" line="381"/>
         <source>Golf course</source>
         <translation>Площадка дл� гольфа</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="364"/>
+        <location filename="../map/CMapIMG.cpp" line="382"/>
         <source>Cemetery</source>
         <translation>Кладбище</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="365"/>
-        <location filename="../map/CMapIMG.cpp" line="366"/>
-        <location filename="../map/CMapIMG.cpp" line="367"/>
+        <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>�ациональный парк</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="368"/>
+        <location filename="../map/CMapIMG.cpp" line="386"/>
         <source>City park</source>
         <translation>Город�кой парк</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="369"/>
-        <location filename="../map/CMapIMG.cpp" line="370"/>
-        <location filename="../map/CMapIMG.cpp" line="371"/>
+        <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>Парк регионального значени�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="372"/>
+        <location filename="../map/CMapIMG.cpp" line="390"/>
         <source>Forest</source>
         <translation>Ле�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="373"/>
+        <location filename="../map/CMapIMG.cpp" line="391"/>
         <source>Ocean</source>
         <translation>Море/океан</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="374"/>
-        <location filename="../map/CMapIMG.cpp" line="376"/>
-        <location filename="../map/CMapIMG.cpp" line="386"/>
+        <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>Синий (неизве�тно)</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="375"/>
+        <location filename="../map/CMapIMG.cpp" line="393"/>
         <source>Sea</source>
         <translation>Море</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="377"/>
-        <location filename="../map/CMapIMG.cpp" line="378"/>
-        <location filename="../map/CMapIMG.cpp" line="385"/>
+        <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>Озеро, большое</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="379"/>
-        <location filename="../map/CMapIMG.cpp" line="380"/>
+        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="398"/>
         <source>Medium lake</source>
         <translation>Озеро, �реднее</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="381"/>
-        <location filename="../map/CMapIMG.cpp" line="382"/>
+        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="400"/>
         <source>Small lake</source>
         <translation>Озеро, малое</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="383"/>
-        <location filename="../map/CMapIMG.cpp" line="384"/>
+        <location filename="../map/CMapIMG.cpp" line="401"/>
+        <location filename="../map/CMapIMG.cpp" line="402"/>
         <source>Major lake</source>
         <translation>Озеро, крупное</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="387"/>
+        <location filename="../map/CMapIMG.cpp" line="405"/>
         <source>Major River</source>
         <translation>Река, крупна�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="388"/>
+        <location filename="../map/CMapIMG.cpp" line="406"/>
         <source>Large River</source>
         <translation>Река, больша�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="389"/>
+        <location filename="../map/CMapIMG.cpp" line="407"/>
         <source>Medium River</source>
         <translation>Река, �редн��</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="390"/>
+        <location filename="../map/CMapIMG.cpp" line="408"/>
         <source>Small River</source>
         <translation>Река, мала�</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="393"/>
+        <location filename="../map/CMapIMG.cpp" line="411"/>
         <source>Intermittent water</source>
         <translation>Пере�ыхающа� река, озеро</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="394"/>
+        <location filename="../map/CMapIMG.cpp" line="412"/>
         <source>Wetland/Swamp</source>
         <translation>Болото</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="395"/>
+        <location filename="../map/CMapIMG.cpp" line="413"/>
         <source>Glacier</source>
         <translation>Ледник</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="396"/>
+        <location filename="../map/CMapIMG.cpp" line="414"/>
         <source>Orchard/Plantation</source>
         <translation>Фруктовый �ад, огород</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="415"/>
         <source>Scrub</source>
         <translation>Ку�тарник</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="398"/>
+        <location filename="../map/CMapIMG.cpp" line="416"/>
         <source>Tundra</source>
         <translation>Тундра</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="417"/>
         <source>Flat</source>
         <translation>Равнина</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="400"/>
+        <location filename="../map/CMapIMG.cpp" line="418"/>
         <source>???</source>
         <translation>???</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="436"/>
+        <location filename="../map/CMapIMG.cpp" line="432"/>
+        <source>Read external type file...</source>
+        <translation>Загрузить внешний файл типов...</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="432"/>
+        <source>Failed to read type file: %1
+Fall back to internal types.</source>
+        <translation>�е удало�ь читать файл типов: %1
+Возврат к внутренним типам.</translation>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="474"/>
         <source>Failed to read: </source>
         <translation>�е удало�ь читать: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="479"/>
+        <location filename="../map/CMapIMG.cpp" line="517"/>
         <source>Failed to open: </source>
         <translation>�е удало�ь открыть: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="503"/>
-        <location filename="../map/CMapIMG.cpp" line="507"/>
+        <location filename="../map/CMapIMG.cpp" line="541"/>
+        <location filename="../map/CMapIMG.cpp" line="545"/>
         <source>Bad file format: </source>
         <translation>�еверный формат файла: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="596"/>
+        <location filename="../map/CMapIMG.cpp" line="634"/>
         <source>Failed to read file structure: </source>
         <translation>�е удало�ь читать �труктуру файла: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="631"/>
+        <location filename="../map/CMapIMG.cpp" line="669"/>
         <source>Loading %1</source>
         <translation>Идет загрузка %1</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="637"/>
+        <location filename="../map/CMapIMG.cpp" line="675"/>
         <source>User abort: </source>
         <translation>Прекращение пользователем: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="640"/>
+        <location filename="../map/CMapIMG.cpp" line="678"/>
         <source>File is NT format. QMapShack is unable to read map files with NT format: </source>
         <translation>Файл имеет формат NT. QMapShack не может �читывать �тот формат: </translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="731"/>
+        <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>Файл �одержит заблокированные / зашифрованные данные. Garmin позвол�ет и�пользовать �тот файл только � помощью программного обе�печени� Garmin.</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2342"/>
-        <location filename="../map/CMapIMG.cpp" line="2348"/>
-        <location filename="../map/CMapIMG.cpp" line="2352"/>
+        <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>До�топримечательно�ть</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2438"/>
+        <location filename="../map/CMapIMG.cpp" line="2484"/>
         <source>Unknown</source>
         <translation>�еизве�тно</translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2480"/>
-        <location filename="../map/CMapIMG.cpp" line="2488"/>
-        <location filename="../map/CMapIMG.cpp" line="2495"/>
+        <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>Обла�ть</translation>
     </message>
@@ -2747,6 +2802,14 @@
     </message>
 </context>
 <context>
+    <name>CMapPropSetup</name>
+    <message>
+        <location filename="../map/CMapPropSetup.cpp" line="196"/>
+        <source>Select type file...</source>
+        <translation>Выбрать файл типов...</translation>
+    </message>
+</context>
+<context>
     <name>CMapRMAP</name>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="48"/>
@@ -3180,7 +3243,7 @@
         <translation>И�тёкшее врем�: %1</translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="86"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="87"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation>И�тёкшее врем�: %1 �ек.</translation>
     </message>
@@ -3797,27 +3860,27 @@
         <translation>Ошибка запи�и в файл %1: %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="620"/>
         <source>error renaming file %1 to %2: %3</source>
         <translation>Ошибка переименовани� файла %1 до %2: %3</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+        <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>Верно: %1 (%2), у�тарело: %3 (%4), загрузить: %5 (%6)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
         <source>being downloaded: %1 of %2</source>
         <translation>Загружено: %1 от %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
         <source>no local data, online available: %1 (%2)</source>
         <translation>�ет локальных данных, до�тупно в Интернете: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="798"/>
         <source>local data outdated (%1, %2 - remote %3, %4)</source>
         <translation>Локальные данные у�тарелы (%1, %2 - удаленные %3, %4)</translation>
     </message>
@@ -3837,12 +3900,12 @@
         <translation>�еверный результат, файлы не найдены</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="806"/>
         <source>local data up to date (%1, %2)</source>
         <translation>Локальные данные верны (%1, %2)</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="818"/>
         <source>no routing-data available</source>
         <translation>�ет до�тупных данных маршрутизации</translation>
     </message>
@@ -3850,13 +3913,13 @@
 <context>
     <name>CRouterBRouterToolShell</name>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
         <source>!!! done !!!
 </source>
         <translation>Сделано!</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
         <source>!!! failed !!!
 </source>
         <translation>�е удало�ь!</translation>
@@ -4195,7 +4258,7 @@
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="415"/>
         <source>Calculate route with %1</source>
         <translation>Вычи�лить маршрут � %1</translation>
     </message>
@@ -4573,6 +4636,19 @@
     </message>
 </context>
 <context>
+    <name>CToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="43"/>
+        <source>Available Actions</source>
+        <translation>До�тупные дей�тви�</translation>
+    </message>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="44"/>
+        <source>Selected Actions</source>
+        <translation>Выбранные дей�тви�</translation>
+    </message>
+</context>
+<context>
     <name>CTwoNavProject</name>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
@@ -6167,6 +6243,30 @@
     </message>
 </context>
 <context>
+    <name>IFilterTerrainSlope</name>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="14"/>
+        <source>Form</source>
+        <translatorcomment>Вычи�лить �клон ме�тно�ти</translatorcomment>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="51"/>
+        <source>&lt;b&gt;Calculate Terrain Slope&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Вычи�лить �клон ме�тно�ти&lt;/b&gt;</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>Вычи�лить �клон ме�тно�ти � помощью данных ЦМР.</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"/>
@@ -6347,31 +6447,46 @@
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="49"/>
+        <location filename="../gis/IGisWidget.ui" line="43"/>
         <source>Opacity</source>
         <translation>Прозрачно�ть</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="56"/>
+        <location filename="../gis/IGisWidget.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="108"/>
-        <location filename="../gis/IGisWidget.ui" line="138"/>
+        <location filename="../gis/IGisWidget.ui" line="66"/>
+        <source>Filter</source>
+        <translation>Фильтр</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWidget.ui" line="116"/>
+        <location filename="../gis/IGisWidget.ui" line="146"/>
         <source>Name</source>
         <translation>Им�</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="143"/>
+        <location filename="../gis/IGisWidget.ui" line="151"/>
         <source>Age</source>
         <translation>Срок</translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="177"/>
+        <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"/>
+        <source>Clear Filter</source>
+        <translation>Очи�тить фильтр</translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <source>Setup Filter</source>
+        <translation>�а�тройка фильтра</translation>
+    </message>
 </context>
 <context>
     <name>IGridSetup</name>
@@ -6527,339 +6642,364 @@
         <translation>Окно</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="110"/>
+        <location filename="../IMainWindow.ui" line="112"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="118"/>
+        <location filename="../IMainWindow.ui" line="120"/>
         <source>Project</source>
         <translation>Проект</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="129"/>
+        <location filename="../IMainWindow.ui" line="131"/>
         <source>Tool</source>
         <translation>Ин�трумент</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="154"/>
+        <location filename="../IMainWindow.ui" line="156"/>
         <source>Maps</source>
         <translation>Карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="197"/>
+        <location filename="../IMainWindow.ui" line="199"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation>Цифрова� модель рельефа (ЦМР)</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="236"/>
+        <location filename="../IMainWindow.ui" line="238"/>
         <source>Data</source>
         <translation>Данные</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="254"/>
+        <location filename="../IMainWindow.ui" line="256"/>
         <source>Route</source>
         <translation>Маршрутизаци�</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="288"/>
-        <location filename="../IMainWindow.ui" line="291"/>
+        <location filename="../IMainWindow.ui" line="286"/>
+        <source>Toolbar</source>
+        <translation>Панель ин�трументов</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="301"/>
+        <location filename="../IMainWindow.ui" line="304"/>
         <source>Add Map View</source>
         <translation>Добавить окно карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="294"/>
+        <location filename="../IMainWindow.ui" line="307"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="309"/>
+        <location filename="../IMainWindow.ui" line="322"/>
         <source>Show Scale</source>
         <translation>Показать ма�штаб</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="321"/>
+        <location filename="../IMainWindow.ui" line="334"/>
         <source>Setup Map Font</source>
         <translation>�а�тройка шрифта карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="336"/>
+        <location filename="../IMainWindow.ui" line="349"/>
         <source>Show Grid</source>
         <translation>Показать координатную �етку</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="339"/>
+        <location filename="../IMainWindow.ui" line="352"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="351"/>
+        <location filename="../IMainWindow.ui" line="364"/>
         <source>Setup Grid</source>
         <translation>�а�тройка координатной �етки</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="354"/>
+        <location filename="../IMainWindow.ui" line="367"/>
         <source>Ctrl+Alt+G</source>
         <translation>Ctrl+Alt+G</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="382"/>
         <source>Flip Mouse Wheel</source>
         <translation>Флип коле�о мышки</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="381"/>
-        <location filename="../IMainWindow.ui" line="384"/>
+        <location filename="../IMainWindow.ui" line="394"/>
+        <location filename="../IMainWindow.ui" line="397"/>
         <source>Setup Map Paths</source>
         <translation>�а�тройка пути к картам</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="399"/>
+        <location filename="../IMainWindow.ui" line="412"/>
         <source>POI Text</source>
         <translation>Тек�т дл� точек интере�а</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="414"/>
+        <location filename="../IMainWindow.ui" line="427"/>
         <source>Night / Day</source>
         <translation>�очь/день</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="429"/>
+        <location filename="../IMainWindow.ui" line="442"/>
         <source>Map Tool Tip</source>
         <translation>Под�казка карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="432"/>
+        <location filename="../IMainWindow.ui" line="445"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="444"/>
+        <location filename="../IMainWindow.ui" line="457"/>
         <source>Setup DEM Paths</source>
         <translation>�а�тройка пути к ЦМР</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="456"/>
+        <location filename="../IMainWindow.ui" line="469"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="468"/>
+        <location filename="../IMainWindow.ui" line="481"/>
         <source>Help</source>
         <translation>Справки</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="484"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="483"/>
-        <location filename="../IMainWindow.ui" line="486"/>
+        <location filename="../IMainWindow.ui" line="496"/>
+        <location filename="../IMainWindow.ui" line="499"/>
         <source>Setup Map View</source>
         <translation>�а�тройка вида карт</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="498"/>
+        <location filename="../IMainWindow.ui" line="511"/>
         <source>Load GIS Data</source>
         <translation>Загрузить данные ГИС</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="501"/>
+        <location filename="../IMainWindow.ui" line="514"/>
         <source>Load projects from file</source>
         <translation>Загрузить проекты � файла</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="504"/>
+        <location filename="../IMainWindow.ui" line="517"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="516"/>
+        <location filename="../IMainWindow.ui" line="529"/>
         <source>Save All GIS Data</source>
         <translation>Сохранить в�е данные ГИС</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="519"/>
+        <location filename="../IMainWindow.ui" line="532"/>
         <source>Save all projects in the workspace</source>
         <translation>Сохранить в�е проекты в рабочей обла�ти</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="522"/>
+        <location filename="../IMainWindow.ui" line="535"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="534"/>
+        <location filename="../IMainWindow.ui" line="547"/>
         <source>Setup Time Zone</source>
         <translation>�а�тройка ча�ового по��а</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="546"/>
+        <location filename="../IMainWindow.ui" line="559"/>
         <source>Add empty project</source>
         <translation>Добавить пу�той проект</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="561"/>
+        <location filename="../IMainWindow.ui" line="574"/>
         <source>Search Google</source>
         <translation>Пои�к в Google</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="573"/>
+        <location filename="../IMainWindow.ui" line="586"/>
         <source>Close all projects</source>
         <translation>Закрыть в�е проекты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="576"/>
+        <location filename="../IMainWindow.ui" line="589"/>
         <source>F8</source>
         <translation>F8</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="588"/>
+        <location filename="../IMainWindow.ui" line="601"/>
         <source>Setup Units</source>
         <translation>�а�тройка единиц</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="600"/>
+        <location filename="../IMainWindow.ui" line="613"/>
         <source>Setup Workspace</source>
         <translation>�а�тройка рабочей обла�ти</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="603"/>
+        <location filename="../IMainWindow.ui" line="616"/>
         <source>Setup save on exit.</source>
         <translation>�а�тройка рабочей обла�ти.</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="615"/>
+        <location filename="../IMainWindow.ui" line="628"/>
         <source>Import Database from QLandkarte</source>
         <translation>Импортировать базу данных QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="618"/>
+        <location filename="../IMainWindow.ui" line="631"/>
         <source>Import QLandkarte GT database</source>
         <translation>Импортировать базу данных QLandkarte</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="630"/>
+        <location filename="../IMainWindow.ui" line="643"/>
         <source>VRT Builder</source>
         <translation>Создать файл VRT</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="633"/>
+        <location filename="../IMainWindow.ui" line="646"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation>Графиче�кий интерфей� к gdalbuildvrt</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="645"/>
+        <location filename="../IMainWindow.ui" line="658"/>
         <source>Store Map View</source>
         <translation>Сохранить вид карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="648"/>
+        <location filename="../IMainWindow.ui" line="661"/>
         <source>Write current active map and DEM list including the properties to a file</source>
         <translation>Сохранить вид карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="660"/>
+        <location filename="../IMainWindow.ui" line="673"/>
         <source>Load Map View</source>
         <translation>Загрузить вид карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="663"/>
+        <location filename="../IMainWindow.ui" line="676"/>
         <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="678"/>
+        <location filename="../IMainWindow.ui" line="691"/>
         <source>Ext. Profile</source>
         <translation>Ра�ширенный профиль</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="681"/>
+        <location filename="../IMainWindow.ui" line="694"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="693"/>
+        <location filename="../IMainWindow.ui" line="706"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="696"/>
+        <location filename="../IMainWindow.ui" line="709"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="708"/>
+        <location filename="../IMainWindow.ui" line="721"/>
         <source>Clone Map View</source>
         <translation>Клонировать вид карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="711"/>
+        <location filename="../IMainWindow.ui" line="724"/>
         <source>Ctrl+Shift+T</source>
         <translation>Ctrl+Shift+T</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="723"/>
+        <location filename="../IMainWindow.ui" line="736"/>
         <source>Create Routino Database</source>
         <translation>Создать базу данных Routino</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="735"/>
+        <location filename="../IMainWindow.ui" line="748"/>
         <source>Save(Print) Map Screenshot</source>
         <translation>Сохранить (Печатать) �нимок �крана карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="738"/>
+        <location filename="../IMainWindow.ui" line="751"/>
         <source>Print a selected area of the map</source>
         <translation>Печатать выбранную обла�ть карты</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="741"/>
+        <location filename="../IMainWindow.ui" line="754"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="753"/>
+        <location filename="../IMainWindow.ui" line="766"/>
         <source>Setup Coord. Format</source>
         <translation>�а�тройка формата координат</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="756"/>
+        <location filename="../IMainWindow.ui" line="769"/>
         <source>Change the format coordinates are displayed</source>
         <translation>Изменить формат отображени� координат</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="768"/>
+        <location filename="../IMainWindow.ui" line="781"/>
         <source>Setup Map Background</source>
         <translation>�а�тройка фона карт</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="780"/>
+        <location filename="../IMainWindow.ui" line="793"/>
         <source>Setup Waypoint Icons</source>
         <translation>�а�тройка пиктограмм дл� маршрутных точек</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="783"/>
+        <location filename="../IMainWindow.ui" line="796"/>
         <source>Setup path to custom icons</source>
         <translation>�а�тройка пути к пользователь�ким пиктограммам</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="792"/>
+        <location filename="../IMainWindow.ui" line="805"/>
         <source>Close Tab</source>
         <translation>Закрыть вкладку</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="795"/>
+        <location filename="../IMainWindow.ui" line="808"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="804"/>
+        <location filename="../IMainWindow.ui" line="817"/>
         <source>Quickstart Help</source>
         <translation>Помощь дл� бы�трого �тарта</translation>
     </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="826"/>
+        <source>Setup Toolbar</source>
+        <translation>�а�тройка панели ин�трументов</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="838"/>
+        <source>Toggle Docks</source>
+        <translation>Переключить закрепленные окна</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="841"/>
+        <source>Toggle visibility of dockable windows</source>
+        <translation>Переключить видимо�ть закрепленных окон</translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="844"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
 </context>
 <context>
     <name>IMapList</name>
@@ -6969,6 +7109,8 @@
     <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>
@@ -7022,6 +7164,21 @@
         <source>Cache Path</source>
         <translation>Путь к к�шу</translation>
     </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="353"/>
+        <source>Type File:</source>
+        <translation>Файл типов:</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="367"/>
+        <source>Forget external type file and use internal types.</source>
+        <translation>Забыть внешний файл типов и и�пользовать внутренние типы.</translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="381"/>
+        <source>Load an external type file.</source>
+        <translation>Загрузить внешний файл типов.</translation>
+    </message>
 </context>
 <context>
     <name>IMapVrtBuilder</name>
@@ -8144,8 +8301,8 @@
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="222"/>
-        <source>Select all itmes that are completely inside the selected area.</source>
-        <translation>Выбрать в�е �лементы, которые наход�т�� полно�тью внутри выбранной обла�ти.</translation>
+        <source>Select all items that are completely inside the selected area.</source>
+        <translation>Выбрать в�е �лементы полно�тью внутри выбранной обла�ти.</translation>
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="282"/>
@@ -8419,6 +8576,52 @@
     </message>
 </context>
 <context>
+    <name>ISelectDoubleListWidget</name>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="22"/>
+        <source>Available</source>
+        <translation>До�тупно</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="46"/>
+        <source>Add to selected items</source>
+        <translation>Добавить к выбранным �лементам</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="60"/>
+        <source>Remove from selected items</source>
+        <translation>Удалить из выбранных �лементов</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="78"/>
+        <source>Selected</source>
+        <translation>Выбрано</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="102"/>
+        <source>Move selected items up</source>
+        <translation>Переме�тить выбранные �лементы вверх</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="116"/>
+        <source>Move selected items down</source>
+        <translation>Переме�тить выбранные �лементы вниз</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"/>
@@ -8597,6 +8800,29 @@
     </message>
 </context>
 <context>
+    <name>ISetupFilter</name>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="38"/>
+        <source>Apply filter to</source>
+        <translation>Применить фильтр</translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="45"/>
+        <source>name only</source>
+        <translation>только к имени</translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="52"/>
+        <source>complete text</source>
+        <translation>к полному тек�ту</translation>
+    </message>
+</context>
+<context>
     <name>ISetupFolder</name>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="14"/>
@@ -9031,6 +9257,14 @@
     </message>
 </context>
 <context>
+    <name>IToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/IToolBarSetupDialog.ui" line="14"/>
+        <source>Setup Toolbar</source>
+        <translation>�а�тройка панели ин�трументов</translation>
+    </message>
+</context>
+<context>
     <name>IToolShell</name>
     <message>
         <location filename="../tool/IToolShell.cpp" line="46"/>
diff -Nru qmapshack-1.8.1/src/locale/qmapshack.ts qmapshack-1.9.0/src/locale/qmapshack.ts
--- qmapshack-1.8.1/src/locale/qmapshack.ts	2017-04-15 15:35:44.000000000 +0000
+++ qmapshack-1.9.0/src/locale/qmapshack.ts	2017-07-23 13:41:03.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="de_DE">
 <context>
     <name>CAbout</name>
     <message>
@@ -122,7 +122,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="695"/>
+        <location filename="../canvas/CCanvas.cpp" line="705"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
@@ -555,32 +555,32 @@
 <context>
     <name>CDetailsTrk</name>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Reduce visible track points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change elevation of track points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Change timestamp of track points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
         <source>Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -611,7 +611,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="1063"/>
+        <location filename="../gis/gpx/serialization.cpp" line="1068"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -724,7 +724,7 @@
 <context>
     <name>CFitDecoder</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="119"/>
+        <location filename="../gis/fit/decoder/CFitDecoder.cpp" line="132"/>
         <source>FIT decoding error: unexpected end of file %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -740,12 +740,12 @@
 <context>
     <name>CFitFieldDataState</name>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="115"/>
+        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="116"/>
         <source>Missing field definition for development field.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitFieldDataState.cpp" line="207"/>
+        <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>
     </message>
@@ -784,7 +784,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="107"/>
+        <location filename="../gis/fit/decoder/CFitRecordContentState.cpp" line="110"/>
         <source>FIT decoding error: invalid offset %1 for state &apos;record content&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -968,7 +968,7 @@
 <context>
     <name>CGisItemTrk</name>
     <message>
-        <location filename="../gis/fit/serialization.cpp" line="247"/>
+        <location filename="../gis/fit/serialization.cpp" line="246"/>
         <source>FIT file %1 contains no GPS data.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1224,37 +1224,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
         <source>Changed name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
         <source>Changed comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
         <source>Changed description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2012"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
         <source>Changed links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2023"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2047"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2041"/>
         <source>Changed activity to &apos;%1&apos; for complete track.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2086"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
         <source>Changed activity to &apos;%1&apos; for range(%2..%3).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1285,51 +1285,56 @@
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="221"/>
+        <source>Added terrain slope from DEM file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/filter.cpp" line="243"/>
         <source>Replaced elevation data with data from DEM files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="239"/>
+        <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>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="255"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="277"/>
         <source>Offset elevation data by %1%2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="268"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="290"/>
         <source>Changed start of track to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="281"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="303"/>
         <source>Remove timestamps.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="298"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="320"/>
         <source>Set artificial timestamps with delta of %1 sec.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="324"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="346"/>
         <source>Changed speed to %1%2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="343"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="365"/>
         <source>%1 (Segment %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="361"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="383"/>
         <source>Removed extension %1 from all Track Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/filter/filter.cpp" line="372"/>
+        <location filename="../gis/trk/filter/filter.cpp" line="394"/>
         <source>Converted subpoints from routing to track points</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1342,17 +1347,17 @@
 <context>
     <name>CGisItemWpt</name>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="604"/>
+        <location filename="../gis/gpx/serialization.cpp" line="609"/>
         <source>Archived</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="608"/>
+        <location filename="../gis/gpx/serialization.cpp" line="613"/>
         <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/serialization.cpp" line="612"/>
+        <location filename="../gis/gpx/serialization.cpp" line="617"/>
         <source>Not Available</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1743,8 +1748,8 @@
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="652"/>
-        <location filename="../gis/CGisListWks.cpp" line="1650"/>
-        <location filename="../gis/CGisListWks.cpp" line="1688"/>
+        <location filename="../gis/CGisListWks.cpp" line="1646"/>
+        <location filename="../gis/CGisListWks.cpp" line="1684"/>
         <source>&lt;b&gt;Update devices&lt;/b&gt;&lt;p&gt;Update %1&lt;br/&gt;Please wait...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1782,27 +1787,32 @@
 <context>
     <name>CGisWidget</name>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>Load project...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="110"/>
+        <location filename="../gis/CGisWidget.cpp" line="117"/>
         <source>The project &quot;%1&quot; is already in the workspace.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="515"/>
+        <location filename="../gis/CGisWidget.cpp" line="554"/>
         <source>Copy items...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="573"/>
+        <source>Change waypoint symbols.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Cut Track...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisWidget.cpp" line="664"/>
+        <location filename="../gis/CGisWidget.cpp" line="702"/>
         <source>Do you want to delete the original track?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1832,27 +1842,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="268"/>
         <source>File exists ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="269"/>
         <source>The file exists and it has not been created by QMapShack. If you press &apos;yes&apos; 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. &lt;b&gt;Do you really want to overwrite the file?&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="386"/>
         <source>Failed to create file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="392"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="396"/>
         <source>Failed to write file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="404"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="408"/>
         <source>Saving GIS data failed...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1883,27 +1893,27 @@
 <context>
     <name>CHistoryListWidget</name>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="62"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="65"/>
         <source> by %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="108"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
         <source>Cut history before</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="113"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="38"/>
         <source>Cut history after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="161"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="155"/>
         <source>History removal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/CHistoryListWidget.cpp" line="162"/>
+        <location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
         <source>The removal is permanent and cannot be undone. &lt;b&gt;Do you really want to delete history before this step?&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1929,67 +1939,95 @@
 <context>
     <name>CKnownExtension</name>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="62"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="65"/>
         <source>Air Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="66"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="69"/>
         <source>Water Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="70"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="73"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="74"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="86"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="77"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="89"/>
         <source>Heart Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="78"/>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="90"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="94"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="98"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="101"/>
         <source>Acceleration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="102"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="105"/>
         <source>Course</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="111"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <source>Temperature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+        <source>Sea Level Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+        <source>Speed (vertical)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
         <source>Slope*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
         <source>Speed*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="121"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
         <source>Elevation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CKnownExtension.cpp" line="126"/>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+        <source>Terrain slope</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CLostFoundProject</name>
@@ -2002,48 +2040,53 @@
 <context>
     <name>CMainWindow</name>
     <message>
-        <location filename="../CMainWindow.cpp" line="588"/>
+        <location filename="../CMainWindow.cpp" line="769"/>
         <source>Use &lt;b&gt;Menu-&gt;View-&gt;Add Map View&lt;/b&gt; to open a new view. Or &lt;b&gt;Menu-&gt;File-&gt;Load Map View&lt;/b&gt; to restore a saved one. Or click &lt;a href=&apos;newview&apos;&gt;here&lt;/a&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="716"/>
+        <location filename="../CMainWindow.cpp" line="897"/>
         <source>Ele: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="732"/>
+        <location filename="../CMainWindow.cpp" line="909"/>
+        <source>Slope: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="925"/>
         <source>[Grid: %1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="867"/>
+        <location filename="../CMainWindow.cpp" line="1066"/>
         <source>Load GIS Data...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
         <source>Select output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="901"/>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1100"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>QMapShack View (*.view)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="927"/>
+        <location filename="../CMainWindow.cpp" line="1126"/>
         <source>Select file to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1106"/>
+        <location filename="../CMainWindow.cpp" line="1369"/>
         <source>Fatal...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../CMainWindow.cpp" line="1107"/>
+        <location filename="../CMainWindow.cpp" line="1370"/>
         <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>
@@ -2066,620 +2109,631 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="157"/>
+        <location filename="../map/CMapIMG.cpp" line="175"/>
         <source>Unspecified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="158"/>
+        <location filename="../map/CMapIMG.cpp" line="176"/>
         <source>French</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="159"/>
+        <location filename="../map/CMapIMG.cpp" line="177"/>
         <source>German</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="160"/>
+        <location filename="../map/CMapIMG.cpp" line="178"/>
         <source>Dutch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="161"/>
+        <location filename="../map/CMapIMG.cpp" line="179"/>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="162"/>
+        <location filename="../map/CMapIMG.cpp" line="180"/>
         <source>Italian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="163"/>
+        <location filename="../map/CMapIMG.cpp" line="181"/>
         <source>Finnish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="164"/>
+        <location filename="../map/CMapIMG.cpp" line="182"/>
         <source>Swedish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="165"/>
+        <location filename="../map/CMapIMG.cpp" line="183"/>
         <source>Spanish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="166"/>
+        <location filename="../map/CMapIMG.cpp" line="184"/>
         <source>Basque</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="167"/>
+        <location filename="../map/CMapIMG.cpp" line="185"/>
         <source>Catalan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="168"/>
+        <location filename="../map/CMapIMG.cpp" line="186"/>
         <source>Galician</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="169"/>
+        <location filename="../map/CMapIMG.cpp" line="187"/>
         <source>Welsh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="170"/>
+        <location filename="../map/CMapIMG.cpp" line="188"/>
         <source>Gaelic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="171"/>
+        <location filename="../map/CMapIMG.cpp" line="189"/>
         <source>Danish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="172"/>
+        <location filename="../map/CMapIMG.cpp" line="190"/>
         <source>Norwegian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="173"/>
+        <location filename="../map/CMapIMG.cpp" line="191"/>
         <source>Portuguese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="174"/>
+        <location filename="../map/CMapIMG.cpp" line="192"/>
         <source>Slovak</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="175"/>
+        <location filename="../map/CMapIMG.cpp" line="193"/>
         <source>Czech</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="176"/>
+        <location filename="../map/CMapIMG.cpp" line="194"/>
         <source>Croatian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="177"/>
+        <location filename="../map/CMapIMG.cpp" line="195"/>
         <source>Hungarian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="178"/>
+        <location filename="../map/CMapIMG.cpp" line="196"/>
         <source>Polish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="179"/>
+        <location filename="../map/CMapIMG.cpp" line="197"/>
         <source>Turkish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="180"/>
+        <location filename="../map/CMapIMG.cpp" line="198"/>
         <source>Greek</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="181"/>
+        <location filename="../map/CMapIMG.cpp" line="199"/>
         <source>Slovenian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="182"/>
+        <location filename="../map/CMapIMG.cpp" line="200"/>
         <source>Russian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="183"/>
+        <location filename="../map/CMapIMG.cpp" line="201"/>
         <source>Estonian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="184"/>
+        <location filename="../map/CMapIMG.cpp" line="202"/>
         <source>Latvian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="185"/>
+        <location filename="../map/CMapIMG.cpp" line="203"/>
         <source>Romanian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="186"/>
+        <location filename="../map/CMapIMG.cpp" line="204"/>
         <source>Albanian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="187"/>
+        <location filename="../map/CMapIMG.cpp" line="205"/>
         <source>Bosnian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="188"/>
+        <location filename="../map/CMapIMG.cpp" line="206"/>
         <source>Lithuanian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="189"/>
+        <location filename="../map/CMapIMG.cpp" line="207"/>
         <source>Serbian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="190"/>
+        <location filename="../map/CMapIMG.cpp" line="208"/>
         <source>Macedonian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="191"/>
+        <location filename="../map/CMapIMG.cpp" line="209"/>
         <source>Bulgarian</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="248"/>
+        <location filename="../map/CMapIMG.cpp" line="266"/>
         <source>Major highway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="249"/>
+        <location filename="../map/CMapIMG.cpp" line="267"/>
         <source>Principal highway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="250"/>
+        <location filename="../map/CMapIMG.cpp" line="268"/>
         <source>Other highway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="251"/>
+        <location filename="../map/CMapIMG.cpp" line="269"/>
         <source>Arterial road</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="252"/>
+        <location filename="../map/CMapIMG.cpp" line="270"/>
         <source>Collector road</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="253"/>
+        <location filename="../map/CMapIMG.cpp" line="271"/>
         <source>Residential street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="254"/>
+        <location filename="../map/CMapIMG.cpp" line="272"/>
         <source>Alley/Private road</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="255"/>
+        <location filename="../map/CMapIMG.cpp" line="273"/>
         <source>Highway ramp, low speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="256"/>
+        <location filename="../map/CMapIMG.cpp" line="274"/>
         <source>Highway ramp, high speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="257"/>
+        <location filename="../map/CMapIMG.cpp" line="275"/>
         <source>Unpaved road</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="258"/>
+        <location filename="../map/CMapIMG.cpp" line="276"/>
         <source>Major highway connector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="259"/>
+        <location filename="../map/CMapIMG.cpp" line="277"/>
         <source>Roundabout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="260"/>
+        <location filename="../map/CMapIMG.cpp" line="278"/>
         <source>Railroad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="261"/>
+        <location filename="../map/CMapIMG.cpp" line="279"/>
         <source>Shoreline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="262"/>
+        <location filename="../map/CMapIMG.cpp" line="280"/>
         <source>Trail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="263"/>
+        <location filename="../map/CMapIMG.cpp" line="281"/>
         <source>Stream</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="264"/>
+        <location filename="../map/CMapIMG.cpp" line="282"/>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="265"/>
-        <location filename="../map/CMapIMG.cpp" line="266"/>
+        <location filename="../map/CMapIMG.cpp" line="283"/>
+        <location filename="../map/CMapIMG.cpp" line="284"/>
         <source>Ferry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="267"/>
+        <location filename="../map/CMapIMG.cpp" line="285"/>
         <source>State/province border</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="268"/>
+        <location filename="../map/CMapIMG.cpp" line="286"/>
         <source>County/parish border</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="269"/>
+        <location filename="../map/CMapIMG.cpp" line="287"/>
         <source>International border</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="270"/>
+        <location filename="../map/CMapIMG.cpp" line="288"/>
         <source>River</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="271"/>
+        <location filename="../map/CMapIMG.cpp" line="289"/>
         <source>Minor land contour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="272"/>
+        <location filename="../map/CMapIMG.cpp" line="290"/>
         <source>Intermediate land contour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="273"/>
+        <location filename="../map/CMapIMG.cpp" line="291"/>
         <source>Major land contour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="274"/>
+        <location filename="../map/CMapIMG.cpp" line="292"/>
         <source>Minor depth contour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="275"/>
+        <location filename="../map/CMapIMG.cpp" line="293"/>
         <source>Intermediate depth contour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="276"/>
+        <location filename="../map/CMapIMG.cpp" line="294"/>
         <source>Major depth contour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="277"/>
+        <location filename="../map/CMapIMG.cpp" line="295"/>
         <source>Intermittent stream</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="278"/>
-        <location filename="../map/CMapIMG.cpp" line="360"/>
+        <location filename="../map/CMapIMG.cpp" line="296"/>
+        <location filename="../map/CMapIMG.cpp" line="378"/>
         <source>Airport runway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="279"/>
+        <location filename="../map/CMapIMG.cpp" line="297"/>
         <source>Pipeline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="280"/>
+        <location filename="../map/CMapIMG.cpp" line="298"/>
         <source>Powerline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="281"/>
+        <location filename="../map/CMapIMG.cpp" line="299"/>
         <source>Marine boundary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="282"/>
+        <location filename="../map/CMapIMG.cpp" line="300"/>
         <source>Hazard boundary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="347"/>
+        <location filename="../map/CMapIMG.cpp" line="365"/>
         <source>Large urban area (&amp;gt;200K)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="348"/>
+        <location filename="../map/CMapIMG.cpp" line="366"/>
         <source>Small urban area (&amp;lt;200K)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="349"/>
+        <location filename="../map/CMapIMG.cpp" line="367"/>
         <source>Rural housing area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="350"/>
+        <location filename="../map/CMapIMG.cpp" line="368"/>
         <source>Military base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="351"/>
+        <location filename="../map/CMapIMG.cpp" line="369"/>
         <source>Parking lot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="352"/>
+        <location filename="../map/CMapIMG.cpp" line="370"/>
         <source>Parking garage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="353"/>
+        <location filename="../map/CMapIMG.cpp" line="371"/>
         <source>Airport</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="354"/>
+        <location filename="../map/CMapIMG.cpp" line="372"/>
         <source>Shopping center</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="355"/>
+        <location filename="../map/CMapIMG.cpp" line="373"/>
         <source>Marina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="356"/>
+        <location filename="../map/CMapIMG.cpp" line="374"/>
         <source>University/College</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="357"/>
+        <location filename="../map/CMapIMG.cpp" line="375"/>
         <source>Hospital</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="358"/>
+        <location filename="../map/CMapIMG.cpp" line="376"/>
         <source>Industrial complex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="359"/>
+        <location filename="../map/CMapIMG.cpp" line="377"/>
         <source>Reservation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="361"/>
+        <location filename="../map/CMapIMG.cpp" line="379"/>
         <source>Man-made area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="362"/>
+        <location filename="../map/CMapIMG.cpp" line="380"/>
         <source>Sports complex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="363"/>
+        <location filename="../map/CMapIMG.cpp" line="381"/>
         <source>Golf course</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="364"/>
+        <location filename="../map/CMapIMG.cpp" line="382"/>
         <source>Cemetery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="365"/>
-        <location filename="../map/CMapIMG.cpp" line="366"/>
-        <location filename="../map/CMapIMG.cpp" line="367"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="368"/>
+        <location filename="../map/CMapIMG.cpp" line="386"/>
         <source>City park</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="369"/>
-        <location filename="../map/CMapIMG.cpp" line="370"/>
-        <location filename="../map/CMapIMG.cpp" line="371"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="372"/>
+        <location filename="../map/CMapIMG.cpp" line="390"/>
         <source>Forest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="373"/>
+        <location filename="../map/CMapIMG.cpp" line="391"/>
         <source>Ocean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="374"/>
-        <location filename="../map/CMapIMG.cpp" line="376"/>
-        <location filename="../map/CMapIMG.cpp" line="386"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="375"/>
+        <location filename="../map/CMapIMG.cpp" line="393"/>
         <source>Sea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="377"/>
-        <location filename="../map/CMapIMG.cpp" line="378"/>
-        <location filename="../map/CMapIMG.cpp" line="385"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="379"/>
-        <location filename="../map/CMapIMG.cpp" line="380"/>
+        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="398"/>
         <source>Medium lake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="381"/>
-        <location filename="../map/CMapIMG.cpp" line="382"/>
+        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="400"/>
         <source>Small lake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="383"/>
-        <location filename="../map/CMapIMG.cpp" line="384"/>
+        <location filename="../map/CMapIMG.cpp" line="401"/>
+        <location filename="../map/CMapIMG.cpp" line="402"/>
         <source>Major lake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="387"/>
+        <location filename="../map/CMapIMG.cpp" line="405"/>
         <source>Major River</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="388"/>
+        <location filename="../map/CMapIMG.cpp" line="406"/>
         <source>Large River</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="389"/>
+        <location filename="../map/CMapIMG.cpp" line="407"/>
         <source>Medium River</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="390"/>
+        <location filename="../map/CMapIMG.cpp" line="408"/>
         <source>Small River</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="393"/>
+        <location filename="../map/CMapIMG.cpp" line="411"/>
         <source>Intermittent water</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="394"/>
+        <location filename="../map/CMapIMG.cpp" line="412"/>
         <source>Wetland/Swamp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="395"/>
+        <location filename="../map/CMapIMG.cpp" line="413"/>
         <source>Glacier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="396"/>
+        <location filename="../map/CMapIMG.cpp" line="414"/>
         <source>Orchard/Plantation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="397"/>
+        <location filename="../map/CMapIMG.cpp" line="415"/>
         <source>Scrub</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="398"/>
+        <location filename="../map/CMapIMG.cpp" line="416"/>
         <source>Tundra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="399"/>
+        <location filename="../map/CMapIMG.cpp" line="417"/>
         <source>Flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="400"/>
+        <location filename="../map/CMapIMG.cpp" line="418"/>
         <source>???</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="436"/>
+        <location filename="../map/CMapIMG.cpp" line="432"/>
+        <source>Read external type file...</source>
+        <translation type="unfinished"></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>
+    </message>
+    <message>
+        <location filename="../map/CMapIMG.cpp" line="474"/>
         <source>Failed to read: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="479"/>
+        <location filename="../map/CMapIMG.cpp" line="517"/>
         <source>Failed to open: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="503"/>
-        <location filename="../map/CMapIMG.cpp" line="507"/>
+        <location filename="../map/CMapIMG.cpp" line="541"/>
+        <location filename="../map/CMapIMG.cpp" line="545"/>
         <source>Bad file format: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="596"/>
+        <location filename="../map/CMapIMG.cpp" line="634"/>
         <source>Failed to read file structure: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="631"/>
+        <location filename="../map/CMapIMG.cpp" line="669"/>
         <source>Loading %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="637"/>
+        <location filename="../map/CMapIMG.cpp" line="675"/>
         <source>User abort: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="640"/>
+        <location filename="../map/CMapIMG.cpp" line="678"/>
         <source>File is NT format. QMapShack is unable to read map files with NT format: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="731"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2342"/>
-        <location filename="../map/CMapIMG.cpp" line="2348"/>
-        <location filename="../map/CMapIMG.cpp" line="2352"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2438"/>
+        <location filename="../map/CMapIMG.cpp" line="2484"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapIMG.cpp" line="2480"/>
-        <location filename="../map/CMapIMG.cpp" line="2488"/>
-        <location filename="../map/CMapIMG.cpp" line="2495"/>
+        <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 type="unfinished"></translation>
     </message>
@@ -2739,6 +2793,14 @@
     </message>
 </context>
 <context>
+    <name>CMapPropSetup</name>
+    <message>
+        <location filename="../map/CMapPropSetup.cpp" line="196"/>
+        <source>Select type file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CMapRMAP</name>
     <message>
         <location filename="../map/CMapRMAP.cpp" line="48"/>
@@ -3163,7 +3225,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../helpers/CProgressDialog.cpp" line="86"/>
+        <location filename="../helpers/CProgressDialog.cpp" line="87"/>
         <source>Elapsed time: %1 seconds.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3739,22 +3801,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="685"/>
+        <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>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="783"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="792"/>
         <source>being downloaded: %1 of %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="803"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="812"/>
         <source>no local data, online available: %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="789"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="798"/>
         <source>local data outdated (%1, %2 - remote %3, %4)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3812,17 +3874,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="602"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="620"/>
         <source>error renaming file %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="797"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="806"/>
         <source>local data up to date (%1, %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="809"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="818"/>
         <source>no routing-data available</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3830,13 +3892,13 @@
 <context>
     <name>CRouterBRouterToolShell</name>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="74"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="78"/>
         <source>!!! done !!!
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="79"/>
+        <location filename="../gis/rte/router/brouter/CRouterBRouterToolShell.cpp" line="83"/>
         <source>!!! failed !!!
 </source>
         <translation type="unfinished"></translation>
@@ -4175,7 +4237,7 @@
     </message>
     <message>
         <location filename="../gis/rte/router/CRouterRoutino.cpp" line="332"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="419"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="415"/>
         <source>Calculate route with %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4549,6 +4611,19 @@
     </message>
 </context>
 <context>
+    <name>CToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="43"/>
+        <source>Available Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../helpers/CToolBarSetupDialog.cpp" line="44"/>
+        <source>Selected Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CTwoNavProject</name>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
@@ -6133,6 +6208,29 @@
     </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>&lt;b&gt;Calculate Terrain Slope&lt;/b&gt;</source>
+        <translation type="unfinished"></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>
+    </message>
+    <message>
+        <location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="70"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IFitDecoderState</name>
     <message>
         <location filename="../gis/fit/decoder/IFitDecoderState.cpp" line="31"/>
@@ -6311,31 +6409,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="49"/>
+        <location filename="../gis/IGisWidget.ui" line="43"/>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="56"/>
+        <location filename="../gis/IGisWidget.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="108"/>
-        <location filename="../gis/IGisWidget.ui" line="138"/>
+        <location filename="../gis/IGisWidget.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"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="143"/>
+        <location filename="../gis/IGisWidget.ui" line="151"/>
         <source>Age</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisWidget.ui" line="177"/>
+        <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"/>
+        <source>Clear Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/IGisWidget.ui" line="214"/>
+        <source>Setup Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IGridSetup</name>
@@ -6491,338 +6604,363 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="110"/>
+        <location filename="../IMainWindow.ui" line="112"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="118"/>
+        <location filename="../IMainWindow.ui" line="120"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="129"/>
+        <location filename="../IMainWindow.ui" line="131"/>
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="154"/>
+        <location filename="../IMainWindow.ui" line="156"/>
         <source>Maps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="197"/>
+        <location filename="../IMainWindow.ui" line="199"/>
         <source>Dig. Elev. Model (DEM)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="236"/>
+        <location filename="../IMainWindow.ui" line="238"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="254"/>
+        <location filename="../IMainWindow.ui" line="256"/>
         <source>Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="288"/>
-        <location filename="../IMainWindow.ui" line="291"/>
+        <location filename="../IMainWindow.ui" line="286"/>
+        <source>Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="301"/>
+        <location filename="../IMainWindow.ui" line="304"/>
         <source>Add Map View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="294"/>
+        <location filename="../IMainWindow.ui" line="307"/>
         <source>Ctrl+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="309"/>
+        <location filename="../IMainWindow.ui" line="322"/>
         <source>Show Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="321"/>
+        <location filename="../IMainWindow.ui" line="334"/>
         <source>Setup Map Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="336"/>
+        <location filename="../IMainWindow.ui" line="349"/>
         <source>Show Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="339"/>
+        <location filename="../IMainWindow.ui" line="352"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="351"/>
+        <location filename="../IMainWindow.ui" line="364"/>
         <source>Setup Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="354"/>
+        <location filename="../IMainWindow.ui" line="367"/>
         <source>Ctrl+Alt+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="369"/>
+        <location filename="../IMainWindow.ui" line="382"/>
         <source>Flip Mouse Wheel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="381"/>
-        <location filename="../IMainWindow.ui" line="384"/>
+        <location filename="../IMainWindow.ui" line="394"/>
+        <location filename="../IMainWindow.ui" line="397"/>
         <source>Setup Map Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="399"/>
+        <location filename="../IMainWindow.ui" line="412"/>
         <source>POI Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="414"/>
+        <location filename="../IMainWindow.ui" line="427"/>
         <source>Night / Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="429"/>
+        <location filename="../IMainWindow.ui" line="442"/>
         <source>Map Tool Tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="432"/>
+        <location filename="../IMainWindow.ui" line="445"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="444"/>
+        <location filename="../IMainWindow.ui" line="457"/>
         <source>Setup DEM Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="456"/>
+        <location filename="../IMainWindow.ui" line="469"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="468"/>
+        <location filename="../IMainWindow.ui" line="481"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="471"/>
+        <location filename="../IMainWindow.ui" line="484"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="483"/>
-        <location filename="../IMainWindow.ui" line="486"/>
+        <location filename="../IMainWindow.ui" line="496"/>
+        <location filename="../IMainWindow.ui" line="499"/>
         <source>Setup Map View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="498"/>
+        <location filename="../IMainWindow.ui" line="511"/>
         <source>Load GIS Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="501"/>
+        <location filename="../IMainWindow.ui" line="514"/>
         <source>Load projects from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="504"/>
+        <location filename="../IMainWindow.ui" line="517"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="516"/>
+        <location filename="../IMainWindow.ui" line="529"/>
         <source>Save All GIS Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="519"/>
+        <location filename="../IMainWindow.ui" line="532"/>
         <source>Save all projects in the workspace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="522"/>
+        <location filename="../IMainWindow.ui" line="535"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="534"/>
+        <location filename="../IMainWindow.ui" line="547"/>
         <source>Setup Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="546"/>
+        <location filename="../IMainWindow.ui" line="559"/>
         <source>Add empty project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="561"/>
+        <location filename="../IMainWindow.ui" line="574"/>
         <source>Search Google</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="573"/>
+        <location filename="../IMainWindow.ui" line="586"/>
         <source>Close all projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="576"/>
+        <location filename="../IMainWindow.ui" line="589"/>
         <source>F8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="588"/>
+        <location filename="../IMainWindow.ui" line="601"/>
         <source>Setup Units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="600"/>
+        <location filename="../IMainWindow.ui" line="613"/>
         <source>Setup Workspace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="603"/>
+        <location filename="../IMainWindow.ui" line="616"/>
         <source>Setup save on exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="615"/>
+        <location filename="../IMainWindow.ui" line="628"/>
         <source>Import Database from QLandkarte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="618"/>
+        <location filename="../IMainWindow.ui" line="631"/>
         <source>Import QLandkarte GT database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="630"/>
+        <location filename="../IMainWindow.ui" line="643"/>
         <source>VRT Builder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="633"/>
+        <location filename="../IMainWindow.ui" line="646"/>
         <source>GUI front end to gdalbuildvrt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="645"/>
+        <location filename="../IMainWindow.ui" line="658"/>
         <source>Store Map View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="648"/>
+        <location filename="../IMainWindow.ui" line="661"/>
         <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="660"/>
+        <location filename="../IMainWindow.ui" line="673"/>
         <source>Load Map View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="663"/>
+        <location filename="../IMainWindow.ui" line="676"/>
         <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="678"/>
+        <location filename="../IMainWindow.ui" line="691"/>
         <source>Ext. Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="681"/>
+        <location filename="../IMainWindow.ui" line="694"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="693"/>
+        <location filename="../IMainWindow.ui" line="706"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="696"/>
+        <location filename="../IMainWindow.ui" line="709"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="708"/>
+        <location filename="../IMainWindow.ui" line="721"/>
         <source>Clone Map View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="711"/>
+        <location filename="../IMainWindow.ui" line="724"/>
         <source>Ctrl+Shift+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="723"/>
+        <location filename="../IMainWindow.ui" line="736"/>
         <source>Create Routino Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="735"/>
+        <location filename="../IMainWindow.ui" line="748"/>
         <source>Save(Print) Map Screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="738"/>
+        <location filename="../IMainWindow.ui" line="751"/>
         <source>Print a selected area of the map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="741"/>
+        <location filename="../IMainWindow.ui" line="754"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="753"/>
+        <location filename="../IMainWindow.ui" line="766"/>
         <source>Setup Coord. Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="756"/>
+        <location filename="../IMainWindow.ui" line="769"/>
         <source>Change the format coordinates are displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="768"/>
+        <location filename="../IMainWindow.ui" line="781"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="780"/>
+        <location filename="../IMainWindow.ui" line="793"/>
         <source>Setup Waypoint Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="783"/>
+        <location filename="../IMainWindow.ui" line="796"/>
         <source>Setup path to custom icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="792"/>
+        <location filename="../IMainWindow.ui" line="805"/>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="795"/>
+        <location filename="../IMainWindow.ui" line="808"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../IMainWindow.ui" line="804"/>
+        <location filename="../IMainWindow.ui" line="817"/>
         <source>Quickstart Help</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="826"/>
+        <source>Setup Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="838"/>
+        <source>Toggle Docks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="841"/>
+        <source>Toggle visibility of dockable windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../IMainWindow.ui" line="844"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IMapList</name>
@@ -6930,6 +7068,8 @@
     <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 type="unfinished"></translation>
     </message>
@@ -6983,6 +7123,21 @@
         <source>Cache Path</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="353"/>
+        <source>Type File:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="367"/>
+        <source>Forget external type file and use internal types.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../map/IMapPropSetup.ui" line="381"/>
+        <source>Load an external type file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IMapVrtBuilder</name>
@@ -8100,7 +8255,7 @@
     </message>
     <message>
         <location filename="../mouse/IScrOptSelect.ui" line="222"/>
-        <source>Select all itmes that are completely inside the selected area.</source>
+        <source>Select all items that are completely inside the selected area.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8369,6 +8524,52 @@
     </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="46"/>
+        <source>Add to selected items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="60"/>
+        <source>Remove from selected items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="78"/>
+        <source>Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="102"/>
+        <source>Move selected items up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ISelectDoubleListWidget.ui" line="116"/>
+        <source>Move selected items down</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ISelectProjectDialog</name>
     <message>
         <location filename="../helpers/ISelectProjectDialog.ui" line="14"/>
@@ -8547,6 +8748,29 @@
     </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="45"/>
+        <source>name only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/ISetupFilter.ui" line="52"/>
+        <source>complete text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ISetupFolder</name>
     <message>
         <location filename="../gis/db/ISetupFolder.ui" line="14"/>
@@ -8976,6 +9200,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>IToolBarSetupDialog</name>
+    <message>
+        <location filename="../helpers/IToolBarSetupDialog.ui" line="14"/>
+        <source>Setup Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>IToolShell</name>
     <message>
diff -Nru qmapshack-1.8.1/src/map/CMapIMG.cpp qmapshack-1.9.0/src/map/CMapIMG.cpp
--- qmapshack-1.8.1/src/map/CMapIMG.cpp	2017-03-26 10:12:44.000000000 +0000
+++ qmapshack-1.9.0/src/map/CMapIMG.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -127,7 +127,7 @@
 
 
 CMapIMG::CMapIMG(const QString &filename, CMapDraw *parent)
-    : IMap(eFeatVisibility|eFeatVectorItems,parent)
+    : IMap(eFeatVisibility|eFeatVectorItems|eFeatTypFile,parent)
     , filename(filename)
     , fm(CMainWindow::self().getMapFont())
     , selectedLanguage(NOIDX)
@@ -151,6 +151,24 @@
     isActivated = true;
 }
 
+void CMapIMG::loadConfig(QSettings& cfg)
+{
+    IMap::loadConfig(cfg);
+
+    if(!typeFile.isEmpty())
+    {
+        setupTyp();
+    }
+}
+
+void CMapIMG::slotSetTypeFile(const QString& filename)
+{
+    IMap::slotSetTypeFile(filename);
+    setupTyp();
+    CCanvas::triggerCompleteUpdate(CCanvas::eRedrawMap);
+}
+
+
 void CMapIMG::setupTyp()
 {
     languages.clear();
@@ -406,26 +424,46 @@
 
     pointProperties.clear();
 
-    QMap<QString,subfile_desc_t>::iterator subfile = subfiles.begin();
-    while(subfile != subfiles.end())
+    if(!typeFile.isEmpty())
     {
-        if(!(*subfile).parts.contains("TYP"))
-        {
-            ++subfile;
-            continue;
+        QFile file(typeFile);
+        if(!file.open(QIODevice::ReadOnly))
+        {            
+            QMessageBox::warning(CMainWindow::self().getBestWidgetForParent(), tr("Read external type file..."), tr("Failed to read type file: %1\nFall back to internal types.").arg(typeFile), QMessageBox::Ok);
+            typeFile.clear();
+            setupTyp();
+            return;
         }
 
-        CFileExt file(filename);
-        file.open(QIODevice::ReadOnly);
-
-        QByteArray array;
-        readFile(file, (*subfile).parts["TYP"].offset, (*subfile).parts["TYP"].size, array);
-
+        QByteArray array = file.readAll();
         CGarminTyp typ;
         typ.decode(array, polygonProperties, polylineProperties, polygonDrawOrder, pointProperties);
 
         file.close();
-        break;
+    }
+    else
+    {
+        QMap<QString,subfile_desc_t>::iterator subfile = subfiles.begin();
+        while(subfile != subfiles.end())
+        {
+            if(!(*subfile).parts.contains("TYP"))
+            {
+                ++subfile;
+                continue;
+            }
+
+            CFileExt file(filename);
+            file.open(QIODevice::ReadOnly);
+
+            QByteArray array;
+            readFile(file, (*subfile).parts["TYP"].offset, (*subfile).parts["TYP"].size, array);
+
+            CGarminTyp typ;
+            typ.decode(array, polygonProperties, polylineProperties, polygonDrawOrder, pointProperties);
+
+            file.close();
+            break;
+        }
     }
 }
 
@@ -2324,6 +2362,14 @@
                         poi.name = QString(" (%1)").arg(point.type, 2, 16, QChar('0'));
                     }
                 }
+                if(pointProperties.contains(point.type))
+                {
+                    poi.symbolSize = pointProperties[point.type].imgDay.size();
+                }
+                else
+                {
+                    poi.symbolSize = QSize(16,16);
+                }
                 return;
             }
         }
diff -Nru qmapshack-1.8.1/src/map/CMapIMG.h qmapshack-1.9.0/src/map/CMapIMG.h
--- qmapshack-1.8.1/src/map/CMapIMG.h	2017-03-26 10:12:51.000000000 +0000
+++ qmapshack-1.9.0/src/map/CMapIMG.h	2017-07-23 13:41:03.000000000 +0000
@@ -121,6 +121,8 @@
     CMapIMG(const QString &filename, CMapDraw *parent);
     virtual ~CMapIMG() = default;
 
+    void loadConfig(QSettings& cfg) override;
+
     void draw(IDrawContext::buffer_t& buf) override;
 
     void getToolTip(const QPoint& px, QString& infotext) const override;
@@ -141,6 +143,8 @@
      */
     bool findPolylineCloseBy(const QPointF &pt1, const QPointF &pt2, qint32 threshold, QPolygonF& polyline) override;
 
+public slots:
+    void slotSetTypeFile(const QString& filename) override;
 
 private:
     enum exce_e {eErrOpen, eErrAccess, errFormat, errLock, errAbort};
diff -Nru qmapshack-1.8.1/src/map/CMapPropSetup.cpp qmapshack-1.9.0/src/map/CMapPropSetup.cpp
--- qmapshack-1.8.1/src/map/CMapPropSetup.cpp	2017-03-26 10:12:44.000000000 +0000
+++ qmapshack-1.9.0/src/map/CMapPropSetup.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -16,6 +16,7 @@
 
 **********************************************************************************************/
 
+#include "helpers/CSettings.h"
 #include "helpers/Signals.h"
 #include "map/CMapDraw.h"
 #include "map/CMapPropSetup.h"
@@ -50,6 +51,9 @@
     connect(spinCacheSize,       static_cast<void (QSpinBox::*)(int) >(&QSpinBox::valueChanged), mapfile, &IMap::slotSetCacheSize);
     connect(spinCacheExpiration, static_cast<void (QSpinBox::*)(int) >(&QSpinBox::valueChanged), mapfile, &IMap::slotSetCacheExpiration);
 
+    connect(toolOpenTypFile,    &QToolButton::pressed,      this,      &CMapPropSetup::slotLoadTypeFile);
+    connect(toolClearTypFile,   &QToolButton::pressed,      this,      &CMapPropSetup::slotClearTypeFile);
+
     frameVectorItems->setVisible( mapfile->hasFeatureVectorItems() );
     frameTileCache->setVisible( mapfile->hasFeatureTileCache() );
 
@@ -62,6 +66,8 @@
     {
         frameLayers->hide();
     }
+
+    frameTypFile->setVisible(mapfile->hasFeatureTypFile());
 }
 
 CMapPropSetup::~CMapPropSetup()
@@ -100,6 +106,12 @@
     spinCacheSize->setValue(mapfile->getCacheSize());
     spinCacheExpiration->setValue(mapfile->getCacheExpiration());
 
+    // type file
+    QFileInfo fi(mapfile->getTypeFile());
+    labelTypeFile->setText(fi.completeBaseName());
+    labelTypeFile->setToolTip(fi.absoluteFilePath());
+    toolClearTypFile->setEnabled(!labelTypeFile->text().isEmpty());
+
     // unblock all signals
     X_____________UnBlockAllSignals_____________X(this);
 }
@@ -175,3 +187,27 @@
 
     labelScale->setPixmap(pix);
 }
+
+
+void CMapPropSetup::slotLoadTypeFile()
+{
+    SETTINGS;
+    QString path = cfg.value("Paths/lastTypePath",QDir::homePath()).toString();
+    QString filename = QFileDialog::getOpenFileName(this, tr("Select type file..."), path, "Garmin type file (*.typ)");
+    if(filename.isEmpty())
+    {
+        return;
+    }
+
+    QFileInfo fi(filename);
+    cfg.setValue("Paths/lastTypePath", fi.absolutePath());
+
+    mapfile->slotSetTypeFile(filename);
+    slotPropertiesChanged();
+}
+
+void CMapPropSetup::slotClearTypeFile()
+{
+    mapfile->slotSetTypeFile("");
+    slotPropertiesChanged();
+}
diff -Nru qmapshack-1.8.1/src/map/CMapPropSetup.h qmapshack-1.9.0/src/map/CMapPropSetup.h
--- qmapshack-1.8.1/src/map/CMapPropSetup.h	2017-03-26 10:12:51.000000000 +0000
+++ qmapshack-1.9.0/src/map/CMapPropSetup.h	2017-07-23 13:41:03.000000000 +0000
@@ -40,6 +40,8 @@
     void slotScaleChanged(const QPointF& s);
     void slotSetMinScale(bool checked);
     void slotSetMaxScale(bool checked);
+    void slotLoadTypeFile();
+    void slotClearTypeFile();
 
 private:
     void updateScaleLabel();
diff -Nru qmapshack-1.8.1/src/map/CMapVRT.cpp qmapshack-1.9.0/src/map/CMapVRT.cpp
--- qmapshack-1.8.1/src/map/CMapVRT.cpp	2017-04-17 10:11:47.000000000 +0000
+++ qmapshack-1.9.0/src/map/CMapVRT.cpp	2017-06-05 12:13:33.000000000 +0000
@@ -54,7 +54,7 @@
 
         if(nullptr == pBand)
         {
-            delete dataset;
+            GDALClose(dataset);
             dataset = nullptr;
             QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("Error..."), tr("Failed to load file: %1").arg(filename));
             return;
@@ -83,7 +83,7 @@
         }
         else
         {
-            delete dataset;
+            GDALClose(dataset);
             dataset = nullptr;
             QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("Error..."), tr("File must be 8 bit palette or gray indexed."));
             return;
@@ -175,7 +175,7 @@
 
 CMapVRT::~CMapVRT()
 {
-    delete dataset;
+    GDALClose(dataset);
 }
 
 void CMapVRT::draw(IDrawContext::buffer_t& buf) /* override */
diff -Nru qmapshack-1.8.1/src/map/IMap.cpp qmapshack-1.9.0/src/map/IMap.cpp
--- qmapshack-1.8.1/src/map/IMap.cpp	2017-04-17 10:11:47.000000000 +0000
+++ qmapshack-1.9.0/src/map/IMap.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -55,6 +55,11 @@
         cfg.setValue("cacheSizeMB",     cacheSizeMB);
         cfg.setValue("cacheExpiration", cacheExpiration);
     }
+
+    if(hasFeatureTypFile())
+    {
+        cfg.setValue("typeFile", typeFile);
+    }
 }
 
 void IMap::loadConfig(QSettings& cfg) /* override */
@@ -67,6 +72,7 @@
     slotSetAdjustDetailLevel(cfg.value("adjustDetailLevel", getAdjustDetailLevel()).toInt());
     slotSetCacheSize(cfg.value("cacheSizeMB", getCacheSize()).toInt());
     slotSetCacheExpiration(cfg.value("cacheExpiration", getCacheExpiration()).toInt());
+    slotSetTypeFile(cfg.value("typeFile", getTypeFile()).toString());
 }
 
 IMapProp *IMap::getSetup()
diff -Nru qmapshack-1.8.1/src/map/IMap.h qmapshack-1.9.0/src/map/IMap.h
--- qmapshack-1.8.1/src/map/IMap.h	2017-04-17 10:11:47.000000000 +0000
+++ qmapshack-1.9.0/src/map/IMap.h	2017-07-23 13:41:03.000000000 +0000
@@ -46,6 +46,7 @@
         ,eFeatVectorItems = 0x00000002
         ,eFeatTileCache   = 0x00000004
         ,eFeatLayers      = 0x00000008
+        ,eFeatTypFile     = 0x00000010
     };
 
     virtual void draw(IDrawContext::buffer_t& buf) = 0;
@@ -101,6 +102,11 @@
         return flagsFeature & eFeatLayers;
     }
 
+    bool hasFeatureTypFile() const
+    {
+        return flagsFeature & eFeatTypFile;
+    }
+
     bool getShowPolygons() const
     {
         return showPolygons;
@@ -136,6 +142,11 @@
         return adjustDetailLevel;
     }
 
+    const QString& getTypeFile() const
+    {
+        return typeFile;
+    }
+
     /**
        @brief Find a matching street polyline
 
@@ -185,6 +196,11 @@
         adjustDetailLevel = level;
     }
 
+    virtual void slotSetTypeFile(const QString& filename)
+    {
+        typeFile = filename;
+    }
+
 protected:
     void convertRad2M(QPointF &p) const;
     void convertM2Rad(QPointF &p) const;
@@ -244,6 +260,8 @@
     qint32 cacheExpiration =   8; //< streaming map only: maximum age of tiles in cache [days]
 
     QString copyright; //< a copyright string to be displayed as tool tip
+
+    QString typeFile;
 };
 
 
diff -Nru qmapshack-1.8.1/src/map/IMapPropSetup.ui qmapshack-1.9.0/src/map/IMapPropSetup.ui
--- qmapshack-1.8.1/src/map/IMapPropSetup.ui	2017-02-10 17:04:25.000000000 +0000
+++ qmapshack-1.9.0/src/map/IMapPropSetup.ui	2017-07-23 13:41:03.000000000 +0000
@@ -317,6 +317,81 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QFrame" name="frameTypFile">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Plain</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_5">
+      <property name="spacing">
+       <number>3</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="QLabel" name="label_5">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Type File:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="labelTypeFile">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="toolClearTypFile">
+        <property name="toolTip">
+         <string>Forget external type file and use internal types.</string>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../resources.qrc">
+          <normaloff>:/icons/32x32/Cancel.png</normaloff>:/icons/32x32/Cancel.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="toolOpenTypFile">
+        <property name="toolTip">
+         <string>Load an external type file.</string>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../resources.qrc">
+          <normaloff>:/icons/32x32/PathBlue.png</normaloff>:/icons/32x32/PathBlue.png</iconset>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>
diff -Nru qmapshack-1.8.1/src/mouse/CMouseMoveWpt.cpp qmapshack-1.9.0/src/mouse/CMouseMoveWpt.cpp
--- qmapshack-1.8.1/src/mouse/CMouseMoveWpt.cpp	2017-03-26 10:12:43.000000000 +0000
+++ qmapshack-1.9.0/src/mouse/CMouseMoveWpt.cpp	2017-05-26 16:19:14.000000000 +0000
@@ -52,7 +52,7 @@
 
     qreal d = GPS_Math_Distance(p1.x(), p1.y(), p2.x(), p2.y(), a1, a2);
     IUnit::self().meter2distance(d, val, unit);
-    const QString &str = QString("%1 %2, %3").arg(val).arg(unit).arg(a2, 0, 'f', 1);
+    const QString &str = QString("%1 %2, %3%4").arg(val).arg(unit).arg(a2, 0, 'f', 1).arg(QChar(0260));
 
     gis->convertRad2Px(p1);
     gis->convertRad2Px(p2);
diff -Nru qmapshack-1.8.1/src/mouse/CMouseNormal.cpp qmapshack-1.9.0/src/mouse/CMouseNormal.cpp
--- qmapshack-1.8.1/src/mouse/CMouseNormal.cpp	2017-03-26 10:12:44.000000000 +0000
+++ qmapshack-1.9.0/src/mouse/CMouseNormal.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -290,7 +290,10 @@
     {
         if(curPOI.pos != NOPOINTF)
         {
-            p.drawImage(curPOI.pos - QPointF(31,31), QImage("://cursors/wptHighlightBlue.png"));
+            const QSize s = curPOI.symbolSize;
+            const qint32 x = (qMax(qMax(s.width(), s.height()), 7)<<1) & 0xFFFFFFFE;
+
+            p.drawImage(curPOI.pos - QPointF(x,x), QImage("://cursors/wptHighlightBlue.png").scaled(x<<1, x<<1, Qt::KeepAspectRatio, Qt::SmoothTransformation));
         }
 
         /*
diff -Nru qmapshack-1.8.1/src/mouse/IScrOptSelect.ui qmapshack-1.9.0/src/mouse/IScrOptSelect.ui
--- qmapshack-1.8.1/src/mouse/IScrOptSelect.ui	2017-03-06 18:17:36.000000000 +0000
+++ qmapshack-1.9.0/src/mouse/IScrOptSelect.ui	2017-05-26 16:18:32.000000000 +0000
@@ -219,7 +219,7 @@
       <item>
        <widget class="QToolButton" name="toolModeExact">
         <property name="toolTip">
-         <string>Select all itmes that are completely inside the selected area.</string>
+         <string>Select all items that are completely inside the selected area.</string>
         </property>
         <property name="text">
          <string>...</string>
diff -Nru qmapshack-1.8.1/src/mouse/line/CLineOpAddPoint.cpp qmapshack-1.9.0/src/mouse/line/CLineOpAddPoint.cpp
--- qmapshack-1.8.1/src/mouse/line/CLineOpAddPoint.cpp	2017-03-26 10:12:44.000000000 +0000
+++ qmapshack-1.9.0/src/mouse/line/CLineOpAddPoint.cpp	2017-05-19 14:53:52.000000000 +0000
@@ -26,7 +26,7 @@
 CLineOpAddPoint::CLineOpAddPoint(SGisLine& points, CGisDraw *gis, CCanvas * canvas, IMouseEditLine * parent)
     : ILineOp(points, gis, canvas, parent)
 {
-    cursor = QCursor(QPixmap(":/cursors/cursorAdd.png"), 0, 0);
+    cursor = QCursor(QPixmap(":/cursors/cursorPointAdd.png"), 0, 0);
 }
 
 CLineOpAddPoint::~CLineOpAddPoint()
diff -Nru qmapshack-1.8.1/src/mouse/line/CLineOpDeletePoint.cpp qmapshack-1.9.0/src/mouse/line/CLineOpDeletePoint.cpp
--- qmapshack-1.8.1/src/mouse/line/CLineOpDeletePoint.cpp	2017-03-26 10:12:44.000000000 +0000
+++ qmapshack-1.9.0/src/mouse/line/CLineOpDeletePoint.cpp	2017-05-19 14:53:52.000000000 +0000
@@ -26,7 +26,7 @@
 CLineOpDeletePoint::CLineOpDeletePoint(SGisLine& points, CGisDraw *gis, CCanvas * canvas, IMouseEditLine * parent)
     : ILineOp(points, gis, canvas, parent)
 {
-    cursor  = QCursor(QPixmap(":/cursors/cursorDelete.png"), 0, 0);
+    cursor  = QCursor(QPixmap(":/cursors/cursorPointDel.png"), 0, 0);
 }
 
 CLineOpDeletePoint::~CLineOpDeletePoint()
diff -Nru qmapshack-1.8.1/src/mouse/line/CLineOpMovePoint.cpp qmapshack-1.9.0/src/mouse/line/CLineOpMovePoint.cpp
--- qmapshack-1.8.1/src/mouse/line/CLineOpMovePoint.cpp	2017-03-26 10:12:44.000000000 +0000
+++ qmapshack-1.9.0/src/mouse/line/CLineOpMovePoint.cpp	2017-05-19 14:53:52.000000000 +0000
@@ -27,7 +27,7 @@
 CLineOpMovePoint::CLineOpMovePoint(SGisLine &points, CGisDraw *gis, CCanvas * canvas, IMouseEditLine *parent)
     : ILineOp(points, gis, canvas, parent)
 {
-    cursor = QCursor(QPixmap(":/cursors/cursorMovePoint.png"),0,0);
+    cursor = QCursor(QPixmap(":/cursors/cursorPointMove.png"),0,0);
 }
 
 CLineOpMovePoint::~CLineOpMovePoint()
diff -Nru qmapshack-1.8.1/src/mouse/line/ILineOp.cpp qmapshack-1.9.0/src/mouse/line/ILineOp.cpp
--- qmapshack-1.8.1/src/mouse/line/ILineOp.cpp	2017-03-26 10:12:44.000000000 +0000
+++ qmapshack-1.9.0/src/mouse/line/ILineOp.cpp	2017-05-20 17:28:23.000000000 +0000
@@ -320,6 +320,7 @@
         }
         else
         {
+            line << pt1.pixel;
             for(const IGisLine::subpt_t& pt : pt1.subpts)
             {
                 line << pt.pixel;
diff -Nru qmapshack-1.8.1/src/mouse/line/IScrOptEditLine.ui qmapshack-1.9.0/src/mouse/line/IScrOptEditLine.ui
--- qmapshack-1.8.1/src/mouse/line/IScrOptEditLine.ui	2016-02-07 19:52:57.000000000 +0000
+++ qmapshack-1.9.0/src/mouse/line/IScrOptEditLine.ui	2017-05-19 14:53:52.000000000 +0000
@@ -119,7 +119,7 @@
           </property>
           <property name="icon">
            <iconset resource="../../resources.qrc">
-            <normaloff>:/icons/32x32/Add.png</normaloff>:/icons/32x32/Add.png</iconset>
+            <normaloff>:/icons/32x32/PointAdd.png</normaloff>:/icons/32x32/PointAdd.png</iconset>
           </property>
           <property name="shortcut">
            <string>Ctrl++</string>
@@ -165,7 +165,7 @@
           </property>
           <property name="icon">
            <iconset resource="../../resources.qrc">
-            <normaloff>:/icons/32x32/DeleteOne.png</normaloff>:/icons/32x32/DeleteOne.png</iconset>
+            <normaloff>:/icons/32x32/PointDel.png</normaloff>:/icons/32x32/PointDel.png</iconset>
           </property>
           <property name="shortcut">
            <string>Ctrl+D</string>
diff -Nru qmapshack-1.8.1/src/plot/CPlotAxis.cpp qmapshack-1.9.0/src/plot/CPlotAxis.cpp
--- qmapshack-1.8.1/src/plot/CPlotAxis.cpp	2017-03-26 10:12:43.000000000 +0000
+++ qmapshack-1.9.0/src/plot/CPlotAxis.cpp	2017-06-14 15:32:16.000000000 +0000
@@ -181,10 +181,10 @@
 
     if ( scaleWidth > 0 )
     {
-        return scaleWidth * m.width( " " );
+        return scaleWidth * m.width( "X" );
     }
 
-    int width = 0;
+    int width = 6 * m.width( "X" );
     QString format_single_prec = ((interval * ticScale) < 1) ? fmtdbl(interval) : fmtsgl(interval);
 
     const tic_t * t = ticmark();
diff -Nru qmapshack-1.8.1/src/plot/IPlot.cpp qmapshack-1.9.0/src/plot/IPlot.cpp
--- qmapshack-1.8.1/src/plot/IPlot.cpp	2017-03-26 10:12:43.000000000 +0000
+++ qmapshack-1.9.0/src/plot/IPlot.cpp	2017-07-23 13:41:03.000000000 +0000
@@ -552,7 +552,7 @@
     scaleWidthX1 = showScale ? data->x().getScaleWidth( fm ) : 0;
     scaleWidthY1 = showScale ? data->y().getScaleWidth( fm ) : 0;
 
-    scaleWidthY1 = scaleWidthX1 > scaleWidthY1 ? scaleWidthX1 : scaleWidthY1;
+    scaleWidthY1 = (scaleWidthX1/2) > scaleWidthY1 ? scaleWidthX1/2 : scaleWidthY1;
 
     fontWidth    = fm.maxWidth();
     fontHeight   = fm.height();
@@ -1388,11 +1388,7 @@
     }
 
     CGisWidget::self().addWptByPos({trkpt->lon, trkpt->lat});
-    CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
-    if(canvas != nullptr)
-    {
-        canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
-    }
+    CCanvas::triggerCompleteUpdate(CCanvas::eRedrawGis);
 }
 
 void IPlot::slotCutTrk()
diff -Nru qmapshack-1.8.1/src/resources.qrc qmapshack-1.9.0/src/resources.qrc
--- qmapshack-1.8.1/src/resources.qrc	2017-04-15 15:35:45.000000000 +0000
+++ qmapshack-1.9.0/src/resources.qrc	2017-07-10 19:52:50.000000000 +0000
@@ -130,6 +130,8 @@
         <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>
@@ -203,6 +205,9 @@
         <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/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>
@@ -221,7 +226,6 @@
         <file>icons/32x32/SortName.png</file>
         <file>icons/32x32/SaveGISAsGpx11.png</file>
         <file>icons/32x32/CopyTrkWithWpt.png</file>
-
         <file>icons/48x48/Add.png</file>
         <file>icons/48x48/AddMapWorkspace.png</file>
         <file>icons/48x48/CloneMapWorkspace.png</file>
@@ -323,6 +327,8 @@
         <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>
@@ -396,6 +402,9 @@
         <file>icons/48x48/CSrcUnknown.png</file>
         <file>icons/48x48/CSrcAccel.png</file>
         <file>icons/48x48/CSrcCourse.png</file>
+        <file>icons/48x48/CSrcDistance.png</file>
+        <file>icons/48x48/CSrcSeaLevelPressure.png</file>
+        <file>icons/48x48/CSrcVertSpeed.png</file>
         <file>icons/48x48/Progress.png</file>
         <file>icons/48x48/FitProject.png</file>
         <file>icons/48x48/LineWidthUser.png</file>
@@ -414,8 +423,6 @@
         <file>icons/48x48/SortName.png</file>
         <file>icons/48x48/SaveGISAsGpx11.png</file>
         <file>icons/48x48/CopyTrkWithWpt.png</file>
-
-
         <file>icons/cache/32x32/bluepin.png</file>
         <file>icons/cache/32x32/cito.png</file>
         <file>icons/cache/32x32/corrected.png</file>
@@ -491,7 +498,7 @@
         <file>icons/waypoints/32x32/Water.png</file>
         <file>cursors/cursorArrow.png</file>
         <file>cursors/cursorMove.png</file>
-        <file>cursors/cursorMovePoint.png</file>
+        <file>cursors/cursorPointMove.png</file>
         <file>cursors/cursorMoveMap.png</file>
         <file>cursors/cursorMoveWpt.png</file>
         <file>cursors/cursorMoveLine.png</file>
@@ -499,7 +506,8 @@
         <file>cursors/cursorDelete.png</file>
         <file>cursors/cursorSelectRange.png</file>
         <file>cursors/cursorSelectArea.png</file>
-        <file>cursors/cursorAdd.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>
@@ -516,5 +524,19 @@
         <file>map/OpenStreetMap.tms</file>
         <file>map/OSM_Topo.tms</file>
         <file>map/OpenCycleMap.tms</file>
+        <file>icons/32x32/ToolBarSetup.png</file>
+        <file>icons/32x32/ToggleDem.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/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/32x32/ToolBar.png</file>
+        <file>icons/48x48/ToolBar.png</file>
     </qresource>
 </RCC>
diff -Nru qmapshack-1.8.1/src/setup/IAppSetup.cpp qmapshack-1.9.0/src/setup/IAppSetup.cpp
--- qmapshack-1.8.1/src/setup/IAppSetup.cpp	2017-03-26 10:12:43.000000000 +0000
+++ qmapshack-1.9.0/src/setup/IAppSetup.cpp	2017-05-17 17:42:32.000000000 +0000
@@ -28,7 +28,7 @@
 #include <gdal.h>
 
 
-static IAppSetup* instance = nullptr;
+IAppSetup* IAppSetup::instance = nullptr;
 
 IAppSetup* IAppSetup::getPlatformInstance()
 {
diff -Nru qmapshack-1.8.1/src/setup/IAppSetup.h qmapshack-1.9.0/src/setup/IAppSetup.h
--- qmapshack-1.8.1/src/setup/IAppSetup.h	2017-03-26 10:12:50.000000000 +0000
+++ qmapshack-1.9.0/src/setup/IAppSetup.h	2017-05-17 17:42:32.000000000 +0000
@@ -42,6 +42,8 @@
     void prepareGdal(QString gdalDir, QString projDir);
     void prepareTranslator(QString translationPath, QString translationPrefix);
 
+    static IAppSetup* instance;
+
     QString path(QString path, QString subdir, bool mkdir, QString debugName);
 };
 
diff -Nru qmapshack-1.8.1/src/widgets/CHistoryListWidget.cpp qmapshack-1.9.0/src/widgets/CHistoryListWidget.cpp
--- qmapshack-1.8.1/src/widgets/CHistoryListWidget.cpp	2017-04-15 15:35:45.000000000 +0000
+++ qmapshack-1.9.0/src/widgets/CHistoryListWidget.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -36,7 +36,6 @@
 
     actionCutHistoryBefore = menu->addAction(QIcon("://icons/32x32/CutHistoryBefore.png"), tr("Cut history before"), this, SLOT(slotCutHistoryBefore()));
     actionCutHistoryAfter = menu->addAction(QIcon("://icons/32x32/CutHistoryAfter.png"), tr("Cut history after"), this, SLOT(slotCutHistoryAfter()));
-
 }
 
 CHistoryListWidget::~CHistoryListWidget()
@@ -107,7 +106,7 @@
 
     actionCutHistoryBefore->setEnabled(currentRow() > 0);
     actionCutHistoryAfter->setEnabled(currentRow() < count() - 1);
- 
+
     QPoint p = mapToGlobal(point);
     menu->exec(p);
 }
@@ -154,9 +153,9 @@
     }
 
     int res = QMessageBox::warning(CMainWindow::getBestWidgetForParent(), tr("History removal")
-        , tr("The removal is permanent and cannot be undone. "
-          "<b>Do you really want to delete history before this step?</b>")
-        , QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+                                   , tr("The removal is permanent and cannot be undone. "
+                                        "<b>Do you really want to delete history before this step?</b>")
+                                   , QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
     if (res == QMessageBox::No)
     {
         return;
diff -Nru qmapshack-1.8.1/src/widgets/CSelectDoubleListWidget.cpp qmapshack-1.9.0/src/widgets/CSelectDoubleListWidget.cpp
--- qmapshack-1.8.1/src/widgets/CSelectDoubleListWidget.cpp	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/widgets/CSelectDoubleListWidget.cpp	2017-07-04 16:44:15.000000000 +0000
@@ -0,0 +1,262 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess@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 2 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, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+**********************************************************************************************/
+
+#include "CSelectDoubleListWidget.h"
+#include <QListWidgetItem>
+
+CSelectDoubleListWidget::CSelectDoubleListWidget(QWidget * parent, IItemFilter *filter) : QWidget(parent), filter(filter)
+{
+    setupUi(this);
+
+    connect(listSelected,  &QListView::clicked,   this, &CSelectDoubleListWidget::slotSelectedClicked);
+    connect(listAvailable, &QListView::clicked,   this, &CSelectDoubleListWidget::slotAvailableClicked);
+    connect(toolAdd,       &QToolButton::clicked, this, &CSelectDoubleListWidget::slotAdd);
+    connect(toolRemove,    &QToolButton::clicked, this, &CSelectDoubleListWidget::slotRemove);
+    connect(toolUp,        &QToolButton::clicked, this, &CSelectDoubleListWidget::slotUp);
+    connect(toolDown,      &QToolButton::clicked, this, &CSelectDoubleListWidget::slotDown);
+}
+
+CSelectDoubleListWidget::~CSelectDoubleListWidget()
+{
+}
+
+void CSelectDoubleListWidget::setAvailable(const QList<QListWidgetItem *> & available)
+{
+    this->available.clear();
+    this->available << available;
+    listAvailable->clear();
+    for (QListWidgetItem * const & item : available)
+    {
+        int index = listSelected->row(item);
+        if (index < 0)
+        {
+            listAvailable->addItem(item);
+        }
+        else if(filter != nullptr && !filter->shouldBeMoved(item))
+        {
+            listSelected->takeItem(index);
+            listSelected->insertItem(index,item->clone());
+            listAvailable->addItem(item);
+        }
+    }
+    updateButtons();
+}
+
+void CSelectDoubleListWidget::setSelected(const QList<QListWidgetItem *> & selected) const
+{
+    listSelected->clear();
+    for (QListWidgetItem * const & item : selected)
+    {
+        int index = listAvailable->row(item);
+        if (index < 0)
+        {
+            listSelected->addItem(item);
+        }
+        else
+        {
+            if(filter == nullptr || filter->shouldBeMoved(item))
+            {
+                listAvailable->takeItem(index);
+                listSelected->addItem(item);
+            }
+            else
+            {
+                listSelected->addItem(item->clone());
+            }
+        }
+    }
+    updateButtons();
+}
+
+void CSelectDoubleListWidget::setFilter(IItemFilter * const & filter)
+{
+    this->filter = filter;
+}
+
+void CSelectDoubleListWidget::setLabelAvailable(const QString & label) const
+{
+    labelAvailable->setText(label);
+}
+
+void CSelectDoubleListWidget::setLabelSelected(const QString & label) const
+{
+    labelSelected->setText(label);
+}
+
+const QList<QListWidgetItem *> CSelectDoubleListWidget::selected() const
+{
+    QList<QListWidgetItem *> selected;
+    for (int i=0; i < listSelected->count(); i++)
+    {
+        selected << listSelected->item(i);
+    }
+    return selected;
+}
+
+void CSelectDoubleListWidget::clear()
+{
+    this->available.clear();
+    listAvailable->clear();
+    listSelected->clear();
+}
+
+void CSelectDoubleListWidget::slotSelectedClicked(const QModelIndex & index) const
+{
+    listAvailable->clearSelection();
+    updateButtons();
+}
+
+void CSelectDoubleListWidget::slotAvailableClicked(const QModelIndex & index) const
+{
+    listSelected->clearSelection();
+    updateButtons();
+}
+
+void CSelectDoubleListWidget::slotAdd() const
+{
+    for (QListWidgetItem * const & item : listAvailable->selectedItems())
+    {
+        if (filter == nullptr || filter->shouldBeMoved(item))
+        {
+            listAvailable->takeItem(listAvailable->row(item));
+            listSelected->addItem(item);
+        }
+        else
+        {
+            listSelected->addItem(item->clone());
+        }
+    }
+    updateButtons();
+}
+
+void CSelectDoubleListWidget::slotRemove() const
+{
+    for (QListWidgetItem * const & item : listSelected->selectedItems())
+    {
+        if (filter == nullptr || filter->shouldBeMoved(item))
+        {
+            int index = -1;
+            for (int i = available.indexOf(item)-1; i>=0; i--)
+            {
+                index = listAvailable->row(available.at(i));
+                if (index >= 0)
+                {
+                    break;
+                }
+            }
+            index++;
+            listSelected->takeItem(listSelected->row(item));
+            listAvailable->insertItem(index,item);
+        }
+        else
+        {
+            delete listSelected->takeItem(listSelected->row(item));
+        }
+    }
+    updateButtons();
+}
+
+void CSelectDoubleListWidget::slotUp() const
+{
+    QList<int> indices;
+    for (const QModelIndex & modelIndex : listSelected->selectionModel()->selectedIndexes())
+    {
+        indices << modelIndex.row();
+    }
+    std::sort(indices.begin(),indices.end());
+
+    int i=0;
+    for (int index : indices)
+    {
+        if (index > i)
+        {
+            listSelected->insertItem(index-1,listSelected->takeItem(index));
+            listSelected->setCurrentRow(index-1,QItemSelectionModel::Select);
+        }
+        i++;
+    }
+    updateButtons();
+}
+
+void CSelectDoubleListWidget::slotDown() const
+{
+    QList<int> indices;
+    for (const QModelIndex & modelIndex : listSelected->selectionModel()->selectedIndexes())
+    {
+        indices << modelIndex.row();
+    }
+    std::sort(indices.begin(), indices.end(), [] (int a, int b) { return a > b; });
+
+    int i=listSelected->count()-1;
+    for (int index : indices)
+    {
+        if (index < i)
+        {
+            listSelected->insertItem(index+1,listSelected->takeItem(index));
+            listSelected->setCurrentRow(index+1,QItemSelectionModel::Select);
+        }
+        i--;
+    }
+    updateButtons();
+}
+
+void CSelectDoubleListWidget::updateButtons() const
+{
+    toolAdd->setEnabled(listAvailable->selectionModel()->hasSelection());
+
+    const QItemSelectionModel * const & selectedSelectionModel = listSelected->selectionModel();
+    if (selectedSelectionModel->hasSelection())
+    {
+        toolRemove->setEnabled(true);
+
+        int minSelected = listSelected->count();
+        int maxSelected = -1;
+        int minUnselected = minSelected;
+        int maxUnselected = -1;
+
+        for (int i = 0; i < listSelected->count(); i++)
+        {
+            if (selectedSelectionModel->isRowSelected(i, QModelIndex()))
+            {
+                if (i < minSelected)
+                {
+                    minSelected = i;
+                }
+                maxSelected = i;
+            }
+            else
+            {
+                if (i < minUnselected)
+                {
+                    minUnselected = i;
+                }
+                maxUnselected = i;
+            }
+        }
+
+        toolUp->setEnabled(minUnselected < maxSelected);
+        toolDown->setEnabled(maxUnselected > minSelected);
+    }
+    else
+    {
+        toolRemove->setEnabled(false);
+        toolUp->setEnabled(false);
+        toolDown->setEnabled(false);
+    }
+}
diff -Nru qmapshack-1.8.1/src/widgets/CSelectDoubleListWidget.h qmapshack-1.9.0/src/widgets/CSelectDoubleListWidget.h
--- qmapshack-1.8.1/src/widgets/CSelectDoubleListWidget.h	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/widgets/CSelectDoubleListWidget.h	2017-07-04 16:44:15.000000000 +0000
@@ -0,0 +1,60 @@
+/**********************************************************************************************
+    Copyright (C) 2017 Norbert Truchsess norbert.truchsess@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 2 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, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+**********************************************************************************************/
+
+#ifndef CSELECTDOUBLELISTWIDGET_H
+#define CSELECTDOUBLELISTWIDGET_H
+
+#include "ui_ISelectDoubleListWidget.h"
+
+class CSelectDoubleListWidget : public QWidget, private Ui::ISelectDoubleListWidget
+{
+    Q_OBJECT
+public:
+    class IItemFilter
+    {
+public:
+        virtual bool shouldBeMoved(QListWidgetItem * item) = 0;
+    };
+
+    CSelectDoubleListWidget(QWidget *parent, IItemFilter *filter = nullptr);
+    virtual ~CSelectDoubleListWidget();
+
+    void setAvailable(const QList<QListWidgetItem *> &available);
+    void setSelected(const QList<QListWidgetItem *> &selected) const;
+    void setLabelAvailable(const QString & label) const;
+    void setLabelSelected(const QString & label) const;
+    void setFilter(IItemFilter * const &filter);
+    const QList<QListWidgetItem *> selected() const;
+    void clear();
+
+private slots:
+    void slotSelectedClicked(const QModelIndex & index) const;
+    void slotAvailableClicked(const QModelIndex & index) const;
+    void slotAdd() const;
+    void slotRemove() const;
+    void slotUp() const;
+    void slotDown() const;
+
+private:
+    void updateButtons() const;
+
+    QList<QListWidgetItem *> available;
+    IItemFilter * filter;
+};
+#endif //CSELECTDOUBLELISTWIDGET_H
diff -Nru qmapshack-1.8.1/src/widgets/ISelectDoubleListWidget.ui qmapshack-1.9.0/src/widgets/ISelectDoubleListWidget.ui
--- qmapshack-1.8.1/src/widgets/ISelectDoubleListWidget.ui	1970-01-01 00:00:00.000000000 +0000
+++ qmapshack-1.9.0/src/widgets/ISelectDoubleListWidget.ui	2017-07-01 14:40:11.000000000 +0000
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ISelectDoubleListWidget</class>
+ <widget class="QWidget" name="ISelectDoubleListWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_7">
+     <item>
+      <widget class="QLabel" name="labelAvailable">
+       <property name="text">
+        <string>Available</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QListWidget" name="listAvailable">
+       <property name="editTriggers">
+        <set>QAbstractItemView::NoEditTriggers</set>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectItems</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_5">
+     <item>
+      <widget class="QToolButton" name="toolAdd">
+       <property name="toolTip">
+        <string>Add to selected items</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../resources.qrc">
+         <normaloff>:/icons/32x32/Right.png</normaloff>:/icons/32x32/Right.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="toolRemove">
+       <property name="toolTip">
+        <string>Remove from selected items</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../resources.qrc">
+         <normaloff>:/icons/32x32/Left.png</normaloff>:/icons/32x32/Left.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_6">
+     <item>
+      <widget class="QLabel" name="labelSelected">
+       <property name="text">
+        <string>Selected</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QListWidget" name="listSelected">
+       <property name="editTriggers">
+        <set>QAbstractItemView::NoEditTriggers</set>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectItems</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_12">
+     <item>
+      <widget class="QToolButton" name="toolUp">
+       <property name="toolTip">
+        <string>Move selected items up</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../resources.qrc">
+         <normaloff>:/icons/32x32/Up.png</normaloff>:/icons/32x32/Up.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="toolDown">
+       <property name="toolTip">
+        <string>Move selected items down</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../resources.qrc">
+         <normaloff>:/icons/32x32/Down.png</normaloff>:/icons/32x32/Down.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>