[qmapshack] 01/05: New upstream version 1.9.1
Bas Couwenberg
sebastic at debian.org
Sun Sep 17 17:54:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qmapshack.
commit 9fa81910ada4dd78356753b3c521a144877232a6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Sep 17 19:28:52 2017 +0200
New upstream version 1.9.1
---
CMakeLists.txt | 2 +-
CMakeLists.txt.user | 2 +-
.../Contents/Resources/fr.lproj/locversion.plist | 15 +
.../Contents/Resources/nl.lproj/locversion.plist | 15 +
MacOSX/resources/Contents/Resources/qms-style.qss | 31 +
changelog.txt | 19 +
src/CMainWindow.cpp | 212 ++-
src/CMainWindow.h | 11 +
src/CMakeLists.txt | 28 +-
src/CSingleInstanceProxy.cpp | 2 +-
src/IMainWindow.ui | 13 +
src/canvas/CCanvas.cpp | 30 +-
src/canvas/CCanvas.h | 1 +
src/canvas/ICanvasSetup.ui | 4 +-
src/device/CDeviceGarmin.cpp | 7 +
src/device/CDeviceGarmin.h | 1 +
src/gis/CGisListWks.cpp | 73 +-
src/gis/CGisListWks.h | 9 +-
src/gis/CGisWidget.cpp | 29 +-
src/gis/CGisWidget.h | 15 +-
src/gis/IGisItem.cpp | 2 +-
src/gis/IGisItem.h | 13 +-
src/gis/IGisWidget.ui | 2 +-
src/gis/WptIcons.cpp | 10 +
src/gis/db/CDBProject.cpp | 15 +-
src/gis/db/CSelectSaveAction.cpp | 7 +-
src/gis/db/IDBFolder.h | 4 +-
src/gis/db/IDBMysql.cpp | 4 +-
src/gis/db/IDBSqlite.cpp | 4 +-
src/gis/fit/CFitProject.cpp | 9 +
src/gis/fit/CFitStream.h | 2 +-
src/gis/fit/decoder/CFitFieldDataState.h | 1 +
src/gis/fit/defs/CFitProfileLookup.cpp | 17 +
src/gis/fit/defs/fit_enums.h | 23 +
src/gis/fit/serialization.cpp | 58 +-
src/gis/ovl/CGisItemOvlArea.cpp | 8 +-
src/gis/ovl/CGisItemOvlArea.h | 2 +-
src/gis/ovl/CScrOptOvlArea.cpp | 2 +-
src/gis/prj/CDetailsPrj.cpp | 40 +-
src/gis/prj/IGisProject.cpp | 53 +-
src/gis/prj/IGisProject.h | 21 +
src/gis/qms/serialization.cpp | 18 +-
src/gis/rte/CCreateRouteFromWpt.cpp | 2 +-
src/gis/rte/CDetailsRte.cpp | 2 +-
src/gis/rte/CGisItemRte.cpp | 8 +-
src/gis/rte/CGisItemRte.h | 2 +-
src/gis/rte/CScrOptRte.cpp | 2 +-
.../rte/router/brouter/CRouterBRouterTilesPage.cpp | 2 +-
src/gis/trk/CActivityTrk.cpp | 209 ++-
src/gis/trk/CActivityTrk.h | 4 +
src/gis/trk/CDetailsTrk.cpp | 13 +-
src/gis/trk/CDetailsTrk.h | 1 -
src/gis/trk/CGisItemTrk.cpp | 96 +-
src/gis/trk/CGisItemTrk.h | 4 +-
src/gis/trk/CKnownExtension.cpp | 11 +-
src/gis/trk/CScrOptTrk.cpp | 11 +-
src/gis/trk/CScrOptTrk.h | 2 +
src/gis/trk/CTrackData.h | 5 +-
src/gis/trk/IDetailsTrk.ui | 13 +-
src/gis/trk/IScrOptTrk.ui | 16 +-
src/gis/wpt/CGisItemWpt.cpp | 8 +-
src/gis/wpt/CGisItemWpt.h | 2 +-
src/gis/wpt/CScrOptWpt.cpp | 2 +-
src/helpers/CProgressDialog.cpp | 57 +-
src/helpers/CProgressDialog.h | 11 +-
src/helpers/CSelectCopyAction.cpp | 8 +-
src/helpers/CToolBarConfig.cpp | 8 +-
src/helpers/CToolBarConfig.h | 3 +
src/helpers/CToolBarSetupDialog.cpp | 6 +-
src/helpers/IToolBarSetupDialog.ui | 7 +
src/icons/16x16/ActNone.png | Bin 342 -> 781 bytes
src/icons/16x16/ActTrain.png | Bin 0 -> 491 bytes
src/icons/16x16/NoActivity.png | Bin 0 -> 781 bytes
src/icons/32x32/ActNone.png | Bin 559 -> 1794 bytes
src/icons/32x32/ActTrain.png | Bin 0 -> 780 bytes
src/icons/32x32/AutoSave.png | Bin 0 -> 602 bytes
src/icons/32x32/CSrcDistance.png | Bin 763 -> 602 bytes
src/icons/32x32/CSrcEnergy.png | Bin 0 -> 1077 bytes
src/icons/32x32/CSrcSeaLevelPressure.png | Bin 1894 -> 1772 bytes
src/icons/32x32/CSrcVertSpeed.png | Bin 1215 -> 1152 bytes
src/icons/32x32/CutHistoryAfter.png | Bin 1451 -> 1433 bytes
src/icons/32x32/CutHistoryBefore.png | Bin 1316 -> 1322 bytes
src/icons/32x32/FitProject.png | Bin 1116 -> 1060 bytes
src/icons/32x32/FullScreen.png | Bin 0 -> 832 bytes
src/icons/32x32/MimeGEMF.png | Bin 2011 -> 1961 bytes
src/icons/32x32/MySQLNoConn.png | Bin 2132 -> 2357 bytes
src/icons/32x32/PastePlain.png | Bin 904 -> 884 bytes
src/icons/32x32/RegularScreen.png | Bin 0 -> 857 bytes
src/icons/32x32/SQLiteNoConn.png | Bin 1986 -> 2241 bytes
src/icons/32x32/Template.png | Bin 0 -> 532 bytes
src/icons/32x32/ToggleDem.png | Bin 792 -> 926 bytes
src/icons/32x32/ToggleDocks.png | Bin 1491 -> 1554 bytes
src/icons/32x32/ToggleGis.png | Bin 1096 -> 1130 bytes
src/icons/32x32/ToggleMaps.png | Bin 1146 -> 1416 bytes
src/icons/32x32/ToggleRouter.png | Bin 1055 -> 1130 bytes
src/icons/32x32/ToolBar.png | Bin 393 -> 386 bytes
src/icons/32x32/ToolBarSetup.png | Bin 2080 -> 2344 bytes
src/icons/48x48/ActNone.png | Bin 752 -> 2817 bytes
src/icons/48x48/ActTrain.png | Bin 0 -> 1090 bytes
src/icons/48x48/AutoSave.png | Bin 0 -> 767 bytes
src/icons/48x48/CSrcDistance.png | Bin 944 -> 920 bytes
src/icons/48x48/CSrcEnergy.png | Bin 0 -> 1641 bytes
src/icons/48x48/CSrcSeaLevelPressure.png | Bin 3227 -> 3085 bytes
src/icons/48x48/CSrcVertSpeed.png | Bin 1957 -> 1825 bytes
src/icons/48x48/CutHistoryAfter.png | Bin 2318 -> 2281 bytes
src/icons/48x48/CutHistoryBefore.png | Bin 2211 -> 2133 bytes
src/icons/48x48/FitProject.png | Bin 1675 -> 1622 bytes
src/icons/48x48/FullScreen.png | Bin 0 -> 1270 bytes
src/icons/48x48/MimeGEMF.png | Bin 3130 -> 3144 bytes
src/icons/48x48/MySQLNoConn.png | Bin 3485 -> 3782 bytes
src/icons/48x48/PastePlain.png | Bin 1186 -> 1184 bytes
src/icons/48x48/RegularScreen.png | Bin 0 -> 1150 bytes
src/icons/48x48/SQLiteNoConn.png | Bin 3352 -> 3726 bytes
src/icons/48x48/Template.png | Bin 0 -> 750 bytes
src/icons/48x48/ToggleDem.png | Bin 1095 -> 1246 bytes
src/icons/48x48/ToggleDocks.png | Bin 2168 -> 2337 bytes
src/icons/48x48/ToggleGis.png | Bin 1562 -> 1706 bytes
src/icons/48x48/ToggleMaps.png | Bin 1730 -> 2156 bytes
src/icons/48x48/ToggleRouter.png | Bin 1493 -> 1651 bytes
src/icons/48x48/ToolBar.png | Bin 429 -> 396 bytes
src/icons/48x48/ToolBarSetup.png | Bin 3512 -> 3774 bytes
src/icons/ActNone.svg | 215 ++-
src/icons/ActTrain.svg | 141 ++
src/icons/AutoSave.svg | 125 ++
src/icons/CSrcEnergy.svg | 328 ++++
src/icons/FullScreen.svg | 193 +++
src/icons/RegularScreen.svg | 156 ++
src/icons/Template.svg | 104 ++
src/icons/waypoints/32x32/1stCategory.png | Bin 832 -> 823 bytes
src/icons/waypoints/32x32/2ndCategory.png | Bin 963 -> 1065 bytes
src/icons/waypoints/32x32/3rdCategory.png | Bin 1107 -> 1164 bytes
src/icons/waypoints/32x32/4thCategory.png | Bin 942 -> 1030 bytes
src/icons/waypoints/32x32/BoxBlue.png | Bin 438 -> 453 bytes
src/icons/waypoints/32x32/BoxGreen.png | Bin 429 -> 458 bytes
src/icons/waypoints/32x32/BoxRed.png | Bin 435 -> 447 bytes
src/icons/waypoints/32x32/CityCapitol.png | Bin 604 -> 601 bytes
src/icons/waypoints/32x32/CityLarge.png | Bin 502 -> 500 bytes
src/icons/waypoints/32x32/CityMedium.png | Bin 424 -> 430 bytes
src/icons/waypoints/32x32/CitySmall.png | Bin 352 -> 334 bytes
src/icons/waypoints/32x32/Danger.png | Bin 910 -> 962 bytes
src/icons/waypoints/32x32/Default.png | Bin 1923 -> 2018 bytes
src/icons/waypoints/32x32/DiamondBlue.png | Bin 329 -> 326 bytes
src/icons/waypoints/32x32/DiamondGreen.png | Bin 436 -> 446 bytes
src/icons/waypoints/32x32/DiamondRed.png | Bin 327 -> 327 bytes
src/icons/waypoints/32x32/End.png | Bin 0 -> 780 bytes
src/icons/waypoints/32x32/FirstAid.png | Bin 467 -> 495 bytes
src/icons/waypoints/32x32/FlagBlue.png | Bin 699 -> 631 bytes
src/icons/waypoints/32x32/FlagGreen.png | Bin 750 -> 703 bytes
src/icons/waypoints/32x32/FlagRed.png | Bin 692 -> 625 bytes
src/icons/waypoints/32x32/Food.png | Bin 1482 -> 1531 bytes
src/icons/waypoints/32x32/Generic.png | Bin 779 -> 765 bytes
src/icons/waypoints/32x32/HorsCategory.png | Bin 850 -> 876 bytes
src/icons/waypoints/32x32/Left.png | Bin 663 -> 653 bytes
src/icons/waypoints/32x32/LeftFork.png | Bin 0 -> 771 bytes
src/icons/waypoints/32x32/MiddleFork.png | Bin 0 -> 796 bytes
src/icons/waypoints/32x32/PinBlue.png | Bin 626 -> 542 bytes
src/icons/waypoints/32x32/PinGreen.png | Bin 678 -> 603 bytes
src/icons/waypoints/32x32/PinRed.png | Bin 622 -> 545 bytes
src/icons/waypoints/32x32/Residence.png | Bin 1840 -> 1921 bytes
src/icons/waypoints/32x32/Right.png | Bin 623 -> 616 bytes
src/icons/waypoints/32x32/RightFork.png | Bin 0 -> 784 bytes
src/icons/waypoints/32x32/SharpLeft.png | Bin 0 -> 938 bytes
src/icons/waypoints/32x32/SharpRight.png | Bin 0 -> 944 bytes
src/icons/waypoints/32x32/SlightLeft.png | Bin 0 -> 972 bytes
src/icons/waypoints/32x32/SlightRight.png | Bin 0 -> 966 bytes
src/icons/waypoints/32x32/Sprint.png | Bin 1384 -> 1411 bytes
src/icons/waypoints/32x32/Start.png | Bin 0 -> 777 bytes
src/icons/waypoints/32x32/Straight.png | Bin 650 -> 662 bytes
src/icons/waypoints/32x32/Summit.png | Bin 1208 -> 1194 bytes
src/icons/waypoints/32x32/UTurn.png | Bin 0 -> 1040 bytes
src/icons/waypoints/32x32/Valley.png | Bin 962 -> 963 bytes
src/icons/waypoints/32x32/Water.png | Bin 916 -> 884 bytes
src/icons/waypoints/32x32/Waypoint.png | Bin 533 -> 497 bytes
src/icons/waypoints/End.svg | 101 ++
src/icons/waypoints/LeftFork.svg | 107 ++
src/icons/waypoints/MiddleFork.svg | 108 ++
src/icons/waypoints/RightFork.svg | 108 ++
src/icons/waypoints/SharpLeft.svg | 110 ++
src/icons/waypoints/SharpRight.svg | 110 ++
src/icons/waypoints/SlightLeft.svg | 109 ++
src/icons/waypoints/SlightRight.svg | 110 ++
src/icons/waypoints/Start.svg | 101 ++
src/icons/waypoints/UTurn.svg | 118 ++
src/locale/qmapshack.ts | 1203 +++++++++------
src/locale/qmapshack_cs.ts | 1225 +++++++++------
src/locale/qmapshack_de.ts | 1248 +++++++++------
src/locale/qmapshack_es.ts | 1596 ++++++++++++--------
src/locale/qmapshack_fr.ts | 1223 +++++++++------
src/locale/qmapshack_nl.ts | 1211 +++++++++------
src/locale/qmapshack_ru.ts | 1238 +++++++++------
src/map/CMapIMG.cpp | 4 +-
src/map/CMapIMG.h | 2 +-
src/map/CMapTMS.cpp | 121 +-
src/map/CMapTMS.h | 42 +-
src/map/CMapVRT.cpp | 10 +-
src/map/CMapWMTS.cpp | 122 +-
src/map/CMapWMTS.h | 35 +-
src/map/IMap.h | 3 +-
src/map/IMapOnline.cpp | 148 ++
src/map/{CMapTMS.h => IMapOnline.h} | 88 +-
src/mouse/CMouseEditArea.cpp | 7 +-
src/mouse/CMouseEditRte.cpp | 8 +-
src/mouse/CMouseEditTrk.cpp | 8 +-
src/mouse/CMouseSelect.cpp | 14 +-
src/mouse/CMouseSelect.h | 3 +-
src/mouse/CScrOptRangeTrk.cpp | 2 +-
src/mouse/IScrOptRangeTrk.ui | 2 +-
src/mouse/IScrOptSelect.ui | 18 +-
src/mouse/line/ILineOp.cpp | 2 +
src/mouse/line/IScrOptEditLine.ui | 4 +-
src/qlgt/CQlgtDb.cpp | 2 +-
src/qlgt/CQmsDb.cpp | 2 +-
src/resources.qrc | 54 +-
src/setup/CAppSetupMac.cpp | 10 +
src/templates/Hiking_Tour_Summary.ui | 369 +++++
src/tool/CMapVrtBuilder.cpp | 40 +
src/tool/CMapVrtBuilder.h | 1 +
src/tool/IMapVrtBuilder.ui | 179 ++-
src/tool/IToolShell.h | 4 +-
src/widgets/CTemplateWidget.cpp | 258 ++++
.../CMapVrtBuilder.h => widgets/CTemplateWidget.h} | 38 +-
src/widgets/CTextEditWidget.cpp | 16 +
src/widgets/CTextEditWidget.h | 3 +-
.../ICanvasSetup.ui => widgets/ITemplateWidget.ui} | 114 +-
src/widgets/ITextEditWidget.ui | 36 +-
225 files changed, 10270 insertions(+), 4136 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec63202..f6be2e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ set(APPLICATION_NAME qmapshack)
set(APPLICATION_VERSION_MAJOR "1")
set(APPLICATION_VERSION_MINOR "9")
-set(APPLICATION_VERSION_PATCH "0")
+set(APPLICATION_VERSION_PATCH "1")
add_definitions(-DVER_MAJOR=${APPLICATION_VERSION_MAJOR} -DVER_MINOR=${APPLICATION_VERSION_MINOR} -DVER_STEP=${APPLICATION_VERSION_PATCH} -DAPPLICATION_NAME=${PROJECT_NAME})
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
index 5006713..f443d06 100644
--- a/CMakeLists.txt.user
+++ b/CMakeLists.txt.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.1, 2017-07-23T16:04:11. -->
+<!-- Written by QtCreator 4.2.1, 2017-09-17T18:37:15. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
diff --git a/MacOSX/resources/Contents/Resources/fr.lproj/locversion.plist b/MacOSX/resources/Contents/Resources/fr.lproj/locversion.plist
new file mode 100644
index 0000000..62ae348
--- /dev/null
+++ b/MacOSX/resources/Contents/Resources/fr.lproj/locversion.plist
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
+"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>LprojCompatibleVersion</key>
+ <string>123</string>
+ <key>LprojLocale</key>
+ <string>fr</string>
+ <key>LprojRevisionLevel</key>
+ <string>1</string>
+ <key>LprojVersion</key>
+ <string>123</string>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/MacOSX/resources/Contents/Resources/nl.lproj/locversion.plist b/MacOSX/resources/Contents/Resources/nl.lproj/locversion.plist
new file mode 100644
index 0000000..1916347
--- /dev/null
+++ b/MacOSX/resources/Contents/Resources/nl.lproj/locversion.plist
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
+"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>LprojCompatibleVersion</key>
+ <string>123</string>
+ <key>LprojLocale</key>
+ <string>nl</string>
+ <key>LprojRevisionLevel</key>
+ <string>1</string>
+ <key>LprojVersion</key>
+ <string>123</string>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/MacOSX/resources/Contents/Resources/qms-style.qss b/MacOSX/resources/Contents/Resources/qms-style.qss
new file mode 100644
index 0000000..03021a0
--- /dev/null
+++ b/MacOSX/resources/Contents/Resources/qms-style.qss
@@ -0,0 +1,31 @@
+
+QToolBar {
+ padding-left: 5px;
+ spacing: 2px;
+ background: #ececec;
+ border: none
+}
+
+QToolBar > QToolButton {
+ border-radius: 5px;
+ padding: 0px;
+ background-color: #ececec;
+ border: none;
+ width: 24px;
+ height: 24px;
+}
+
+QToolBar > QToolButton:checked {
+ border: 1px solid #cdcdcd;
+ background-color: #d7d7d7;
+}
+
+QToolBar > QToolButton:pressed {
+ border: 1px solid #cdcdcd;
+ background-color: #d7d7d7;
+}
+
+QToolBar > QToolButton:hover {
+ border: 1px solid #cdcdcd;
+ background-color: #d7d7d7;
+}
diff --git a/changelog.txt b/changelog.txt
index 7dbce7b..c53177d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,22 @@
+V 1.9.1
+Add: Fullscreen mode
+Add: Templates for project documentation
+Add: FIT: added support for location file (containing waypoints).
+Add: Trk: Add action to set activity for a group of tracks
+Add: VRT Builder: Add advanced options (-a_srs -srcndata -vrtndata)
+Add: Optional auto save for projects
+Add: Trk: Add activity summary to screen option dialog
+Add: Prj: Show activity summary for tracks in project details dialog
+Fix: VRT: Test for overviews on multi-band maps, too
+Fix: FIT: Fixing missing last segment for records that miss the stop event.
+Fix: Progress dialog hides other dialogs in certain window managers
+Fix: Workaround CCanvas loss of mousetracking due to modal CProgressDialog
+Fix: Jump after pinch gesture
+[Issue #245] QMS hangs when entering new track name and window sizing in parallel
+[Issue #243] Incosistent behavior of "copy to ..." dialog
+[Issue #216] "No activity" statistics column missing in diary
+[Issue #248] Regularscreen.png vs. RegularScreen.png
+
V 1.9.0
Add: Garmin Maps: Allow external TYP files
Add: Filter items on workspace by string
diff --git a/src/CMainWindow.cpp b/src/CMainWindow.cpp
index f0827b4..c4a27d4 100644
--- a/src/CMainWindow.cpp
+++ b/src/CMainWindow.cpp
@@ -62,6 +62,8 @@
CMainWindow * CMainWindow::pSelf = nullptr;
+QMutex CMainWindow::mutex(QMutex::NonRecursive);
+
CMainWindow::CMainWindow()
: id(qrand())
{
@@ -82,19 +84,43 @@ CMainWindow::CMainWindow()
dockGis->setWidget(gisWidget);
// start ---- restore window geometry -----
- if ( cfg.contains("MainWindow/geometry"))
+ cfg.beginGroup("MainWindow");
+ if ( cfg.contains("geometry"))
{
- restoreGeometry(cfg.value("MainWindow/geometry").toByteArray());
+ restoreGeometry(cfg.value("geometry").toByteArray());
}
else
{
QTimer::singleShot(500, this, SLOT(showMaximized()));
}
- if ( cfg.contains("MainWindow/state"))
+ if ( cfg.contains("state"))
+ {
+ restoreState(cfg.value("state").toByteArray());
+ }
+
+ if (cfg.contains("displaymode"))
{
- restoreState(cfg.value("MainWindow/state").toByteArray());
+ displayMode = static_cast<Qt::WindowStates>(cfg.value("displaymode").toInt());
+ if (displayMode == Qt::WindowFullScreen)
+ {
+ displayMode = Qt::WindowMaximized;
+ }
}
+
+ if (cfg.contains("dockstate"))
+ {
+ dockStates = cfg.value("dockstate").toByteArray();
+ }
+
+ menuVisible = cfg.value("menuvisible",false).toBool();
+
+ if(windowState() == Qt::WindowFullScreen)
+ {
+ displayRegular();
+ }
+ cfg.endGroup();
+
// end ---- restore window geometry -----
connect(actionAbout, &QAction::triggered, this, &CMainWindow::slotAbout);
@@ -131,8 +157,8 @@ CMainWindow::CMainWindow()
connect(actionSetupWaypointIcons, &QAction::triggered, this, &CMainWindow::slotSetupWptIcons);
connect(actionCloseTab, &QAction::triggered, this, &CMainWindow::slotCloseTab);
connect(actionToggleDocks, &QAction::triggered, this, &CMainWindow::slotToggleDocks);
+ connect(actionFullScreen, &QAction::triggered, this, &CMainWindow::slotFullScreen);
connect(tabWidget, &QTabWidget::tabCloseRequested, this, &CMainWindow::slotTabCloseRequest);
-
connect(tabWidget, &QTabWidget::currentChanged, this, &CMainWindow::slotCurrentTabCanvas);
connect(tabMaps, &QTabWidget::currentChanged, this, &CMainWindow::slotCurrentTabMaps);
connect(tabDem, &QTabWidget::currentChanged, this, &CMainWindow::slotCurrentTabDem);
@@ -211,9 +237,9 @@ CMainWindow::CMainWindow()
<< dockGis
<< dockRte;
- if (cfg.contains(QStringLiteral("MainWindow/activedocks")))
+ if (cfg.contains("MainWindow/activedocks"))
{
- const QStringList & dockNames = cfg.value(QStringLiteral("MainWindow/activedocks")).toStringList();
+ const QStringList & dockNames = cfg.value("MainWindow/activedocks").toStringList();
for(QDockWidget * const & dock : docks)
{
if(dockNames.contains(dock->objectName()))
@@ -230,35 +256,35 @@ CMainWindow::CMainWindow()
QAction * actionToggleToolBar = toolBar->toggleViewAction();
- actionToggleToolBar->setObjectName(QStringLiteral("actionToggleToolBar"));
- actionToggleToolBar->setIcon(QIcon(QStringLiteral(":/icons/32x32/ToolBar.png")));
+ actionToggleToolBar->setObjectName("actionToggleToolBar");
+ actionToggleToolBar->setIcon(QIcon(":/icons/32x32/ToolBar.png"));
menuWindow->insertAction(actionSetupToolbar,actionToggleToolBar);
QAction * actionToggleMaps = dockMaps->toggleViewAction();
- actionToggleMaps->setObjectName(QStringLiteral("actionToggleMaps"));
- actionToggleMaps->setIcon(QIcon(QStringLiteral(":/icons/32x32/ToggleMaps.png")));
+ actionToggleMaps->setObjectName("actionToggleMaps");
+ actionToggleMaps->setIcon(QIcon(":/icons/32x32/ToggleMaps.png"));
menuWindow->insertAction(actionSetupToolbar,actionToggleMaps);
QAction * actionToggleDem = dockDem->toggleViewAction();
- actionToggleDem->setObjectName(QStringLiteral("actionToggleDem"));
- actionToggleDem->setIcon(QIcon(QStringLiteral(":/icons/32x32/ToggleDem.png")));
+ actionToggleDem->setObjectName("actionToggleDem");
+ actionToggleDem->setIcon(QIcon(":/icons/32x32/ToggleDem.png"));
menuWindow->insertAction(actionSetupToolbar,actionToggleDem);
QAction * actionToggleGis = dockGis->toggleViewAction();
- actionToggleGis->setObjectName(QStringLiteral("actionToggleGis"));
- actionToggleGis->setIcon(QIcon(QStringLiteral(":/icons/32x32/ToggleGis.png")));
+ actionToggleGis->setObjectName("actionToggleGis");
+ actionToggleGis->setIcon(QIcon(":/icons/32x32/ToggleGis.png"));
menuWindow->insertAction(actionSetupToolbar,actionToggleGis);
QAction * actionToggleRte = dockRte->toggleViewAction();
- actionToggleRte->setObjectName(QStringLiteral("actionToggleRte"));
- actionToggleRte->setIcon(QIcon(QStringLiteral(":/icons/32x32/ToggleRouter.png")));
+ actionToggleRte->setObjectName("actionToggleRte");
+ actionToggleRte->setIcon(QIcon(":/icons/32x32/ToggleRouter.png"));
menuWindow->insertAction(actionSetupToolbar,actionToggleRte);
menuWindow->insertSeparator(actionSetupToolbar);
- QAction * separator = new QAction(QStringLiteral("---------------"),this);
+ QAction * separator = new QAction("---------------",this);
separator->setSeparator(true);
- separator->setObjectName(QStringLiteral("separator"));
+ separator->setObjectName("separator");
QList<QAction *> availableActions;
availableActions << separator
@@ -304,11 +330,12 @@ CMainWindow::CMainWindow()
<< actionToggleGis
<< actionToggleRte
<< actionToggleDocks
- << actionToggleToolBar;
+ << actionToggleToolBar
+ << actionFullScreen;
- QAction * separator1 = new QAction(QStringLiteral("---------------"),this);
+ QAction * separator1 = new QAction("---------------",this);
separator1->setSeparator(true);
- separator1->setObjectName(QStringLiteral("separator"));
+ separator1->setObjectName("separator");
QList<QAction *> defaultActions;
defaultActions << actionSearchGoogle
@@ -328,13 +355,24 @@ CMainWindow::CMainWindow()
<< actionToggleDem
<< actionToggleGis
<< actionToggleRte
- << actionToggleDocks;
+ << actionToggleDocks
+ << actionFullScreen;
toolBarConfig = new CToolBarConfig(this, toolBar, availableActions, defaultActions);
toolBarConfig->loadSettings();
prepareMenuForMac();
+ // make sure all actions that have a shortcut are available even when menu and toolbar are not visible
+ for (QAction * action : availableActions)
+ {
+ if (!action->shortcuts().isEmpty())
+ {
+ addAction(action);
+ }
+ }
+
+
loadGISData(qlOpts->arguments);
QTimer::singleShot(100, this, SLOT(slotSanityTest()));
@@ -354,15 +392,21 @@ CMainWindow::~CMainWindow()
CActivityTrk::release();
SETTINGS;
- cfg.setValue("MainWindow/state", saveState());
- cfg.setValue("MainWindow/geometry", saveGeometry());
- cfg.setValue("MainWindow/units", IUnit::self().type);
+ cfg.beginGroup("MainWindow");
+ cfg.setValue("state", saveState());
+ cfg.setValue("geometry", saveGeometry());
+ cfg.setValue("units", IUnit::self().type);
QStringList activeDockNames;
for (QDockWidget * const & dock : activeDocks)
{
activeDockNames << dock->objectName();
}
- cfg.setValue("MainWindow/activedocks",activeDockNames);
+ cfg.setValue("activedocks",activeDockNames);
+
+ cfg.setValue("displaymode",static_cast<int>(displayMode));
+ cfg.setValue("dockstate",dockStates);
+ cfg.setValue("menuvisible",menuVisible);
+ cfg.endGroup();
/*
The "Canvas" section will hold all settings global to all views
@@ -1205,44 +1249,56 @@ void CMainWindow::slotCloseTab()
void CMainWindow::slotToggleDocks()
{
- bool isHidden = true;
+ if (docksVisible())
+ {
+ hideDocks();
+ }
+ else
+ {
+ showDocks();
+ }
+}
+
+bool CMainWindow::docksVisible() const
+{
for (QDockWidget * const & dock : docks)
{
if (!dock->isHidden())
{
- isHidden = false;
- break;
+ return true;
}
}
+ return false;
+}
- if (isHidden)
+void CMainWindow::showDocks() const
+{
+ if (activeDocks.isEmpty())
{
- if (activeDocks.isEmpty())
+ for (QDockWidget * const & dock : docks)
{
- for (QDockWidget * const & dock : docks)
- {
- dock->show();
- }
+ dock->show();
}
- else
+ }
+ else
+ {
+ const QList<QDockWidget *> docksToShow(activeDocks);
+ for (QDockWidget * const & dock : docksToShow)
{
- const QList<QDockWidget *> docksToShow(activeDocks);
- for (QDockWidget * const & dock : docksToShow)
- {
- dock->show();
- }
+ dock->show();
}
}
- else
+}
+
+void CMainWindow::hideDocks()
+{
+ activeDocks.clear();
+ for (QDockWidget * const & dock : docks)
{
- activeDocks.clear();
- for (QDockWidget * const & dock : docks)
+ if (!dock->isHidden())
{
- if (!dock->isHidden())
- {
- dock->hide();
- activeDocks << dock;
- }
+ dock->hide();
+ activeDocks << dock;
}
}
}
@@ -1267,6 +1323,62 @@ void CMainWindow::slotDockVisibilityChanged(bool visible)
actionToggleDocks->setChecked(visible);
}
+void CMainWindow::slotFullScreen()
+{
+ QMutexLocker lock(&CMainWindow::mutex);
+
+ Qt::WindowStates state = windowState();
+ if(state == Qt::WindowFullScreen)
+ {
+ displayRegular();
+ }
+ else
+ {
+ displayMode = state;
+ displayFullscreen();
+ }
+}
+
+void CMainWindow::displayRegular()
+{
+ if (!dockStates.isEmpty())
+ {
+ restoreState(dockStates);
+ }
+ tabWidget->tabBar()->setVisible(true);
+ statusBar()->setVisible(true);
+ if (menuVisible)
+ {
+ menuBar()->setVisible(true);
+ }
+ actionFullScreen->setIcon(QIcon(":/icons/32x32/FullScreen.png"));
+ setWindowState(displayMode);
+}
+
+void CMainWindow::displayFullscreen()
+{
+ dockStates = saveState();
+ setWindowState(Qt::WindowFullScreen);
+ statusBar()->setVisible(false);
+ menuVisible = menuBar()->isVisible();
+ // menu is handled dynamically as on some platforms (e.g. ubuntu with unity)
+ // the menu is not visible but it's actions are active nevertheless
+ if (menuVisible)
+ {
+ menuBar()->setVisible(false);
+ }
+ if (docksVisible())
+ {
+ hideDocks();
+ }
+ if (!toolBarConfig->visibleInFullscreen())
+ {
+ toolBar->setVisible(false);
+ }
+ tabWidget->tabBar()->setVisible(false);
+ actionFullScreen->setIcon(QIcon(":/icons/32x32/RegularScreen.png"));
+}
+
#ifdef WIN32
static void sendDeviceEvent(DWORD unitmask, bool add)
diff --git a/src/CMainWindow.h b/src/CMainWindow.h
index 8e98ada..af3b485 100644
--- a/src/CMainWindow.h
+++ b/src/CMainWindow.h
@@ -138,12 +138,18 @@ private slots:
void slotCloseTab();
void slotToggleDocks();
void slotDockVisibilityChanged(bool visible);
+ void slotFullScreen();
private:
friend int main(int argc, char ** argv);
CMainWindow();
void prepareMenuForMac();
void testForNoView();
+ bool docksVisible() const;
+ void showDocks() const;
+ void hideDocks();
+ void displayRegular();
+ void displayFullscreen();
static CMainWindow * pSelf;
@@ -161,6 +167,11 @@ private:
QList<QDockWidget *> docks;
QList<QDockWidget *> activeDocks;
+ Qt::WindowStates displayMode = Qt::WindowMaximized;
+ QByteArray dockStates;
+ bool menuVisible = false;
+
+ static QMutex mutex;
};
#endif //CMAINWINDOW_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2d79a4a..69f8d90 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,21 +35,22 @@ if(BUILD_FOR_LOCAL_SYSTEM)
endif(BUILD_FOR_LOCAL_SYSTEM)
# Find the QtWidgets library
-find_package(Qt5Widgets)
-find_package(Qt5Core)
-find_package(Qt5Xml)
-find_package(Qt5Script)
-find_package(Qt5Sql)
-find_package(Qt5WebKitWidgets)
-find_package(Qt5LinguistTools)
-find_package(Qt5PrintSupport)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Xml REQUIRED)
+find_package(Qt5Script REQUIRED)
+find_package(Qt5Sql REQUIRED)
+find_package(Qt5WebKitWidgets REQUIRED)
+find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt5PrintSupport REQUIRED)
+find_package(Qt5UiTools REQUIRED)
find_package(GDAL REQUIRED)
find_package(PROJ REQUIRED)
find_package(ROUTINO REQUIRED)
find_package(QuaZip REQUIRED)
if(USE_QT5DBus)
- find_package(Qt5DBus)
+ find_package(Qt5DBus REQUIRED)
if(Qt5DBus_FOUND)
add_definitions(-DHAVE_DBUS)
endif(Qt5DBus_FOUND)
@@ -68,7 +69,7 @@ function(cxx_add_flag_if_supported flag)
endfunction(cxx_add_flag_if_supported)
if(UNIX)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -lstdc++ -lm")
endif(UNIX)
if (APPLE)
@@ -100,6 +101,7 @@ set( SRCS
widgets/CColorLegend.cpp
widgets/CColorChooser.cpp
widgets/CSelectDoubleListWidget.cpp
+ widgets/CTemplateWidget.cpp
helpers/CInputDialog.cpp
helpers/CPositionDialog.cpp
helpers/CWptIconDialog.cpp
@@ -128,6 +130,7 @@ set( SRCS
dem/CDemPathSetup.cpp
dem/CDemPropSetup.cpp
map/IMap.cpp
+ map/IMapOnline.cpp
map/CMapDraw.cpp
map/CMapGEMF.cpp
map/CMapItem.cpp
@@ -386,6 +389,7 @@ set( HDRS
widgets/CColorLegend.h
widgets/CColorChooser.h
widgets/CSelectDoubleListWidget.h
+ widgets/CTemplateWidget.h
helpers/Platform.h
helpers/CFileExt.h
helpers/CSettings.h
@@ -417,6 +421,7 @@ set( HDRS
dem/CDemPathSetup.h
dem/CDemPropSetup.h
map/IMap.h
+ map/IMapOnline.h
map/IMapProp.h
map/CMapDraw.h
map/CMapGEMF.h
@@ -667,6 +672,7 @@ set( UIS
widgets/IPhotoAlbum.ui
widgets/IColorChooser.ui
widgets/ISelectDoubleListWidget.ui
+ widgets/ITemplateWidget.ui
helpers/IInputDialog.ui
helpers/IPositionDialog.ui
helpers/IWptIconDialog.ui
@@ -745,6 +751,7 @@ set( UIS
tool/IMapVrtBuilder.ui
tool/IRoutinoDatabaseBuilder.ui
print/IPrintDialog.ui
+ templates/Hiking_Tour_Summary.ui
)
@@ -828,6 +835,7 @@ target_link_libraries(${APPLICATION_NAME}
Qt5::Sql
Qt5::WebKitWidgets
Qt5::PrintSupport
+ Qt5::UiTools
${DBUS_LIB}
${GDAL_LIBRARIES}
${PROJ_LIBRARIES}
diff --git a/src/CSingleInstanceProxy.cpp b/src/CSingleInstanceProxy.cpp
index 7e83ed4..b6ee3c2 100644
--- a/src/CSingleInstanceProxy.cpp
+++ b/src/CSingleInstanceProxy.cpp
@@ -77,7 +77,7 @@ void CSingleInstanceProxy::slotNewConnection()
return;
}
- // Each secondoray instance will send a QStringList with files to open
+ // Each secondary instance will send a QStringList with files to open
// The list can be empty.
if(socket->waitForReadyRead(3000))
{
diff --git a/src/IMainWindow.ui b/src/IMainWindow.ui
index 4e256b5..385b11f 100644
--- a/src/IMainWindow.ui
+++ b/src/IMainWindow.ui
@@ -103,6 +103,7 @@
<string>Window</string>
</property>
<addaction name="actionCloseTab"/>
+ <addaction name="actionFullScreen"/>
<addaction name="actionToggleDocks"/>
<addaction name="separator"/>
<addaction name="actionSetupToolbar"/>
@@ -844,6 +845,18 @@
<string>Ctrl+D</string>
</property>
</action>
+ <action name="actionFullScreen">
+ <property name="icon">
+ <iconset resource="resources.qrc">
+ <normaloff>:/icons/32x32/FullScreen.png</normaloff>:/icons/32x32/FullScreen.png</iconset>
+ </property>
+ <property name="text">
+ <string>Full Screen</string>
+ </property>
+ <property name="shortcut">
+ <string>F11</string>
+ </property>
+ </action>
</widget>
<customwidgets>
<customwidget>
diff --git a/src/canvas/CCanvas.cpp b/src/canvas/CCanvas.cpp
index dc109fd..d6abfc2 100644
--- a/src/canvas/CCanvas.cpp
+++ b/src/canvas/CCanvas.cpp
@@ -433,7 +433,7 @@ void CCanvas::wheelEvent(QWheelEvent * e)
// angleDelta() returns the eighths of a degree
// of the mousewheel
- // -> zoom in/out every 15 degress = every 120 eights
+ // -> zoom in/out every 15 degrees = every 120 eights
const int EIGHTS_ZOOM = 15 * 8;
zoomAngleDelta += e->angleDelta().y();
if(abs(zoomAngleDelta) < EIGHTS_ZOOM)
@@ -957,6 +957,33 @@ bool CCanvas::event(QEvent *event)
{
return gestureEvent(static_cast<QGestureEvent*>(event));
}
+ else if (isPinch)
+ {
+ QMouseEvent * me = dynamic_cast<QMouseEvent*>(event);
+ if (me != nullptr)
+ {
+ isPinch = false;
+
+ // right after executing a pinchgesture when placing the finger at some
+ // other place on the screen the generated QMouseEvent sometimes is not the expected
+ // MouseButtonPress but a MouseMove. As the last known position is where the first
+ // finger was set to start the pinch this MouseMove forces the map to 'jump' by a major
+ // and unexpected distance.
+ // As a workouround an artificial MouseButtonPress-event is inserted which resets the start
+ // of the beginning MouseMove to the current finger-position.
+
+ if (event->type() == QEvent::MouseMove)
+ {
+ QWidget::event(new QMouseEvent(QEvent::MouseButtonPress,
+ me->pos(),
+ me->windowPos(),
+ me->globalPos(),
+ Qt::LeftButton,
+ Qt::LeftButton,
+ me->modifiers()));
+ }
+ }
+ }
return QWidget::event(event);
}
@@ -992,6 +1019,7 @@ bool CCanvas::gestureEvent(QGestureEvent* e)
slotTriggerCompleteUpdate(needsRedraw);
}
}
+ isPinch = true;
}
return true;
}
diff --git a/src/canvas/CCanvas.h b/src/canvas/CCanvas.h
index 6eb6b5b..cee4058 100644
--- a/src/canvas/CCanvas.h
+++ b/src/canvas/CCanvas.h
@@ -231,6 +231,7 @@ private:
QMap<QString, QString> statusMessages;
QMutex mousePressMutex;
+ bool isPinch = false;
};
#endif //CCANVAS_H
diff --git a/src/canvas/ICanvasSetup.ui b/src/canvas/ICanvasSetup.ui
index 9a2697b..8629d62 100644
--- a/src/canvas/ICanvasSetup.ui
+++ b/src/canvas/ICanvasSetup.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>446</width>
- <height>179</height>
+ <height>196</height>
</rect>
</property>
<property name="windowTitle">
@@ -63,7 +63,7 @@
<item>
<widget class="QRadioButton" name="radioScalesSquare">
<property name="text">
- <string>Square (optimized for TMS and WTMS tiles)</string>
+ <string>Square (optimized for TMS and WMTS tiles)</string>
</property>
</widget>
</item>
diff --git a/src/device/CDeviceGarmin.cpp b/src/device/CDeviceGarmin.cpp
index d5f84b6..7e01853 100644
--- a/src/device/CDeviceGarmin.cpp
+++ b/src/device/CDeviceGarmin.cpp
@@ -95,6 +95,10 @@ CDeviceGarmin::CDeviceGarmin(const QString &path, const QString &key, const QStr
// courses
pathCourses = xmlPath.toElement().text();
}
+ else if(name == "FIT_TYPE_8")
+ {
+ pathLocations = xmlPath.toElement().text();
+ }
else if(name == "Adventures")
{
pathAdventures = xmlPath.toElement().text();
@@ -106,8 +110,10 @@ CDeviceGarmin::CDeviceGarmin(const QString &path, const QString &key, const QStr
qDebug() << dir.absoluteFilePath(pathSpoilers);
qDebug() << dir.absoluteFilePath(pathActivities);
qDebug() << dir.absoluteFilePath(pathCourses);
+ qDebug() << dir.absoluteFilePath(pathLocations);
qDebug() << dir.absoluteFilePath(pathAdventures);
+
if(!dir.exists(pathGpx))
{
dir.mkpath(pathGpx);
@@ -137,6 +143,7 @@ CDeviceGarmin::CDeviceGarmin(const QString &path, const QString &key, const QStr
this->createProjectsFromFiles(pathActivities, "fit");
this->createProjectsFromFiles(pathCourses, "fit");
+ this->createProjectsFromFiles(pathLocations, "fit");
}
void CDeviceGarmin::createProjectsFromFiles(QString subdirecoty, QString fileEnding)
diff --git a/src/device/CDeviceGarmin.h b/src/device/CDeviceGarmin.h
index 570c8fb..f8807a9 100644
--- a/src/device/CDeviceGarmin.h
+++ b/src/device/CDeviceGarmin.h
@@ -48,6 +48,7 @@ private:
QString pathSpoilers = "Garmin/GeocachePhotos";
QString pathActivities = "Garmin/Activities";
QString pathCourses = "Garmin/Courses";
+ QString pathLocations = "Garmin/Locations";
QString pathAdventures; // no default
int cntImages = 0;
diff --git a/src/gis/CGisListWks.cpp b/src/gis/CGisListWks.cpp
index e014177..3110dd8 100644
--- a/src/gis/CGisListWks.cpp
+++ b/src/gis/CGisListWks.cpp
@@ -103,7 +103,6 @@ CGisListWks::CGisListWks(QWidget *parent)
actionShowOnMap = menuProjectWks->addAction(QIcon("://icons/32x32/ShowAll.png" ), tr("Show on Map" ), this, SLOT(slotShowOnMap()));
actionHideFrMap = menuProjectWks->addAction(QIcon("://icons/32x32/ShowNone.png" ), tr("Hide from Map" ), this, SLOT(slotHideFrMap()));
-
menuProjectWks->addSeparator();
actionGroup = new QActionGroup(menuProjectWks);
actionGroup->setExclusive(true);
@@ -111,9 +110,13 @@ CGisListWks::CGisListWks(QWidget *parent)
actionSortByName = addSortAction(menuProjectWks, actionGroup, "://icons/32x32/SortName.png", tr("Sort by Name"), IGisProject::eSortFolderName);
menuProjectWks->addSeparator();
+ actionAutoSave = menuProjectWks->addAction(QIcon("://icons/32x32/AutoSave.png"), tr("Autom. Save"));
+ actionAutoSave->setCheckable(true);
+
+ menuProjectWks->addSeparator();
actionSave = menuProjectWks->addAction(QIcon("://icons/32x32/SaveGIS.png" ), tr("Save" ), this, SLOT(slotSaveProject()));
actionSaveAs = menuProjectWks->addAction(QIcon("://icons/32x32/SaveGISAs.png" ), tr("Save as..." ), this, SLOT(slotSaveAsProject()));
- actionSaveAsStrict = menuProjectWks->addAction(QIcon("://icons/32x32/SaveGISAsGpx11.png" ), tr("Save as GPX 1.1 w/o ext..."), this, SLOT(slotSaveAsStrictGpx11Project()));
+ actionSaveAsStrict = menuProjectWks->addAction(QIcon("://icons/32x32/SaveGISAsGpx11.png"), tr("Save as GPX 1.1 w/o ext..."), this, SLOT(slotSaveAsStrictGpx11Project()));
menuProjectWks->addSeparator();
actionSyncWksDev = menuProjectWks->addAction(QIcon("://icons/32x32/Device.png" ), tr("Send to Devices"), this, SLOT(slotSyncWksDev()));
@@ -152,6 +155,7 @@ CGisListWks::CGisListWks(QWidget *parent)
actionEditTrk = menuItemTrk->addAction(QIcon("://icons/32x32/LineMove.png"), tr("Edit Track Points" ), this, SLOT(slotEditTrk()));
actionReverseTrk = menuItemTrk->addAction(QIcon("://icons/32x32/Reverse.png"), tr("Reverse Track" ), this, SLOT(slotReverseTrk()));
actionCombineTrk = menuItemTrk->addAction(QIcon("://icons/32x32/Combine.png"), tr("Combine Tracks" ), this, SLOT(slotCombineTrk()));
+ actionActivityTrk= menuItemTrk->addAction(QIcon("://icons/32x32/Activity.png"), tr("Set Track Activity"), this, SLOT(slotActivityTrk()));
actionCopyTrkWithWpt = menuItemTrk->addAction(QIcon("://icons/32x32/CopyTrkWithWpt.png"), tr("Copy Track with Waypoints"), this, SLOT(slotCopyTrkWithWpt()));
menuItemTrk->addSeparator();
actionDelete = menuItemTrk->addAction(QIcon("://icons/32x32/DeleteOne.png"),tr("Delete"), this, SLOT(slotDeleteItem()));
@@ -195,12 +199,15 @@ CGisListWks::CGisListWks(QWidget *parent)
actionRteFromWpt = menuItem->addAction(QIcon("://icons/32x32/Route.png"), tr("Create Route"), this, SLOT(slotRteFromWpt()));
actionSymWpt = menuItem->addAction(QIcon("://icons/waypoints/32x32/PinBlue.png"), tr("Change Icon (sel. waypt. only)"), this, SLOT(slotSymWpt()));
menuItem->addAction(actionCombineTrk);
+ menuItem->addAction(actionActivityTrk);
+
menuItem->addAction(actionDelete);
- connect(actionFocusTrk, &QAction::triggered, this, &CGisListWks::slotFocusTrk);
- connect(actionFocusRte, &QAction::triggered, this, &CGisListWks::slotFocusRte);
- connect(qApp, &QApplication::aboutToQuit, this, &CGisListWks::slotSaveWorkspace);
+ connect(actionFocusTrk, &QAction::triggered, this, &CGisListWks::slotFocusTrk);
+ connect(actionFocusRte, &QAction::triggered, this, &CGisListWks::slotFocusRte);
+ connect(actionAutoSave, &QAction::triggered, this, &CGisListWks::slotAutoSaveProject);
+ connect(qApp, &QApplication::aboutToQuit, this, &CGisListWks::slotSaveWorkspace);
SETTINGS;
saveOnExit = cfg.value("Database/saveOnExit", saveOnExit).toBool();
@@ -980,6 +987,7 @@ void CGisListWks::slotContextMenu(const QPoint& point)
actionGroup->setEnabled(false);
actionSyncWksDev->setEnabled(IDevice::count());
actionSyncDB->setEnabled(project->getType() == IGisProject::eTypeDb);
+ actionAutoSave->setVisible(false);
menuProjectWks->exec(p);
}
return;
@@ -1015,6 +1023,7 @@ void CGisListWks::slotContextMenu(const QPoint& point)
actionRteFromWpt->setEnabled(onlyWpts);
actionCombineTrk->setEnabled(onlyTrks);
+ actionActivityTrk->setEnabled(onlyTrks);
actionSymWpt->setEnabled(hasWpts);
menuItem->exec(p);
@@ -1058,6 +1067,10 @@ void CGisListWks::slotContextMenu(const QPoint& point)
blockSorting = false;
+ actionAutoSave->setVisible(true);
+ actionAutoSave->setEnabled(project->canSave());
+ actionAutoSave->setChecked(project->isAutoSave());
+
menuProjectWks->exec(p);
}
}
@@ -1263,6 +1276,17 @@ void CGisListWks::slotSaveAsStrictGpx11Project()
}
}
+void CGisListWks::slotAutoSaveProject(bool on)
+{
+ CGisListWksEditLock lock(false, IGisItem::mutexItems);
+
+ IGisProject * project = dynamic_cast<IGisProject*>(currentItem());
+ if(project != nullptr)
+ {
+ project->setAutoSave(on);
+ }
+}
+
void CGisListWks::slotEditPrj()
{
CGisListWksEditLock lock(false, IGisItem::mutexItems);
@@ -1290,7 +1314,7 @@ void CGisListWks::slotItemChanged(QTreeWidgetItem * item, int column)
{
CGisListWksEditLock lock(true, IGisItem::mutexItems);
- if(column == CGisListDB::eColumnCheckbox)
+ if(column == eColumnCheckBox)
{
emit sigChanged();
}
@@ -1446,6 +1470,24 @@ void CGisListWks::slotCombineTrk()
}
}
+void CGisListWks::slotActivityTrk()
+{
+ quint32 flags = CActivityTrk::selectActivity(this);
+ if(0xFFFFFFFF != flags)
+ {
+ CGisListWksEditLock lock(true, IGisItem::mutexItems);
+ QList<QTreeWidgetItem*> items = selectedItems();
+ for(QTreeWidgetItem * item : items)
+ {
+ CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(item);
+ if(trk)
+ {
+ trk->setActivity(flags);
+ }
+ }
+ }
+}
+
void CGisListWks::slotRangeTrk()
{
CGisListWksEditLock lock(false, IGisItem::mutexItems);
@@ -1543,7 +1585,10 @@ void CGisListWks::slotAddEmptyProject()
QString key, name;
IGisProject::type_e type;
CSelectProjectDialog dlg(key, name, type, nullptr);
- dlg.exec();
+ if(dlg.exec() == QDialog::Rejected)
+ {
+ return;
+ }
if(name.isEmpty() && (type != IGisProject::eTypeDb))
{
return;
@@ -1847,6 +1892,20 @@ bool CGisListWks::event(QEvent * e)
e->accept();
return true;
}
+
+ case eEvtA2WSave:
+ {
+ CEvtA2WSave * evt = (CEvtA2WSave*)e;
+
+ IGisProject * project = getProjectByKey(evt->key);
+ if(project)
+ {
+ project->save();
+ project->confirmPendingAutoSave();
+ }
+ e->accept();
+ return true;
+ }
}
}
return QTreeWidget::event(e);
diff --git a/src/gis/CGisListWks.h b/src/gis/CGisListWks.h
index d8d99cc..ce92df9 100644
--- a/src/gis/CGisListWks.h
+++ b/src/gis/CGisListWks.h
@@ -42,8 +42,9 @@ public:
enum column_e
{
- eColumnDecoration = 0
- ,eColumnIcon = 0
+ eColumnIcon = 0
+ ,eColumnCheckBox = eColumnIcon
+ ,eColumnDecoration = eColumnIcon
,eColumnName = 1
};
@@ -93,6 +94,7 @@ private slots:
void slotReverseTrk();
void slotCombineTrk();
void slotRangeTrk();
+ void slotActivityTrk();
void slotCopyTrkWithWpt();
void slotFocusRte(bool on);
void slotCalcRte();
@@ -111,6 +113,7 @@ private slots:
void slotSetSortMode(IGisProject::sorting_folder_e mode, bool checked);
void slotCopyProject();
void slotSymWpt();
+ void slotAutoSaveProject(bool on);
private:
@@ -128,6 +131,7 @@ private:
QAction * actionSave;
QAction * actionSaveAs;
QAction * actionSaveAsStrict;
+ QAction * actionAutoSave;
QAction * actionCopyPrj;
QAction * actionEditPrj;
QAction * actionCloseProj;
@@ -164,6 +168,7 @@ private:
QAction * actionReverseTrk;
QAction * actionCombineTrk;
QAction * actionRangeTrk;
+ QAction * actionActivityTrk;
QAction * actionCopyTrkWithWpt;
QAction * actionFocusRte;
QAction * actionCalcRte;
diff --git a/src/gis/CGisWidget.cpp b/src/gis/CGisWidget.cpp
index 5c10f0c..3285d11 100644
--- a/src/gis/CGisWidget.cpp
+++ b/src/gis/CGisWidget.cpp
@@ -148,6 +148,8 @@ void CGisWidget::applyFilter()
void CGisWidget::slotFilter(const QString& str)
{
+ actionClearFilter->setIcon(str.isEmpty() ? QIcon("://icons/32x32/Zoom.png") : QIcon("://icons/32x32/Cancel.png"));
+
CCanvas::setOverrideCursor(Qt::WaitCursor, "slotFilter");
QMutexLocker lock(&IGisItem::mutexItems);
@@ -207,7 +209,10 @@ IGisProject * CGisWidget::selectProject()
IGisProject::type_e type = IGisProject::eTypeQms;
CSelectProjectDialog dlg(key, name, type, treeWks);
- dlg.exec();
+ if(dlg.exec() == QDialog::Rejected)
+ {
+ return nullptr;
+ }
IGisProject *project = nullptr;
if(!key.isEmpty())
@@ -773,6 +778,28 @@ void CGisWidget::combineTrkByKey(const QList<IGisItem::key_t>& keys, const QList
emit sigChanged();
}
+void CGisWidget::activityTrkByKey(const QList<IGisItem::key_t>& keys)
+{
+ if(keys.isEmpty())
+ {
+ return;
+ }
+
+ quint32 flags = CActivityTrk::selectActivity(this);
+ if(0xFFFFFFFF != flags)
+ {
+ QMutexLocker lock(&IGisItem::mutexItems);
+ for(const IGisItem::key_t& key : keys)
+ {
+ CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(getItemByKey(key));
+ if(trk != nullptr)
+ {
+ trk->setActivity(flags);
+ }
+ }
+ }
+}
+
void CGisWidget::editTrkByKey(const IGisItem::key_t& key)
{
QMutexLocker lock(&IGisItem::mutexItems);
diff --git a/src/gis/CGisWidget.h b/src/gis/CGisWidget.h
index 69de115..154f3b3 100644
--- a/src/gis/CGisWidget.h
+++ b/src/gis/CGisWidget.h
@@ -44,7 +44,8 @@ enum event_types_e
,eEvtW2DAckInfo = QEvent::User + 100
,eEvtW2DCreate = QEvent::User + 101
- ,eEvtA2WCutTrk = QEvent::User + 200
+ ,eEvtA2WCutTrk = QEvent::User + 200
+ ,eEvtA2WSave = QEvent::User + 201
};
struct evt_item_t
@@ -207,6 +208,16 @@ public:
const IGisItem::key_t key;
};
+class CEvtA2WSave : public QEvent
+{
+public:
+ CEvtA2WSave(const QString& key) : QEvent(QEvent::Type(eEvtA2WSave)), key(key)
+ {
+ }
+
+ const QString key;
+};
+
class CGisWidget : public QWidget, private Ui::IGisWidget
{
@@ -360,6 +371,8 @@ public:
*/
void combineTrkByKey(const QList<IGisItem::key_t>& keys, const QList<IGisItem::key_t> &keysPreSel);
+ void activityTrkByKey(const QList<IGisItem::key_t>& keys);
+
void rangeTrkByKey(const IGisItem::key_t &key);
void copyTrkWithWptByKey(const IGisItem::key_t &key);
diff --git a/src/gis/IGisItem.cpp b/src/gis/IGisItem.cpp
index 8dd545a..737e910 100644
--- a/src/gis/IGisItem.cpp
+++ b/src/gis/IGisItem.cpp
@@ -283,7 +283,7 @@ QString IGisItem::getNameEx() const
void IGisItem::updateDecoration(quint32 enable, quint32 disable)
{
// update text and icon
- setToolTip(CGisListWks::eColumnName,getInfo(true, false));
+ setToolTip(CGisListWks::eColumnName,getInfo(IGisItem::eFeatureShowName));
setText(CGisListWks::eColumnName, getName());
setSymbol();
diff --git a/src/gis/IGisItem.h b/src/gis/IGisItem.h
index 59a26c0..6e109af 100644
--- a/src/gis/IGisItem.h
+++ b/src/gis/IGisItem.h
@@ -248,6 +248,15 @@ public:
*/
virtual QString getNameEx() const;
+
+ enum features_e
+ {
+ eFeatureNone = 0
+ , eFeatureShowName = 0x00000001
+ , eFeatureShowFullText = 0x00000002
+ , eFeatureShowActivity = 0x00000004
+ };
+
/**
@brief Get a short string with the items properties to be displayed in tool tips or similar
@@ -256,7 +265,7 @@ public:
@return A string object.
*/
- virtual QString getInfo(bool showName, bool showFullText) const = 0;
+ virtual QString getInfo(quint32 features) const = 0;
virtual const QString& getComment() const = 0;
virtual const QString& getDescription() const = 0;
@@ -483,7 +492,7 @@ public:
@param desc the description string
@param links a list of links
@param key some key to be sent with the header links
- @return The formated text ready to be used.
+ @return The formatted text ready to be used.
*/
static QString createText(bool isReadOnly, const QString& desc, const QList<link_t>& links, const QString& key = "");
/**
diff --git a/src/gis/IGisWidget.ui b/src/gis/IGisWidget.ui
index 8694d63..be88215 100644
--- a/src/gis/IGisWidget.ui
+++ b/src/gis/IGisWidget.ui
@@ -199,7 +199,7 @@
<action name="actionClearFilter">
<property name="icon">
<iconset resource="../resources.qrc">
- <normaloff>:/icons/32x32/Cancel.png</normaloff>:/icons/32x32/Cancel.png</iconset>
+ <normaloff>:/icons/32x32/Zoom.png</normaloff>:/icons/32x32/Zoom.png</iconset>
</property>
<property name="text">
<string>Clear Filter</string>
diff --git a/src/gis/WptIcons.cpp b/src/gis/WptIcons.cpp
index ac9d577..3d8cf15 100644
--- a/src/gis/WptIcons.cpp
+++ b/src/gis/WptIcons.cpp
@@ -71,6 +71,16 @@ void initWptIcons()
wptIcons["Summit"] = icon_t("://icons/waypoints/32x32/Summit.png", 16, 16);
wptIcons["Valley"] = icon_t("://icons/waypoints/32x32/Valley.png", 16, 16);
wptIcons["Water"] = icon_t("://icons/waypoints/32x32/Water.png", 16, 16);
+ wptIcons["LeftFork"] = icon_t("://icons/waypoints/32x32/LeftFork.png", 16, 16);
+ wptIcons["RightFork"] = icon_t("://icons/waypoints/32x32/RightFork.png", 16, 16);
+ wptIcons["MiddleFork"] = icon_t("://icons/waypoints/32x32/MiddleFork.png", 16, 16);
+ wptIcons["SlightLeft"] = icon_t("://icons/waypoints/32x32/SlightLeft.png", 16, 16);
+ wptIcons["SharpLeft"] = icon_t("://icons/waypoints/32x32/SharpLeft.png", 16, 16);
+ wptIcons["SlightRight"] = icon_t("://icons/waypoints/32x32/SlightRight.png", 16, 16);
+ wptIcons["SharpRight"] = icon_t("://icons/waypoints/32x32/SharpRight.png", 16, 16);
+ wptIcons["UTurn"] = icon_t("://icons/waypoints/32x32/UTurn.png", 16, 16);
+ wptIcons["Start"] = icon_t("://icons/waypoints/32x32/Start.png", 16, 16);
+ wptIcons["End"] = icon_t("://icons/waypoints/32x32/End.png", 16, 16);
setWptIconByName("Traditional Cache", "://icons/cache/32x32/traditional.png");
setWptIconByName("Multi-cache", "://icons/cache/32x32/multi.png");
diff --git a/src/gis/db/CDBProject.cpp b/src/gis/db/CDBProject.cpp
index 323487d..108d154 100644
--- a/src/gis/db/CDBProject.cpp
+++ b/src/gis/db/CDBProject.cpp
@@ -99,6 +99,7 @@ CDBProject::CDBProject(const QString& dbName, quint64 id, CGisListWks *parent)
setupName(name);
setToolTip(CGisListWks::eColumnName, getInfo());
updateItems();
+
valid = true;
}
@@ -246,7 +247,7 @@ void CDBProject::postStatus(bool updateLostFound)
// updateItems(); <--- don't! this is causing a crash
if(!changedItems)
{
- setText(CGisListWks::eColumnDecoration,"");
+ setText(CGisListWks::eColumnDecoration,autoSave ? "A" : "");
}
CGisWidget::self().postEventForDb(info);
@@ -287,7 +288,9 @@ int CDBProject::checkForAction2(IGisItem * item, quint64 &itemId, QString& hashI
QAbstractButton* pButUpdate = msgBox.addButton(tr("Take remote"), QMessageBox::DestructiveRole);
msgBox.addButton(QMessageBox::Abort);
+ CProgressDialog::setAllVisible(false);
msgBox.exec();
+ CProgressDialog::setAllVisible(true);
if(msgBox.clickedButton() == pButClone)
{
@@ -338,7 +341,7 @@ void CDBProject::updateItem(IGisItem *&item, quint64 idItem, QSqlQuery &query)
query.bindValue(":icon", buffer.data());
query.bindValue(":name", item->getName());
query.bindValue(":date", item->getTimestamp());
- query.bindValue(":comment", item->getInfo(true, true));
+ query.bindValue(":comment", item->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowFullText));
query.bindValue(":data", data);
query.bindValue(":hash", item->getHash());
query.bindValue(":id", idItem);
@@ -386,7 +389,7 @@ void CDBProject::updateItem(IGisItem *&item, quint64 idItem, QSqlQuery &query)
query.bindValue(":icon", buffer.data());
query.bindValue(":name", item->getName());
query.bindValue(":date", item->getTimestamp());
- query.bindValue(":comment", item->getInfo(true, true));
+ query.bindValue(":comment", item->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowFullText));
query.bindValue(":data", data);
query.bindValue(":hash", item->getHash());
query.bindValue(":id", idItem);
@@ -439,7 +442,7 @@ quint64 CDBProject::insertItem(IGisItem * item, QSqlQuery &query)
query.bindValue(":icon", buffer.data());
query.bindValue(":name", item->getName());
query.bindValue(":date", item->getTimestamp());
- query.bindValue(":comment", item->getInfo(true, true));
+ query.bindValue(":comment", item->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowFullText));
query.bindValue(":data", data);
query.bindValue(":hash", item->getHash());
QUERY_EXEC(throw eReasonQueryFail);
@@ -634,6 +637,7 @@ bool CDBProject::save()
}
catch(reasons_e reason)
{
+ CProgressDialog::setAllVisible(false);
switch(reason)
{
case eReasonQueryFail:
@@ -649,6 +653,8 @@ bool CDBProject::save()
i--;
break;
}
+
+ CProgressDialog::setAllVisible(true);
}
}
@@ -669,7 +675,6 @@ bool CDBProject::save()
QUERY_EXEC(return false);
postStatus(true);
-
// update change flag
updateDecoration();
return success;
diff --git a/src/gis/db/CSelectSaveAction.cpp b/src/gis/db/CSelectSaveAction.cpp
index 13d1963..3ac7219 100644
--- a/src/gis/db/CSelectSaveAction.cpp
+++ b/src/gis/db/CSelectSaveAction.cpp
@@ -19,6 +19,7 @@
#include "canvas/CCanvas.h"
#include "gis/IGisItem.h"
#include "gis/db/CSelectSaveAction.h"
+#include "helpers/CProgressDialog.h"
CSelectSaveAction::CSelectSaveAction(const IGisItem *src, const IGisItem *tar, QWidget *parent)
: QDialog(parent)
@@ -26,9 +27,9 @@ CSelectSaveAction::CSelectSaveAction(const IGisItem *src, const IGisItem *tar, Q
setupUi(this);
labelIcon1->setPixmap(src->getIcon());
- labelInfo1->setText(src->getInfo(true, false));
+ labelInfo1->setText(src->getInfo(IGisItem::eFeatureShowName));
labelIcon2->setPixmap(tar->getIcon());
- labelInfo2->setText(tar->getInfo(true, false));
+ labelInfo2->setText(tar->getInfo(IGisItem::eFeatureShowName));
adjustSize();
@@ -37,11 +38,13 @@ CSelectSaveAction::CSelectSaveAction(const IGisItem *src, const IGisItem *tar, Q
connect(pushClone, &QPushButton::clicked, this, &CSelectSaveAction::slotSelectResult);
CCanvas::setOverrideCursor(Qt::ArrowCursor, "CSelectSaveAction");
+ CProgressDialog::setAllVisible(false);
}
CSelectSaveAction::~CSelectSaveAction()
{
CCanvas::restoreOverrideCursor("~CSelectSaveAction");
+ CProgressDialog::setAllVisible(true);
}
bool CSelectSaveAction::allOthersToo()
diff --git a/src/gis/db/IDBFolder.h b/src/gis/db/IDBFolder.h
index d6ee5dd..8ea80b8 100644
--- a/src/gis/db/IDBFolder.h
+++ b/src/gis/db/IDBFolder.h
@@ -125,7 +125,7 @@ public:
*
* The folder will be attached to it's parent folder
*
- * @param type the tye of the new folder
+ * @param type the type of the new folder
* @param name the name of the new folder
* @param idParent the 64bit database key of the parent
* @param db the database to work on
@@ -188,7 +188,7 @@ protected:
virtual void addChildren(const QSet<QString> &activeChildren, bool skipFolders);
/**
- @brief Remove a folder to folder realtion
+ @brief Remove a folder to folder relation
If the folder has no other relation the folder's relation to it's children is removed, too.
diff --git a/src/gis/db/IDBMysql.cpp b/src/gis/db/IDBMysql.cpp
index 730b6da..1f7cd1f 100644
--- a/src/gis/db/IDBMysql.cpp
+++ b/src/gis/db/IDBMysql.cpp
@@ -237,7 +237,7 @@ bool IDBMysql::migrateDB4to5()
}
// get full size info text
- QString comment = item->getInfo(true, true);
+ QString comment = item->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowFullText);
// replace comment with full size info text in items table
QSqlQuery query2(db);
@@ -288,7 +288,7 @@ bool IDBMysql::migrateDB5to6()
}
// get full size info text
- QString comment = item->getInfo(true, true);
+ QString comment = item->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowFullText);
QDateTime date = item->getTimestamp();
// replace comment with full size info text in items table
diff --git a/src/gis/db/IDBSqlite.cpp b/src/gis/db/IDBSqlite.cpp
index faadbda..70ceec0 100644
--- a/src/gis/db/IDBSqlite.cpp
+++ b/src/gis/db/IDBSqlite.cpp
@@ -392,7 +392,7 @@ bool IDBSqlite::migrateDB4to5()
}
// get full size info text
- QString comment = item->getInfo(true, true);
+ QString comment = item->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowFullText);
// replace comment with full size info text in items table
QSqlQuery query2(db);
@@ -465,7 +465,7 @@ bool IDBSqlite::migrateDB5to6()
}
// get full size info text
- QString comment = item->getInfo(true, true);
+ QString comment = item->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowFullText);
QDateTime date = item->getTimestamp();
// replace comment with full size info text in items table
diff --git a/src/gis/fit/CFitProject.cpp b/src/gis/fit/CFitProject.cpp
index c998a1b..69b8ee2 100644
--- a/src/gis/fit/CFitProject.cpp
+++ b/src/gis/fit/CFitProject.cpp
@@ -130,6 +130,15 @@ void CFitProject::createGisItems(QFile& file)
// fit does not have routes
// new CGisItemRte(in, this);
+ // Locations file containing waypoints
+ if (mesg.getFieldValue(eFileIdType).toUInt() == eFileLocation)
+ {
+ while(in.nextMesgOf(eMesgNumLocation).isValid())
+ {
+ new CGisItemWpt(in, this);
+ }
+ }
+
in.reset();
// course point is a message of a course file. Thus, wpt is only for a course file. There might be n wpt per fit file
while(in.nextMesgOf(eMesgNumCoursePoint).isValid())
diff --git a/src/gis/fit/CFitStream.h b/src/gis/fit/CFitStream.h
index 2a5983c..08c5fc1 100644
--- a/src/gis/fit/CFitStream.h
+++ b/src/gis/fit/CFitStream.h
@@ -67,7 +67,7 @@ public:
/**
return: gets the first message of the given type (xx_MESG_NUM) beginning reading at start of stream.
- Sets the strema to the beginning again.
+ Sets the stream to the beginning again.
*/
const CFitMessage& firstMesgOf(quint16 mesgNum);
diff --git a/src/gis/fit/decoder/CFitFieldDataState.h b/src/gis/fit/decoder/CFitFieldDataState.h
index a407fa5..eef9edf 100644
--- a/src/gis/fit/decoder/CFitFieldDataState.h
+++ b/src/gis/fit/decoder/CFitFieldDataState.h
@@ -25,6 +25,7 @@ static const int fitMaxFieldSize =255;
class CFitFieldDataState final : public IFitDecoderState
{
+ Q_DECLARE_TR_FUNCTIONS(CFitFieldDataState)
public:
CFitFieldDataState(shared_state_data_t &data) : IFitDecoderState(data) { reset(); }
virtual ~CFitFieldDataState() {}
diff --git a/src/gis/fit/defs/CFitProfileLookup.cpp b/src/gis/fit/defs/CFitProfileLookup.cpp
index 30b34d8..687ab09 100644
--- a/src/gis/fit/defs/CFitProfileLookup.cpp
+++ b/src/gis/fit/defs/CFitProfileLookup.cpp
@@ -1566,6 +1566,21 @@ void initDeveloperDataId(QMap<quint16, CFitProfile*>& profiles)
// ----------- end generated code -----------
+void initExtProfiles(QMap<quint16, CFitProfile*>& profiles)
+{
+ CFitProfile* f = new CFitProfile("location", eMesgNumLocation);
+ f->addField("name", fitStringType, eLocationName, 0, 0, "");
+ f->addField("timestamp", fitUint32Type, eLocationTimestamp, 0, 0, "s");
+ f->addField("index", fitUint16Type, eLocationMessageIndex, 0, 0, "");
+ f->addField("position_lat", fitSint32Type, eLocationPositionLat, 0, 0, "semicircles");
+ f->addField("position_long", fitSint32Type, eLocationPositionLong, 0, 0, "semicircles");
+ f->addField("symbol", fitUint32Type, eLocationSymbol, 0, 0, "");
+ f->addField("altitude", fitUint16Type, eLocationAltitude, 5, 500, "m");
+ f->addField("???", fitUint16Type, eLocation5, 0, 0, "");
+ f->addField("comment", fitStringType, eLocationComment, 0, 0, "");
+ profiles.insert(eMesgNumLocation, f);
+}
+
void initProfiles(QMap<quint16, CFitProfile*>& allProfiles)
{
@@ -1645,6 +1660,8 @@ void initProfiles(QMap<quint16, CFitProfile*>& allProfiles)
initFieldDescription(allProfiles);
initDeveloperDataId(allProfiles);
+ initExtProfiles(allProfiles);
+
// invalid profile
allProfiles.insert(fitGlobalMesgNrInvalid, new CFitProfile());
}
diff --git a/src/gis/fit/defs/fit_enums.h b/src/gis/fit/defs/fit_enums.h
index 86d9c41..e55f2d7 100644
--- a/src/gis/fit/defs/fit_enums.h
+++ b/src/gis/fit/defs/fit_enums.h
@@ -19,6 +19,29 @@
#ifndef FIT_PROFILE_H
#define FIT_PROFILE_H
+typedef enum
+{
+ eLocationName = 0,
+ eLocationPositionLat = 1,
+ eLocationPositionLong = 2,
+ eLocationSymbol = 3,
+ eLocationAltitude = 4,
+ eLocation5 = 5,
+ eLocationComment = 6,
+ eLocationTimestamp = 253,
+ eLocationMessageIndex = 254
+} message_location_e;
+
+typedef enum
+{
+ eMesgNumLocation = 29
+} ext_mesg_num_e;
+
+typedef enum
+{
+ eFileLocation = 8
+} ext_file_e;
+
// ----------- start generated code -----------
typedef enum
{
diff --git a/src/gis/fit/serialization.cpp b/src/gis/fit/serialization.cpp
index c541a03..f0ef69d 100644
--- a/src/gis/fit/serialization.cpp
+++ b/src/gis/fit/serialization.cpp
@@ -108,6 +108,40 @@ static bool readFitRecord(const CFitMessage &mesg, CTrackData::trkpt_t &pt)
return false;
}
+static void readFitLocation(const CFitMessage &mesg, IGisItem::wpt_t &wpt)
+{
+ if(mesg.isFieldValueValid(eLocationName))
+ {
+ wpt.name = mesg.getFieldValue(eLocationName).toString();
+ }
+ if(mesg.isFieldValueValid(eLocationTimestamp))
+ {
+ wpt.time = toDateTime(mesg.getFieldValue(eLocationTimestamp).toUInt());
+ }
+ if(mesg.isFieldValueValid(eLocationPositionLong) && mesg.isFieldValueValid(eLocationPositionLat))
+ {
+ wpt.lon = toDegree(mesg.getFieldValue(eLocationPositionLong).toInt());
+ wpt.lat = toDegree(mesg.getFieldValue(eLocationPositionLat).toInt());
+ }
+ if(mesg.isFieldValueValid(eLocationAltitude))
+ {
+ wpt.ele = mesg.getFieldValue(eLocationAltitude).toInt();
+ }
+ if(mesg.isFieldValueValid(eLocationComment))
+ {
+ wpt.desc = mesg.getFieldValue(eLocationComment).toString();
+ }
+ wpt.sym = "Default";
+}
+
+
+QString wptIconNames[26] { "Default", "Summit", "Valley", "Water", "Food", "Danger", "Left", "Right", "Straight",
+ "FirstAid", "4thCategory", "3rdCategory", "2ndCategory", "1stCategory", "HorsCategory",
+ "Sprint"
+ , "LeftFork", "RightFork", "MiddleFork", "SlightLeft", "SharpLeft",
+ "SlightRight", "SharpRight", "UTurn", "Start", "End" };
+
+
static void readFitCoursePoint(const CFitMessage &mesg, IGisItem::wpt_t &wpt)
{
if(mesg.isFieldValueValid(eCoursePointName))
@@ -124,9 +158,11 @@ static void readFitCoursePoint(const CFitMessage &mesg, IGisItem::wpt_t &wpt)
wpt.lon = toDegree(mesg.getFieldValue(eCoursePointPositionLong).toInt());
wpt.lat = toDegree(mesg.getFieldValue(eCoursePointPositionLat).toInt());
}
- // TODO find appropriate icon for different CoursePointType (CoursePoint***)
- // see WptIcons.initWptIcons() for all values
- wpt.sym = "Waypoint";
+
+ if (mesg.isFieldValueValid(eCoursePointType))
+ {
+ wpt.sym = wptIconNames[mesg.getFieldValue(eCoursePointType).toInt()];
+ }
}
@@ -236,11 +272,14 @@ void CGisItemTrk::readTrkFromFit(CFitStream &stream)
}
while (stream.hasMoreMesg());
- if(trk.segs.size() == 0 && !seg.pts.isEmpty())
+ // append last segment if it is not empty.
+ // navigation course files do not have to have start / stop event, so add the segment now.
+ // and some records do not have a stop event
+ if(!seg.pts.isEmpty())
{
- // navigation course files do not have to have start / stop event, so add the segment now.
trk.segs.append(seg);
}
+
if(trk.segs.isEmpty())
{
throw tr("FIT file %1 contains no GPS data.").arg(stream.getFileName());
@@ -251,7 +290,14 @@ void CGisItemTrk::readTrkFromFit(CFitStream &stream)
void CGisItemWpt::readWptFromFit(CFitStream &stream)
{
const CFitMessage& mesg = stream.lastMesg();
- readFitCoursePoint(mesg, wpt);
+ if (mesg.getGlobalMesgNr() == eMesgNumLocation)
+ {
+ readFitLocation(mesg, wpt);
+ }
+ else
+ {
+ readFitCoursePoint(mesg, wpt);
+ }
}
diff --git a/src/gis/ovl/CGisItemOvlArea.cpp b/src/gis/ovl/CGisItemOvlArea.cpp
index 3b6c11f..dd1afb8 100644
--- a/src/gis/ovl/CGisItemOvlArea.cpp
+++ b/src/gis/ovl/CGisItemOvlArea.cpp
@@ -376,12 +376,12 @@ IScrOpt * CGisItemOvlArea::getScreenOptions(const QPoint& origin, IMouse * mouse
return scrOpt;
}
-QString CGisItemOvlArea::getInfo(bool showName, bool showFullText) const
+QString CGisItemOvlArea::getInfo(quint32 feature) const
{
QString unit, val;
QString str = "<div>";
- if(showName)
+ if(feature && eFeatureShowName)
{
str += "<b>" + getName() + "</b>";
}
@@ -398,7 +398,7 @@ QString CGisItemOvlArea::getInfo(bool showName, bool showFullText) const
str += "<br/>\n";
}
- if(showFullText || (desc.count() < 300))
+ if((feature & eFeatureShowFullText) || (desc.count() < 300))
{
str += desc;
}
@@ -416,7 +416,7 @@ QString CGisItemOvlArea::getInfo(bool showName, bool showFullText) const
str += "<br/>\n";
}
- if(showFullText || cmt.count() < 300)
+ if((feature & eFeatureShowFullText) || (cmt.count() < 300))
{
str += cmt;
}
diff --git a/src/gis/ovl/CGisItemOvlArea.h b/src/gis/ovl/CGisItemOvlArea.h
index d9d8e25..f8b1d39 100644
--- a/src/gis/ovl/CGisItemOvlArea.h
+++ b/src/gis/ovl/CGisItemOvlArea.h
@@ -58,7 +58,7 @@ public:
{
return colorIdx;
}
- QString getInfo(bool showName, bool showFullText) const override;
+ QString getInfo(quint32 feature) const override;
void getPolylineFromData(SGisLine& l) override;
const QString& getComment() const override
{
diff --git a/src/gis/ovl/CScrOptOvlArea.cpp b/src/gis/ovl/CScrOptOvlArea.cpp
index d6b4f7a..c9d7e8c 100644
--- a/src/gis/ovl/CScrOptOvlArea.cpp
+++ b/src/gis/ovl/CScrOptOvlArea.cpp
@@ -30,7 +30,7 @@ CScrOptOvlArea::CScrOptOvlArea(CGisItemOvlArea *area, const QPoint &point, IMous
setupUi(this);
setOrigin(point);
label->setFont(CMainWindow::self().getMapFont());
- label->setText(area->getInfo(true, false));
+ label->setText(area->getInfo(IGisItem::eFeatureShowName));
adjustSize();
anchor = area->getPointCloseBy(point);
diff --git a/src/gis/prj/CDetailsPrj.cpp b/src/gis/prj/CDetailsPrj.cpp
index cca2ac0..73cc756 100644
--- a/src/gis/prj/CDetailsPrj.cpp
+++ b/src/gis/prj/CDetailsPrj.cpp
@@ -285,7 +285,7 @@ void CDetailsPrj::draw(QTextDocument& doc, bool printable)
for(int i = 0; i < N; i++)
{
CGisItemTrk *trk = dynamic_cast<CGisItemTrk*>(prj.child(i));
- if(nullptr != trk)
+ if(nullptr != trk && !trk->isHidden())
{
trks << trk;
nItems++;
@@ -293,7 +293,7 @@ void CDetailsPrj::draw(QTextDocument& doc, bool printable)
}
CGisItemRte *rte = dynamic_cast<CGisItemRte*>(prj.child(i));
- if(nullptr != rte)
+ if(nullptr != rte && !rte->isHidden())
{
rtes << rte;
nItems++;
@@ -301,7 +301,7 @@ void CDetailsPrj::draw(QTextDocument& doc, bool printable)
}
CGisItemWpt *wpt = dynamic_cast<CGisItemWpt*>(prj.child(i));
- if(nullptr != wpt)
+ if(nullptr != wpt && !wpt->isHidden())
{
wpts << wpt;
nItems++;
@@ -309,7 +309,7 @@ void CDetailsPrj::draw(QTextDocument& doc, bool printable)
}
CGisItemOvlArea *area = dynamic_cast<CGisItemOvlArea*>(prj.child(i));
- if(nullptr != area)
+ if(nullptr != area && !area->isHidden())
{
areas << area;
nItems++;
@@ -403,24 +403,6 @@ void CDetailsPrj::addIcon(QTextTable * table, int col, int row, IGisItem * item,
{
table->cellAt(row,col).firstCursorPosition().insertImage(item->getIcon().toImage().scaledToWidth(16, Qt::SmoothTransformation));
- CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(item);
- if(trk)
- {
- QSet<QString> icons;
- for(const CActivityTrk::activity_range_t& range : trk->getActivities().getActivityRanges())
- {
- icons << range.icon;
- }
-
- for(const QString &icon : icons)
- {
- if(!icon.isEmpty())
- {
- table->cellAt(row,col).lastCursorPosition().insertHtml(QString("<p><br/><img src='%1'/></p>").arg(icon));
- }
- }
- }
-
if(!(printable||item->isReadOnly()))
{
table->cellAt(row,col).lastCursorPosition().insertHtml(QString("<p><a href='edit?key=%1'><img src='://icons/16x16/EditDetails.png'/></a></p>").arg(item->getKey().item));
@@ -450,7 +432,7 @@ void CDetailsPrj::drawByGroup(QTextCursor &cursor, QList<CGisItemTrk*>& trks, QL
PROGRESS(n++, return );
addIcon(table, eSym1, cnt, wpt, printable);
- table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(wpt->getInfo(true, false));
+ table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(wpt->getInfo(IGisItem::eFeatureShowName));
table->cellAt(cnt,eComment1).firstCursorPosition().insertHtml(IGisItem::createText(wpt->isReadOnly()||printable, wpt->getComment(), wpt->getDescription(), wpt->getLinks(), wpt->getKey().item));
cnt++;
}
@@ -483,7 +465,7 @@ void CDetailsPrj::drawByGroup(QTextCursor &cursor, QList<CGisItemTrk*>& trks, QL
if(w1 < 300)
{
- table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(trk->getInfo(true, false));
+ table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(trk->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowActivity));
QTextTable * table1 = table->cellAt(cnt,eInfo1).lastCursorPosition().insertTable(1, 2, fmtTableInfo);
@@ -499,7 +481,7 @@ void CDetailsPrj::drawByGroup(QTextCursor &cursor, QList<CGisItemTrk*>& trks, QL
{
QTextTable * table1 = table->cellAt(cnt,eInfo1).firstCursorPosition().insertTable(1, 3, fmtTableInfo);
- table1->cellAt(0,0).firstCursorPosition().insertHtml(trk->getInfo(true, false));
+ table1->cellAt(0,0).firstCursorPosition().insertHtml(trk->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowActivity));
QImage profile(w1,h1,QImage::Format_ARGB32);
getTrackProfile(trk, profile);
@@ -601,7 +583,7 @@ void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, Q
if(wpt != nullptr)
{
addIcon(table, eSym2, cnt, wpt, printable);
- table->cellAt(cnt,eInfo2).firstCursorPosition().insertHtml(wpt->getInfo(true, false));
+ table->cellAt(cnt,eInfo2).firstCursorPosition().insertHtml(wpt->getInfo(IGisItem::eFeatureShowName));
QTextTable * table1 = table->cellAt(cnt,eData2).lastCursorPosition().insertTable(1, 2, fmtTableInfo);
@@ -675,7 +657,7 @@ void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, Q
}
addIcon(table, eSym1, cnt, trk, printable);
- table->cellAt(cnt,eInfo2).firstCursorPosition().insertHtml(trk->getInfo(true, false));
+ table->cellAt(cnt,eInfo2).firstCursorPosition().insertHtml(trk->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowActivity));
QTextTable * table1 = table->cellAt(cnt,eData2).lastCursorPosition().insertTable(1, 2, fmtTableInfo);
@@ -715,7 +697,7 @@ void CDetailsPrj::drawArea(QTextCursor& cursor, QList<CGisItemOvlArea *> &areas,
PROGRESS(n++, return );
addIcon(table, eSym1, cnt, area, printable);
- table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(area->getInfo(true, false));
+ table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(area->getInfo(IGisItem::eFeatureShowName));
table->cellAt(cnt,eComment1).firstCursorPosition().insertHtml(IGisItem::createText(area->isReadOnly()||printable, area->getComment(), area->getDescription(), area->getLinks(), area->getKey().item));
cnt++;
}
@@ -745,7 +727,7 @@ void CDetailsPrj::drawRoute(QTextCursor& cursor, QList<CGisItemRte *> &rtes, CPr
PROGRESS(n++, return );
addIcon(table, eSym1, cnt, rte, printable);
- table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(rte->getInfo(true, false));
+ table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(rte->getInfo(IGisItem::eFeatureShowName));
table->cellAt(cnt,eComment1).firstCursorPosition().insertHtml(IGisItem::createText(rte->isReadOnly()||printable, rte->getComment(), rte->getDescription(), rte->getLinks(), rte->getKey().item));
cnt++;
}
diff --git a/src/gis/prj/IGisProject.cpp b/src/gis/prj/IGisProject.cpp
index 159675f..e244e7e 100644
--- a/src/gis/prj/IGisProject.cpp
+++ b/src/gis/prj/IGisProject.cpp
@@ -20,6 +20,7 @@
#include "device/IDevice.h"
#include "gis/CGisDraw.h"
#include "gis/CGisListWks.h"
+#include "gis/CGisWidget.h"
#include "gis/IGisItem.h"
#include "gis/fit/CFitProject.h"
#include "gis/gpx/CGpxProject.h"
@@ -57,7 +58,7 @@ IGisProject::IGisProject(type_e type, const QString &filename, CGisListWks *pare
, filename(filename)
{
memset(cntItemsByType, 0, sizeof(cntItemsByType));
- setCheckState(CGisListWks::eColumnDecoration, Qt::Checked);
+ setCheckState(CGisListWks::eColumnCheckBox, Qt::Checked);
if(parent)
{
@@ -89,7 +90,7 @@ IGisProject::IGisProject(type_e type, const QString &filename, IDevice *parent)
, filename(filename)
{
memset(cntItemsByType, 0, sizeof(cntItemsByType));
- setCheckState(CGisListWks::eColumnDecoration, Qt::Checked);
+ setCheckState(CGisListWks::eColumnCheckBox, Qt::Checked);
nameSuffix = parent->getName();
}
@@ -175,9 +176,10 @@ bool IGisProject::askBeforClose()
bool IGisProject::isVisible() const
{
- return checkState(CGisListWks::eColumnDecoration) == Qt::Checked;
+ return checkState(CGisListWks::eColumnCheckBox) == Qt::Checked;
}
+
void IGisProject::genKey() const
{
if(key.isEmpty())
@@ -286,10 +288,35 @@ void IGisProject::setSortingFolder(sorting_folder_e s)
void IGisProject::setChanged()
{
- setText(CGisListWks::eColumnDecoration,"*");
+ if(autoSave)
+ {
+ setText(CGisListWks::eColumnDecoration,"A");
+
+ if(!autoSavePending)
+ {
+ autoSavePending = true;
+ CGisWidget::self().postEventForWks(new CEvtA2WSave(getKey()));
+ }
+ }
+ else
+ {
+ setText(CGisListWks::eColumnDecoration,"*");
+ }
updateItems();
}
+void IGisProject::setAutoSave(bool on)
+{
+ // make sure project is saved one more time to remove autoSave flag in storage
+ if(!on && autoSave)
+ {
+ CGisWidget::self().postEventForWks(new CEvtA2WSave(getKey()));
+ }
+
+ autoSave = on;
+ setChanged();
+}
+
void IGisProject::switchOnCorrelation()
{
noCorrelation = false;
@@ -465,7 +492,7 @@ void IGisProject::setupName(const QString &defaultName)
void IGisProject::markAsSaved()
{
- setText(CGisListWks::eColumnDecoration,"");
+ setText(CGisListWks::eColumnDecoration,autoSave ? "A" : "");
for(int i = 0; i < childCount(); i++)
{
IGisItem * item = dynamic_cast<IGisItem*>(child(i));
@@ -1006,8 +1033,7 @@ void IGisProject::updateDecoration()
break;
}
}
-
- setText(CGisListWks::eColumnDecoration, saved ? "" : "*");
+ setText(CGisListWks::eColumnDecoration, autoSave ? "A" : saved ? "" : "*");
}
void IGisProject::sortItems()
@@ -1082,7 +1108,16 @@ bool sortByName(IGisItem * item1, IGisItem * item2)
bool sortByTime(IGisItem * item1, IGisItem * item2)
{
- return item1->getTimestamp() < item2->getTimestamp();
+ const QDateTime& t1 = item1->getTimestamp();
+ const QDateTime& t2 = item2->getTimestamp();
+
+ // avoid jumping items due to invalid timestamps
+ if(!t1.isValid() || !t2.isValid())
+ {
+ return sortByName(item1, item2);
+ }
+
+ return t1 < t2;
}
void IGisProject::sortItems(QList<IGisItem *> &items) const
@@ -1127,7 +1162,7 @@ void IGisProject::filter(const QString& str)
break;
case eFilterModeText:
- item->setHidden(!item->getInfo(true, true).toUpper().contains(str));
+ item->setHidden(!item->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowFullText).toUpper().contains(str));
break;
}
}
diff --git a/src/gis/prj/IGisProject.h b/src/gis/prj/IGisProject.h
index a5304aa..e9ea820 100644
--- a/src/gis/prj/IGisProject.h
+++ b/src/gis/prj/IGisProject.h
@@ -48,6 +48,13 @@ public:
, eTypeTcx
};
+ /// flags used to serialize trivial flags in qms file
+ enum flags_e
+ {
+ eFlagNoCorrelation = 0x1
+ , eFlagAutoSave = 0x2
+ };
+
enum sorting_roadbook_e
{
eSortRoadbookNone
@@ -347,6 +354,8 @@ public:
void switchOnCorrelation();
+ void setAutoSave(bool on);
+
/**
@brief Receive the current mouse position
@@ -401,6 +410,11 @@ public:
*/
bool isVisible() const;
+ bool isAutoSave() const
+ {
+ return autoSave;
+ }
+
/**
@brief Test if this project is handled by a device
@return The device type (IDevice::type_e). IDevice::eTypeNone if the project is not stored on a device.
@@ -488,6 +502,11 @@ public:
void filter(const QString& str);
+ void confirmPendingAutoSave()
+ {
+ autoSavePending = false;
+ }
+
protected:
void genKey() const;
virtual void setupName(const QString& defaultName);
@@ -531,6 +550,8 @@ protected:
bool noUpdate = false;
bool noCorrelation = false;
bool changedRoadbookMode = false;
+ bool autoSave = false; ///< flag to show if auto save is on or off
+ bool autoSavePending = false; ///< flag to show if auto save event has been sent. will be reset by save()
metadata_t metadata;
QString nameSuffix;
diff --git a/src/gis/qms/serialization.cpp b/src/gis/qms/serialization.cpp
index a8c41dc..9112813 100644
--- a/src/gis/qms/serialization.cpp
+++ b/src/gis/qms/serialization.cpp
@@ -604,7 +604,7 @@ QDataStream& CGisItemTrk::operator<<(QDataStream& stream)
deriveSecondaryData();
setColor(str2color(trk.color));
setText( CGisListWks::eColumnName, getName());
- setToolTip(CGisListWks::eColumnName, getInfo(true, false));
+ setToolTip(CGisListWks::eColumnName, getInfo(IGisItem::eFeatureShowName));
return stream;
}
@@ -646,7 +646,7 @@ QDataStream& CGisItemWpt::operator<<(QDataStream& stream)
setIcon();
setText (CGisListWks::eColumnName, getName());
- setToolTip(CGisListWks::eColumnName, getInfo(true, false));
+ setToolTip(CGisListWks::eColumnName, getInfo(IGisItem::eFeatureShowName));
return stream;
}
@@ -725,7 +725,7 @@ QDataStream& CGisItemRte::operator<<(QDataStream& stream)
setSymbol();
deriveSecondaryData();
setText (CGisListWks::eColumnName, getName());
- setToolTip(CGisListWks::eColumnName, getInfo(true, false));
+ setToolTip(CGisListWks::eColumnName, getInfo(IGisItem::eFeatureShowName));
return stream;
}
@@ -805,7 +805,7 @@ QDataStream& CGisItemOvlArea::operator<<(QDataStream& stream)
setColor(str2color(area.color));
setText (CGisListWks::eColumnName, getName());
- setToolTip(CGisListWks::eColumnName, getInfo(true, false));
+ setToolTip(CGisListWks::eColumnName, getInfo(IGisItem::eFeatureShowName));
return stream;
}
@@ -888,7 +888,8 @@ QDataStream& IGisProject::operator<<(QDataStream& stream)
{
qint8 tmp;
stream >> tmp;
- noCorrelation = tmp != 0;
+ noCorrelation = (tmp & eFlagNoCorrelation) != 0;
+ autoSave = (tmp & eFlagAutoSave) != 0;
}
if(version > 4)
@@ -969,7 +970,7 @@ QDataStream& IGisProject::operator>>(QDataStream& stream) const
stream << metadata.bounds;
stream << key;
stream << qint32(sortingRoadbook);
- stream << qint8(noCorrelation);
+ stream << qint8((noCorrelation ? eFlagNoCorrelation : 0) | (autoSave ? eFlagAutoSave : 0)); // collect trivial flags in one field.
stream << qint32(sortingFolder);
for(int i = 0; i < childCount(); i++)
@@ -1067,7 +1068,8 @@ QDataStream& CDBProject::operator<<(QDataStream& stream)
{
qint8 tmp;
stream >> tmp;
- noCorrelation = tmp != 0;
+ noCorrelation = (tmp & eFlagNoCorrelation) != 0;
+ autoSave = (tmp & eFlagAutoSave) != 0;
}
if(version > 4)
{
@@ -1095,7 +1097,7 @@ QDataStream& CDBProject::operator>>(QDataStream& stream) const
stream << metadata.bounds;
stream << key;
stream << qint32(sortingRoadbook);
- stream << qint8(noCorrelation);
+ stream << qint8((noCorrelation ? eFlagNoCorrelation : 0) | (autoSave ? eFlagAutoSave : 0)); // collect trivial flags in one field.
stream << qint32(sortingFolder);
return stream;
diff --git a/src/gis/rte/CCreateRouteFromWpt.cpp b/src/gis/rte/CCreateRouteFromWpt.cpp
index 530f3d4..5efe178 100644
--- a/src/gis/rte/CCreateRouteFromWpt.cpp
+++ b/src/gis/rte/CCreateRouteFromWpt.cpp
@@ -45,7 +45,7 @@ CCreateRouteFromWpt::CCreateRouteFromWpt(const QList<IGisItem::key_t> &keys, QWi
QListWidgetItem * item = new QListWidgetItem(listWidget);
item->setText(wpt->getName());
item->setIcon(wpt->getIcon());
- item->setToolTip(wpt->getInfo(true, false));
+ item->setToolTip(wpt->getInfo(IGisItem::eFeatureShowName));
item->setData(Qt::UserRole + 0, QPointF(wpt->getPosition()*DEG_TO_RAD));
}
diff --git a/src/gis/rte/CDetailsRte.cpp b/src/gis/rte/CDetailsRte.cpp
index 8aa5c90..950e983 100644
--- a/src/gis/rte/CDetailsRte.cpp
+++ b/src/gis/rte/CDetailsRte.cpp
@@ -64,7 +64,7 @@ void CDetailsRte::setupGui()
lineName->setText(rte.getName());
lineName->setReadOnly(isReadOnly);
- labelInfo->setText(rte.getInfo(false, false));
+ labelInfo->setText(rte.getInfo(IGisItem::eFeatureNone));
textCmtDesc->document()->clear();
textCmtDesc->append(IGisItem::createText(isReadOnly, rte.getComment(), rte.getDescription(), rte.getLinks()));
diff --git a/src/gis/rte/CGisItemRte.cpp b/src/gis/rte/CGisItemRte.cpp
index 4e1a965..fd3917b 100644
--- a/src/gis/rte/CGisItemRte.cpp
+++ b/src/gis/rte/CGisItemRte.cpp
@@ -331,12 +331,12 @@ void CGisItemRte::setLinks(const QList<link_t>& links)
-QString CGisItemRte::getInfo(bool showName, bool showFullText) const
+QString CGisItemRte::getInfo(quint32 feature) const
{
QString val1, unit1;
QString str = "<div>";
- if(showName)
+ if(feature & eFeatureShowName)
{
str += "<b>" + getName() + "</b><br />";
}
@@ -388,7 +388,7 @@ QString CGisItemRte::getInfo(bool showName, bool showFullText) const
str += "<br/>\n";
}
- if(showFullText || (desc.count() < 300))
+ if((feature & eFeatureShowFullText) || (desc.count() < 300))
{
str += desc;
}
@@ -406,7 +406,7 @@ QString CGisItemRte::getInfo(bool showName, bool showFullText) const
str += "<br/>\n";
}
- if(showFullText || cmt.count() < 300)
+ if((feature & eFeatureShowFullText) || cmt.count() < 300)
{
str += cmt;
}
diff --git a/src/gis/rte/CGisItemRte.h b/src/gis/rte/CGisItemRte.h
index e6eda9a..12d3a31 100644
--- a/src/gis/rte/CGisItemRte.h
+++ b/src/gis/rte/CGisItemRte.h
@@ -125,7 +125,7 @@ public:
return rte.name.isEmpty() ? noName : rte.name;
}
- QString getInfo(bool showName, bool showFullText) const override;
+ QString getInfo(quint32 feature) const override;
IScrOpt * getScreenOptions(const QPoint &origin, IMouse * mouse) override;
QPointF getPointCloseBy(const QPoint& screenPos) override;
void drawItem(QPainter& p, const QPolygonF& viewport, QList<QRectF>& blockedAreas, CGisDraw * gis) override;
diff --git a/src/gis/rte/CScrOptRte.cpp b/src/gis/rte/CScrOptRte.cpp
index 02fe4ba..a805ea6 100644
--- a/src/gis/rte/CScrOptRte.cpp
+++ b/src/gis/rte/CScrOptRte.cpp
@@ -31,7 +31,7 @@ CScrOptRte::CScrOptRte(CGisItemRte *rte, const QPoint& point, IMouse *parent)
setupUi(this);
setOrigin(point);
label->setFont(CMainWindow::self().getMapFont());
- label->setText(rte->getInfo(true, false));
+ label->setText(rte->getInfo(IGisItem::eFeatureShowName));
adjustSize();
toolInstruction->setEnabled(rte->isCalculated());
diff --git a/src/gis/rte/router/brouter/CRouterBRouterTilesPage.cpp b/src/gis/rte/router/brouter/CRouterBRouterTilesPage.cpp
index f010a22..8df987e 100644
--- a/src/gis/rte/router/brouter/CRouterBRouterTilesPage.cpp
+++ b/src/gis/rte/router/brouter/CRouterBRouterTilesPage.cpp
@@ -27,7 +27,7 @@ CRouterBRouterTilesPage::CRouterBRouterTilesPage()
{
layout = new QVBoxLayout(this);
widgetLocalTilesSelect = new CRouterBRouterTilesSelect(this);
- widgetLocalTilesSelect->setObjectName(QStringLiteral("widgetLocalTilesSelect"));
+ widgetLocalTilesSelect->setObjectName("widgetLocalTilesSelect");
QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
diff --git a/src/gis/trk/CActivityTrk.cpp b/src/gis/trk/CActivityTrk.cpp
index 0584899..407a071 100644
--- a/src/gis/trk/CActivityTrk.cpp
+++ b/src/gis/trk/CActivityTrk.cpp
@@ -23,12 +23,24 @@
QVector<CActivityTrk::desc_t> CActivityTrk::actDescriptor;
+
+const CActivityTrk::desc_t CActivityTrk::dummyDesc =
+{
+ "-"
+ , CTrackData::trkpt_t::eActNone
+ , "-"
+ , "://icons/48x48/ActNone.png"
+ , "://icons/16x16/ActNone.png"
+ , QColor()
+};
+
CActivityTrk::CActivityTrk(CGisItemTrk * trk)
: trk(trk)
, allFlags(0)
{
}
+
void CActivityTrk::init()
{
actDescriptor =
@@ -104,10 +116,19 @@ void CActivityTrk::init()
, "://icons/48x48/ActSki.png"
, "://icons/16x16/ActSki.png"
, IGisItem::colorMap[8].color
+ },
+ { // 9
+ "Train"
+ , CTrackData::trkpt_t::eActTrain
+ , tr("Public Transport")
+ , "://icons/48x48/ActTrain.png"
+ , "://icons/16x16/ActTrain.png"
+ , IGisItem::colorMap[9].color
}
};
+
SETTINGS;
cfg.beginGroup("Activities");
int i = 0;
@@ -135,20 +156,24 @@ void CActivityTrk::release()
quint32 CActivityTrk::selectActivity(QWidget *parent)
{
QMenu menu(parent);
+ QAction * act;
+
+ act = menu.addAction(QIcon("://icons/32x32/ActNone.png"), tr("No Activity"));
+ act->setData(QVariant(CTrackData::trkpt_t::eActNone));
for(const desc_t &desc : actDescriptor)
{
- QAction *act = menu.addAction(QIcon(desc.iconLarge), desc.name);
+ act = menu.addAction(QIcon(desc.iconLarge), desc.name);
act->setData(QVariant(desc.flag));
}
- QAction *act = menu.exec(QCursor::pos());
+ act = menu.exec(QCursor::pos());
if(nullptr != act)
{
return act->data().toUInt(nullptr);
}
- return 0;
+ return 0xFFFFFFFF;
}
@@ -193,10 +218,7 @@ void CActivityTrk::update()
const desc_t& desc = getDescriptor(lastFlag);
activity.name = desc.name;
- if(desc.flag != CTrackData::trkpt_t::eActNone)
- {
- activity.icon = desc.iconSmall;
- }
+ activity.icon = desc.iconSmall;
}
startTrkpt = &pt;
@@ -226,10 +248,7 @@ void CActivityTrk::update()
const desc_t& desc = getDescriptor(lastFlag);
activity.name = desc.name;
- if(desc.flag != CTrackData::trkpt_t::eActNone)
- {
- activity.icon = desc.iconSmall;
- }
+ activity.icon = desc.iconSmall;
@@ -255,33 +274,13 @@ void CActivityTrk::printSummary(QString& str) const
void CActivityTrk::printSummary(const QMap<quint32, activity_summary_t>& summary, quint32 flags, QString& str)
{
QString val, unit;
-
- if(flags == 0)
- {
- const activity_summary_t& s = summary[CTrackData::trkpt_t::eActNone];
-
- str += "<table>";
- IUnit::self().meter2distance(s.distance, val, unit);
- str += "<tr><td>" + tr("Distance:") + QString(" </td><td>%1 %2</td></tr>").arg(val).arg(unit);
- IUnit::self().meter2elevation(s.ascent, val, unit);
- str += "<tr><td>" + tr("Ascent:") + QString(" </td><td>%1 %2</td></tr>").arg(val).arg(unit);
- IUnit::self().meter2elevation(s.descent, val, unit);
- str += "<tr><td>" + tr("Descent:") + QString(" </td><td>%1 %2</td></tr>").arg(val).arg(unit);
- IUnit::self().meter2speed(s.distance/s.ellapsedSecondsMoving, val, unit);
- str += "<tr><td>" + tr("Speed Moving:") + QString(" </td><td>%1 %2</td></tr>").arg(val).arg(unit);
- IUnit::self().meter2speed(s.distance/s.ellapsedSeconds, val, unit);
- str += "<tr><td>" + tr("Speed Total:") + QString(" </td><td>%1 %2</td></tr>").arg(val).arg(unit);
- IUnit::self().seconds2time(s.ellapsedSecondsMoving, val, unit);
- str += "<tr><td>" + tr("Time Moving:") + QString(" </td><td>%1 %2</td></tr>").arg(val).arg(unit);
- IUnit::self().seconds2time(s.ellapsedSeconds, val, unit);
- str += "<tr><td>" + tr("Time Total:") + QString(" </td><td>%1 %2</td></tr>").arg(val).arg(unit);
- str += "</table>";
- return;
- }
+ qreal total;
+ qreal distance;
+ bool printTotal = false;
+ bool printNoAct = false;
str += "<table>";
-
// gather any used activities
QVector<const desc_t*> descs;
for(const desc_t &desc : actDescriptor)
@@ -292,6 +291,16 @@ void CActivityTrk::printSummary(const QMap<quint32, activity_summary_t>& summary
}
}
+ const activity_summary_t& sumActNone = summary[CTrackData::trkpt_t::eActNone];
+
+ if(sumActNone.distance != 0)
+ {
+ printNoAct = true;
+ }
+ if(descs.size() > 1 || (descs.size() == 1 && printNoAct))
+ {
+ printTotal = true;
+ }
// ############### build header ###############
str += "<tr>";
@@ -300,82 +309,181 @@ void CActivityTrk::printSummary(const QMap<quint32, activity_summary_t>& summary
{
str += QString("<th align='right'><img src='%1'/></th>").arg(desc->iconSmall);
}
+ if(printNoAct)
+ {
+ str += QString("<th align='right'><img src='://icons/16x16/ActNone.png'/></th>");
+ }
+ if(printTotal)
+ {
+ str += "<th align='right'>" + tr("Total") + "</th>";
+ }
str += "</tr>";
// ############### build Distance row ###############
str += "<tr>";
str += "<td>" + tr("Distance:") + "</td>";
+ distance = 0;
for(const desc_t *desc : descs)
{
const activity_summary_t& s = summary[desc->flag];
IUnit::self().meter2distance(s.distance, val, unit);
str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ distance += s.distance;
+ }
+ if(printNoAct)
+ {
+ IUnit::self().meter2distance(sumActNone.distance, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ distance += sumActNone.distance;
+ }
+ if(printTotal)
+ {
+ IUnit::self().meter2distance(distance, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
}
str += "</tr>";
// ############### build Ascent row ###############
str += "<tr>";
str += "<td>" + tr("Ascent:") + "</td>";
+ total = 0;
for(const desc_t *desc : descs)
{
const activity_summary_t& s = summary[desc->flag];
IUnit::self().meter2elevation(s.ascent, val, unit);
str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += s.ascent;
+ }
+ if(printNoAct)
+ {
+ IUnit::self().meter2elevation(sumActNone.ascent, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += sumActNone.ascent;
+ }
+ if(printTotal)
+ {
+ IUnit::self().meter2elevation(total, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
}
str += "</tr>";
// ############### build Descent row ###############
str += "<tr>";
str += "<td>" + tr("Descent:") + "</td>";
+ total = 0;
for(const desc_t *desc : descs)
{
const activity_summary_t& s = summary[desc->flag];
IUnit::self().meter2elevation(s.descent, val, unit);
str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += s.descent;
+ }
+ if(printNoAct)
+ {
+ IUnit::self().meter2elevation(sumActNone.descent, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += sumActNone.descent;
+ }
+ if(printTotal)
+ {
+ IUnit::self().meter2elevation(total, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
}
str += "</tr>";
// ############### build Speed Moving row ###############
str += "<tr>";
str += "<td>" + tr("Speed Moving:") + "</td>";
+ total = 0;
for(const desc_t *desc : descs)
{
const activity_summary_t& s = summary[desc->flag];
IUnit::self().meter2speed(s.distance/s.ellapsedSecondsMoving, val, unit);
str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += s.ellapsedSecondsMoving;
+ }
+ if(printNoAct)
+ {
+ IUnit::self().meter2speed(sumActNone.distance/sumActNone.ellapsedSecondsMoving, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += sumActNone.ellapsedSecondsMoving;
+ }
+ if(printTotal)
+ {
+ IUnit::self().meter2speed(distance/total, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
}
str += "</tr>";
// ############### build Speed row ###############
str += "<tr>";
str += "<td>" + tr("Speed Total:") + "</td>";
+ total = 0;
for(const desc_t *desc : descs)
{
const activity_summary_t& s = summary[desc->flag];
IUnit::self().meter2speed(s.distance/s.ellapsedSeconds, val, unit);
str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += s.ellapsedSeconds;
+ }
+ if(printNoAct)
+ {
+ IUnit::self().meter2speed(sumActNone.distance/sumActNone.ellapsedSeconds, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += sumActNone.ellapsedSeconds;
+ }
+ if(printTotal)
+ {
+ IUnit::self().meter2speed(distance/total, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
}
str += "</tr>";
// ############### build Time Moving row ###############
str += "<tr>";
str += "<td>" + tr("Time Moving:") + "</td>";
+ total = 0;
for(const desc_t *desc : descs)
{
const activity_summary_t& s = summary[desc->flag];
IUnit::self().seconds2time(s.ellapsedSecondsMoving, val, unit);
str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += s.ellapsedSecondsMoving;
+ }
+ if(printNoAct)
+ {
+ IUnit::self().seconds2time(sumActNone.ellapsedSecondsMoving, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += sumActNone.ellapsedSecondsMoving;
+ }
+ if(printTotal)
+ {
+ IUnit::self().seconds2time(total, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
}
str += "</tr>";
// ############### build Time Moving row ###############
str += "<tr>";
str += "<td>" + tr("Time Total:") + "</td>";
+ total = 0;
for(const desc_t *desc : descs)
{
const activity_summary_t& s = summary[desc->flag];
IUnit::self().seconds2time(s.ellapsedSeconds, val, unit);
str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += s.ellapsedSeconds;
+ }
+ if(printNoAct)
+ {
+ IUnit::self().seconds2time(sumActNone.ellapsedSeconds, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
+ total += sumActNone.ellapsedSeconds;
+ }
+ if(printTotal)
+ {
+ IUnit::self().seconds2time(total, val, unit);
+ str += QString("<td align='right'> %1 %2</td>").arg(val).arg(unit);
}
str += "</tr>";
@@ -407,15 +515,6 @@ const CActivityTrk::desc_t& CActivityTrk::getDescriptor(quint32 flag)
}
}
- static desc_t dummyDesc =
- {
- "None"
- , CTrackData::trkpt_t::eActNone
- , tr("None")
- , "://icons/48x48/ActNone.png"
- , "://icons/16x16/ActNone.png"
- , QColor()
- };
return dummyDesc;
}
@@ -441,3 +540,25 @@ void CActivityTrk::getActivityNames(QStringList& names) const
}
}
}
+
+qint32 CActivityTrk::getActivityCount() const
+{
+ qint32 cnt = 0;
+ for(const desc_t &desc : actDescriptor)
+ {
+ if((allFlags & desc.flag) != 0)
+ {
+ ++cnt;
+ }
+ }
+
+ const activity_summary_t& sumActNone = activitySummary[CTrackData::trkpt_t::eActNone];
+
+ if(sumActNone.distance != 0)
+ {
+ cnt++;
+ }
+
+
+ return cnt;
+}
diff --git a/src/gis/trk/CActivityTrk.h b/src/gis/trk/CActivityTrk.h
index b18bb59..af121b7 100644
--- a/src/gis/trk/CActivityTrk.h
+++ b/src/gis/trk/CActivityTrk.h
@@ -95,6 +95,8 @@ public:
return allFlags;
}
+ qint32 getActivityCount() const;
+
void getActivityNames(QStringList& names) const;
static quint32 selectActivity(QWidget *parent);
@@ -140,6 +142,8 @@ private:
static QVector<desc_t> actDescriptor;
+ static const desc_t dummyDesc;
+
CGisItemTrk * trk;
quint32 allFlags;
QList<activity_range_t> activityRanges;
diff --git a/src/gis/trk/CDetailsTrk.cpp b/src/gis/trk/CDetailsTrk.cpp
index 58a97dd..d35a85c 100644
--- a/src/gis/trk/CDetailsTrk.cpp
+++ b/src/gis/trk/CDetailsTrk.cpp
@@ -131,7 +131,6 @@ CDetailsTrk::CDetailsTrk(CGisItemTrk& trk, QWidget *parent)
connect(textCmtDesc, &QTextBrowser::anchorClicked, this, &CDetailsTrk::slotLinkActivated);
connect(pushSetActivities, &QPushButton::clicked, this, &CDetailsTrk::slotSetActivities);
- connect(pushRemoveActivities, &QPushButton::clicked, this, &CDetailsTrk::slotRemoveActivities);
connect(lineName, &QLineEdit::textEdited, this, &CDetailsTrk::slotNameChanged);
connect(lineName, &QLineEdit::editingFinished, this, &CDetailsTrk::slotNameChangeFinished);
@@ -355,7 +354,7 @@ void CDetailsTrk::updateData()
labelTainted->setVisible(trk.isTainted());
- labelInfo->setText(trk.getInfo(false, false));
+ labelInfo->setText(trk.getInfo(IGisItem::eFeatureNone));
comboColor->setCurrentIndex(trk.getColorIdx());
toolLock->setChecked(isReadOnly);
@@ -622,20 +621,12 @@ void CDetailsTrk::slotLinkActivated(const QUrl& url)
void CDetailsTrk::slotSetActivities()
{
quint32 flags = CActivityTrk::selectActivity(this);
- if(0 != flags)
+ if(0xFFFFFFFF != flags)
{
trk.setActivity(flags);
}
}
-void CDetailsTrk::slotRemoveActivities()
-{
- if(QMessageBox::warning(this, tr("Reset activities..."), tr("This will remove all activities from the track. Proceed?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::Ok) == QMessageBox::Ok)
- {
- trk.setActivity(CTrackData::trkpt_t::eActNone);
- }
-}
-
void CDetailsTrk::setupGraph(CPlot * plot, const CLimit& limit, const QString& source, QDoubleSpinBox * spinMin, QDoubleSpinBox * spinMax)
{
trk.getPropertyHandler()->setupPlot(plot, source);
diff --git a/src/gis/trk/CDetailsTrk.h b/src/gis/trk/CDetailsTrk.h
index 6e9c035..631becb 100644
--- a/src/gis/trk/CDetailsTrk.h
+++ b/src/gis/trk/CDetailsTrk.h
@@ -50,7 +50,6 @@ private slots:
void slotLinkActivated(const QUrl& url);
void slotMouseClickState(int);
void slotSetActivities();
- void slotRemoveActivities();
void slotColorSourceChanged(int idx);
void slotColorLimitHighChanged();
diff --git a/src/gis/trk/CGisItemTrk.cpp b/src/gis/trk/CGisItemTrk.cpp
index 1a92747..a3b563d 100644
--- a/src/gis/trk/CGisItemTrk.cpp
+++ b/src/gis/trk/CGisItemTrk.cpp
@@ -281,13 +281,13 @@ void CGisItemTrk::unregisterVisual(INotifyTrk * visual)
registeredVisuals.remove(visual);
}
-QString CGisItemTrk::getInfo(bool showName, bool showFullText) const
+QString CGisItemTrk::getInfo(quint32 feature) const
{
QString val1, unit1, val2, unit2;
if(cntVisiblePoints == 0)
{
- return showName ? QString("<div><b>%1</b></div>").arg(getName()) : QString("<div></div>");
+ return feature ? QString("<div><b>%1</b></div>").arg(getName()) : QString("<div></div>");
}
bool timeIsValid = (allValidFlags & CTrackData::trkpt_t::eInvalidTime) == 0;
@@ -296,50 +296,70 @@ QString CGisItemTrk::getInfo(bool showName, bool showFullText) const
QString str = "<div>";
- if(showName)
- {
- str += "<b>" + getName() + "</b><br />";
- }
-
- IUnit::self().meter2distance(totalDistance, val1, unit1);
- str += tr("Length: %1 %2").arg(val1).arg(unit1);
-
- if(eleIsValid && totalAscent != NOFLOAT && totalDescent != NOFLOAT)
- {
- IUnit::self().meter2elevation(totalAscent, val1, unit1);
- IUnit::self().meter2elevation(totalDescent, val2, unit2);
+ qint32 actCnt = activities.getActivityCount();
+ quint32 actFlags = activities.getAllFlags();
- str += tr(", %1%2 %3, %4%5 %6").arg(QChar(0x2197)).arg(val1).arg(unit1).arg(QChar(0x2198)).arg(val2).arg(unit2);
- }
- else
+ if(feature & eFeatureShowName)
{
- str += tr(", %1-, %2-").arg(QChar(0x2197)).arg(QChar(0x2198));
+ if((actCnt == 1) && actFlags)
+ {
+ const CActivityTrk::desc_t& desc = activities.getDescriptor(actFlags);
+ str += QString("<img src='%1'/> ").arg(desc.iconSmall);
+ }
+ str += "<b>" + getName() + "</b>";
}
- str += "<br />";
- if(timeIsValid && (totalElapsedSeconds != NOTIME))
+ if((feature & eFeatureShowActivity) && (actCnt > 1))
{
- IUnit::self().seconds2time(totalElapsedSeconds, val1, unit1);
- IUnit::self().meter2speed(totalDistance / totalElapsedSeconds, val2, unit2);
- str += tr("Time: %1, Speed: %2 %3").arg(val1).arg(val2).arg(unit2);
+ str += "<br/>";
+ activities.printSummary(str);
+ str += "<br/>";
}
else
{
- str += tr("Time: -, Speed: -");
- }
- str += "<br />";
+ str += "<br/>";
+ IUnit::self().meter2distance(totalDistance, val1, unit1);
+ str += tr("Length: %1 %2").arg(val1).arg(unit1);
- if(timeIsValid && (totalElapsedSecondsMoving != NOTIME))
- {
- IUnit::self().seconds2time(totalElapsedSecondsMoving, val1, unit1);
- IUnit::self().meter2speed(totalDistance / totalElapsedSecondsMoving, val2, unit2);
- str += tr("Moving: %1, Speed: %2 %3").arg(val1).arg(val2).arg(unit2);
- }
- else
- {
- str += tr("Moving: -, Speed: -");
+ if(eleIsValid && totalAscent != NOFLOAT && totalDescent != NOFLOAT)
+ {
+ IUnit::self().meter2elevation(totalAscent, val1, unit1);
+ IUnit::self().meter2elevation(totalDescent, val2, unit2);
+
+ str += tr(", %1%2 %3, %4%5 %6").arg(QChar(0x2197)).arg(val1).arg(unit1).arg(QChar(0x2198)).arg(val2).arg(unit2);
+ }
+ else
+ {
+ str += tr(", %1-, %2-").arg(QChar(0x2197)).arg(QChar(0x2198));
+ }
+ str += "<br />";
+
+ if(timeIsValid && (totalElapsedSeconds != NOTIME))
+ {
+ IUnit::self().seconds2time(totalElapsedSeconds, val1, unit1);
+ IUnit::self().meter2speed(totalDistance / totalElapsedSeconds, val2, unit2);
+ str += tr("Time: %1, Speed: %2 %3").arg(val1).arg(val2).arg(unit2);
+ }
+ else
+ {
+ str += tr("Time: -, Speed: -");
+ }
+ str += "<br />";
+
+ if(timeIsValid && (totalElapsedSecondsMoving != NOTIME))
+ {
+ IUnit::self().seconds2time(totalElapsedSecondsMoving, val1, unit1);
+ IUnit::self().meter2speed(totalDistance / totalElapsedSecondsMoving, val2, unit2);
+ str += tr("Moving: %1, Speed: %2 %3").arg(val1).arg(val2).arg(unit2);
+ }
+ else
+ {
+ str += tr("Moving: -, Speed: -");
+ }
+ str += "<br />";
}
- str += "<br />";
+
+ str += "<br/>";
if(timeIsValid && timeStart.isValid())
{
@@ -378,7 +398,7 @@ QString CGisItemTrk::getInfo(bool showName, bool showFullText) const
str += "<b style='color: red;'>" + tr("Invalid positions!") + "</b><br/>";
}
- if(showFullText)
+ if(feature & eFeatureShowFullText)
{
QStringList actNames;
activities.getActivityNames(actNames);
@@ -407,6 +427,8 @@ QString CGisItemTrk::getInfo(bool showName, bool showFullText) const
str += cmt;
}
}
+
+
return str + "</div>";
}
diff --git a/src/gis/trk/CGisItemTrk.h b/src/gis/trk/CGisItemTrk.h
index 64cfa07..5a1a27a 100644
--- a/src/gis/trk/CGisItemTrk.h
+++ b/src/gis/trk/CGisItemTrk.h
@@ -183,7 +183,7 @@ public:
/// returns "true" when trk has no time-related invalid points
bool isTrkTimeValid() { return (allValidFlags & CTrackData::trkpt_t::eInvalidTime) == 0; }
- QDateTime getTimestamp() const override { return getTimeStart(); }
+ QDateTime getTimestamp() const override {return getTimeStart(); }
/// get the track color as index into the Garmin color table
int getColorIdx() const { return colorIdx; }
@@ -196,7 +196,7 @@ public:
@param showName if true the track name is shown
@return
*/
- QString getInfo(bool showName, bool showFullText) const override;
+ QString getInfo(quint32 feature) const override;
/// get a summary of a selected range
QString getInfoRange() const;
/// get a summary of a selected range defined by two track points
diff --git a/src/gis/trk/CKnownExtension.cpp b/src/gis/trk/CKnownExtension.cpp
index 69ff51f..d6c6ffc 100644
--- a/src/gis/trk/CKnownExtension.cpp
+++ b/src/gis/trk/CKnownExtension.cpp
@@ -124,16 +124,21 @@ void CKnownExtension::initClueTrustTPXv1(const IUnit &units, const QString &ns)
{ tr("Elevation"), 3, -1000., +10000., units.basefactor, units.baseunit, "://icons/32x32/CSrcElevation.png", true, false,
getExtensionValueFunc(ns % ":altitude") });
+ knownExtensions.insert(ns % ":energy",
+ { tr("Energy"), 4, 0., 10000., 1., "kcal/min", "://icons/32x32/CSrcEnergy.png", true, false,
+ getExtensionValueFunc(ns % ":energy") });
+
+
knownExtensions.insert(ns % ":seaLevelPressure",
- { tr("Sea Level Pressure"), 4, 0., 1500., 1., "hPa", "://icons/32x32/CSrcSeaLevelPressure.png", true, false,
+ { tr("Sea Level Pressure"), 5, 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,
+ { tr("Speed"), 6, 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,
+ { tr("Speed (vertical)"), 7, 0., 50., units.speedfactor, units.speedunit, "://icons/32x32/CSrcVertSpeed.png", true, false,
getExtensionValueFunc(ns % ":verticalSpeed")});
}
diff --git a/src/gis/trk/CScrOptTrk.cpp b/src/gis/trk/CScrOptTrk.cpp
index 695d0d0..5af35df 100644
--- a/src/gis/trk/CScrOptTrk.cpp
+++ b/src/gis/trk/CScrOptTrk.cpp
@@ -31,7 +31,7 @@ CScrOptTrk::CScrOptTrk(CGisItemTrk * trk, const QPoint& point, IMouse *parent)
setupUi(this);
setOrigin(point);
label->setFont(CMainWindow::self().getMapFont());
- label->setText(trk->getInfo(true, false));
+ label->setText(trk->getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowActivity));
adjustSize();
toolProfile->setChecked(trk->hasUserFocus());
@@ -77,6 +77,7 @@ CScrOptTrk::CScrOptTrk(CGisItemTrk * trk, const QPoint& point, IMouse *parent)
connect(toolReverse, &QToolButton::clicked, this, &CScrOptTrk::slotReverse);
connect(toolCombine, &QToolButton::clicked, this, &CScrOptTrk::slotCombine);
connect(toolRange, &QToolButton::clicked, this, &CScrOptTrk::slotRange);
+ connect(toolActivity, &QToolButton::clicked, this, &CScrOptTrk::slotActivity);
connect(toolCopyWithWpt, &QToolButton::clicked, this, &CScrOptTrk::slotCopyWithWpt);
@@ -143,6 +144,14 @@ void CScrOptTrk::slotRange()
deleteLater();
}
+void CScrOptTrk::slotActivity()
+{
+ QList<IGisItem::key_t> keys;
+ keys << key;
+ CGisWidget::self().activityTrkByKey(keys);
+ deleteLater();
+}
+
void CScrOptTrk::slotCopyWithWpt()
{
CGisWidget::self().copyTrkWithWptByKey(key);
diff --git a/src/gis/trk/CScrOptTrk.h b/src/gis/trk/CScrOptTrk.h
index 486fd6f..770464f 100644
--- a/src/gis/trk/CScrOptTrk.h
+++ b/src/gis/trk/CScrOptTrk.h
@@ -45,9 +45,11 @@ private slots:
void slotReverse();
void slotCombine();
void slotRange();
+ void slotActivity();
void slotCopyWithWpt();
+
private:
IGisItem::key_t key;
QPointF anchor;
diff --git a/src/gis/trk/CTrackData.h b/src/gis/trk/CTrackData.h
index 72e8b6f..deb82ca 100644
--- a/src/gis/trk/CTrackData.h
+++ b/src/gis/trk/CTrackData.h
@@ -50,8 +50,9 @@ public:
,eActShip = 0x02000000
,eActAero = 0x01000000
,eActSki = 0x00800000
- ,eActMask = 0xFF800000 ///< mask for activity flags
- ,eActMaxNum = 9 ///< maximum number of activity flags. this is defined by the mask
+ ,eActTrain = 0x00400000
+ ,eActMask = 0xFFC00000 ///< mask for activity flags
+ ,eActMaxNum = 10 ///< maximum number of activity flags. this is defined by the mask
};
enum valid_e
diff --git a/src/gis/trk/IDetailsTrk.ui b/src/gis/trk/IDetailsTrk.ui
index 087fb14..a33d2af 100644
--- a/src/gis/trk/IDetailsTrk.ui
+++ b/src/gis/trk/IDetailsTrk.ui
@@ -1356,12 +1356,9 @@
<property name="text">
<string>Set Track Activity</string>
</property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushRemoveActivities">
- <property name="text">
- <string>Remove Track Activity</string>
+ <property name="icon">
+ <iconset resource="../../resources.qrc">
+ <normaloff>:/icons/32x32/Activity.png</normaloff>:/icons/32x32/Activity.png</iconset>
</property>
</widget>
</item>
@@ -1645,9 +1642,9 @@
<connections/>
<buttongroups>
<buttongroup name="buttonGroupGraph3"/>
- <buttongroup name="buttonGroupArrow"/>
<buttongroup name="buttonGroupGraph1"/>
- <buttongroup name="buttonGroupLineWidth"/>
<buttongroup name="buttonGroupGraph2"/>
+ <buttongroup name="buttonGroupArrow"/>
+ <buttongroup name="buttonGroupLineWidth"/>
</buttongroups>
</ui>
diff --git a/src/gis/trk/IScrOptTrk.ui b/src/gis/trk/IScrOptTrk.ui
index da4be11..278b385 100644
--- a/src/gis/trk/IScrOptTrk.ui
+++ b/src/gis/trk/IScrOptTrk.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>300</width>
+ <width>311</width>
<height>65</height>
</rect>
</property>
@@ -176,6 +176,20 @@
</widget>
</item>
<item>
+ <widget class="QToolButton" name="toolActivity">
+ <property name="toolTip">
+ <string>Set an activity for the complete track.</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../resources.qrc">
+ <normaloff>:/icons/32x32/Activity.png</normaloff>:/icons/32x32/Activity.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QToolButton" name="toolCopyWithWpt">
<property name="toolTip">
<string>Copy track together with all attached waypoints into another project.</string>
diff --git a/src/gis/wpt/CGisItemWpt.cpp b/src/gis/wpt/CGisItemWpt.cpp
index 696e3ac..add2162 100644
--- a/src/gis/wpt/CGisItemWpt.cpp
+++ b/src/gis/wpt/CGisItemWpt.cpp
@@ -240,11 +240,11 @@ bool CGisItemWpt::getNewWptData(QPointF& pt, QString& icon, QString& name)
return true;
}
-QString CGisItemWpt::getInfo(bool showName, bool showFullText) const
+QString CGisItemWpt::getInfo(quint32 feature) const
{
QString str = "<div>";
- if(showName)
+ if(feature & eFeatureShowName)
{
str = "<b>" + getName() + "</b><br/>\n";
}
@@ -294,7 +294,7 @@ QString CGisItemWpt::getInfo(bool showName, bool showFullText) const
str += "<br/>\n";
}
- if(showFullText || (desc.count() < 300))
+ if((feature & eFeatureShowFullText) || (desc.count() < 300))
{
str += desc;
}
@@ -312,7 +312,7 @@ QString CGisItemWpt::getInfo(bool showName, bool showFullText) const
str += "<br/>\n";
}
- if(showFullText || cmt.count() < 300)
+ if((feature & eFeatureShowFullText) || (cmt.count() < 300))
{
str += cmt;
}
diff --git a/src/gis/wpt/CGisItemWpt.h b/src/gis/wpt/CGisItemWpt.h
index f466bb0..62a4b82 100644
--- a/src/gis/wpt/CGisItemWpt.h
+++ b/src/gis/wpt/CGisItemWpt.h
@@ -225,7 +225,7 @@ public:
return wpt.name.isEmpty() ? noName : wpt.name;
}
- QString getInfo(bool showName, bool showFullText) const override;
+ QString getInfo(quint32 feature) const override;
QPointF getPosition() const
{
return QPointF(wpt.lon, wpt.lat);
diff --git a/src/gis/wpt/CScrOptWpt.cpp b/src/gis/wpt/CScrOptWpt.cpp
index 695d4a2..6f25385 100644
--- a/src/gis/wpt/CScrOptWpt.cpp
+++ b/src/gis/wpt/CScrOptWpt.cpp
@@ -35,7 +35,7 @@ CScrOptWpt::CScrOptWpt(CGisItemWpt *wpt, const QPoint& point, IMouse *parent)
setupUi(this);
setOrigin(point);
label->setFont(CMainWindow::self().getMapFont());
- label->setText(wpt->getInfo(true, false));
+ label->setText(wpt->getInfo(IGisItem::eFeatureShowName));
adjustSize();
toolProj->setDisabled(wpt->isGeocache() || wpt->isOnDevice());
diff --git a/src/helpers/CProgressDialog.cpp b/src/helpers/CProgressDialog.cpp
index aabbcfa..0d18319 100644
--- a/src/helpers/CProgressDialog.cpp
+++ b/src/helpers/CProgressDialog.cpp
@@ -23,9 +23,15 @@
QStack<CProgressDialog*> CProgressDialog::stackSelf;
+#define DELAY 1000
+
CProgressDialog::CProgressDialog(const QString text, int min, int max, QWidget *parent)
: QDialog(parent)
{
+ if(!stackSelf.isEmpty())
+ {
+ stackSelf.top()->pause();
+ }
stackSelf.push(this);
setupUi(this);
@@ -43,13 +49,18 @@ CProgressDialog::CProgressDialog(const QString text, int min, int max, QWidget *
{
progressBar->hide();
// add a timer to update the elapsed time
- QTimer * timer = new QTimer(this);
- timer->start(1000);
- connect(timer, &QTimer::timeout, this, [this] {setValue(0);
+ QTimer * t = new QTimer(this);
+ t->start(DELAY);
+ connect(t, &QTimer::timeout, this, [this] {setValue(0);
});
}
- hide();
- QTimer::singleShot(1000, this, SLOT(show()));
+
+ QDialog::hide();
+ timer = new QTimer(this);
+ timer->setSingleShot(true);
+ connect(timer, &QTimer::timeout, this, [this] {show();
+ });
+ timer->start(DELAY);
}
CProgressDialog * CProgressDialog::self()
@@ -64,6 +75,40 @@ CProgressDialog * CProgressDialog::self()
CProgressDialog::~CProgressDialog()
{
stackSelf.pop();
+ if(!stackSelf.isEmpty())
+ {
+ stackSelf.top()->goOn();
+ }
+}
+
+void CProgressDialog::pause()
+{
+ hide();
+ timer->stop();
+ timeElapsed = time.elapsed();
+}
+
+void CProgressDialog::goOn()
+{
+ if(timeElapsed <= DELAY)
+ {
+ timer->start(DELAY - timeElapsed);
+ }
+ else
+ {
+ show();
+ }
+}
+
+
+void CProgressDialog::setAllVisible(bool yes)
+{
+ if(stackSelf.isEmpty())
+ {
+ return;
+ }
+
+ yes ? stackSelf.top()->goOn() : stackSelf.top()->pause();
}
void CProgressDialog::enableCancel(bool yes)
@@ -79,7 +124,7 @@ void CProgressDialog::reject()
void CProgressDialog::setValue(int val)
{
- if(time.elapsed() > 1000)
+ if(time.elapsed() > DELAY)
{
QApplication::processEvents();
}
diff --git a/src/helpers/CProgressDialog.h b/src/helpers/CProgressDialog.h
index 2493ed9..1408087 100644
--- a/src/helpers/CProgressDialog.h
+++ b/src/helpers/CProgressDialog.h
@@ -24,6 +24,7 @@
#include <QStack>
#include <QTime>
+class QTimer;
#define PROGRESS_SETUP(lbl, min, max, parent) \
CProgressDialog progress(lbl, min, max, parent);
@@ -42,6 +43,8 @@ public:
static CProgressDialog * self();
+ static void setAllVisible(bool yes);
+
void setValue(int val);
bool wasCanceled();
@@ -52,9 +55,15 @@ public slots:
void reject() override;
private:
- QTime time;
+ void pause();
+ void goOn();
+
static QStack<CProgressDialog*> stackSelf;
+ QTime time;
+ QTimer * timer;
+ qint32 timeElapsed = 0;
};
+
#endif //CPROGRESSDIALOG_H
diff --git a/src/helpers/CSelectCopyAction.cpp b/src/helpers/CSelectCopyAction.cpp
index 655f313..1af277e 100644
--- a/src/helpers/CSelectCopyAction.cpp
+++ b/src/helpers/CSelectCopyAction.cpp
@@ -19,6 +19,7 @@
#include "canvas/CCanvas.h"
#include "gis/IGisItem.h"
#include "gis/prj/IGisProject.h"
+#include "helpers/CProgressDialog.h"
#include "helpers/CSelectCopyAction.h"
#include <QtWidgets>
@@ -29,9 +30,9 @@ CSelectCopyAction::CSelectCopyAction(const IGisItem *src, const IGisItem *tar, Q
setupUi(this);
labelIcon1->setPixmap(src->getIcon());
- labelInfo1->setText(src->getInfo(true, false));
+ labelInfo1->setText(src->getInfo(IGisItem::eFeatureShowName));
labelIcon2->setPixmap(tar->getIcon());
- labelInfo2->setText(tar->getInfo(true, false));
+ labelInfo2->setText(tar->getInfo(IGisItem::eFeatureShowName));
adjustSize();
@@ -40,6 +41,7 @@ CSelectCopyAction::CSelectCopyAction(const IGisItem *src, const IGisItem *tar, Q
connect(pushClone, &QPushButton::clicked, this, &CSelectCopyAction::slotSelectResult);
CCanvas::setOverrideCursor(Qt::ArrowCursor, "CSelectCopyAction");
+ CProgressDialog::setAllVisible(false);
}
CSelectCopyAction::CSelectCopyAction(const IGisProject * src, const IGisProject * tar, QWidget * parent)
@@ -61,11 +63,13 @@ CSelectCopyAction::CSelectCopyAction(const IGisProject * src, const IGisProject
connect(pushSkip, &QPushButton::clicked, this, &CSelectCopyAction::slotSelectResult);
CCanvas::setOverrideCursor(Qt::ArrowCursor, "CSelectCopyAction");
+ CProgressDialog::setAllVisible(false);
}
CSelectCopyAction::~CSelectCopyAction()
{
CCanvas::restoreOverrideCursor("~CSelectCopyAction");
+ CProgressDialog::setAllVisible(true);
}
bool CSelectCopyAction::allOthersToo()
diff --git a/src/helpers/CToolBarConfig.cpp b/src/helpers/CToolBarConfig.cpp
index cb21f8d..0be090a 100644
--- a/src/helpers/CToolBarConfig.cpp
+++ b/src/helpers/CToolBarConfig.cpp
@@ -37,7 +37,7 @@ CToolBarConfig::~CToolBarConfig()
void CToolBarConfig::loadSettings()
{
SETTINGS;
- QStringList actions = cfg.value(QStringLiteral("ToolBar/actions")).toStringList();
+ QStringList actions = cfg.value("ToolBar/actions").toStringList();
if (actions.isEmpty())
{
setDefaultConfiguredActions();
@@ -46,6 +46,7 @@ void CToolBarConfig::loadSettings()
{
setConfiguredActionsByName(actions);
}
+ fullscreen = cfg.value("ToolBar/fullscreen",false).toBool();
}
void CToolBarConfig::saveSettings() const
@@ -56,7 +57,8 @@ void CToolBarConfig::saveSettings() const
{
configuredNames << action->objectName();
}
- cfg.setValue(QStringLiteral("ToolBar/actions"),configuredNames);
+ cfg.setValue("ToolBar/actions",configuredNames);
+ cfg.setValue("ToolBar/fullscreen",fullscreen);
}
const QList<QAction *> & CToolBarConfig::availableActions() const
@@ -81,7 +83,7 @@ void CToolBarConfig::setConfiguredActionsByName(const QStringList & names)
if (action->isSeparator())
{
QAction * separator = new QAction(this);
- separator->setObjectName(QStringLiteral("separator"));
+ separator->setObjectName("separator");
separator->setSeparator(true);
actions << separator;
}
diff --git a/src/helpers/CToolBarConfig.h b/src/helpers/CToolBarConfig.h
index b1e09ae..148c85d 100644
--- a/src/helpers/CToolBarConfig.h
+++ b/src/helpers/CToolBarConfig.h
@@ -41,11 +41,14 @@ public:
void setConfiguredActionsByName(const QStringList & actions);
void setConfiguredActions(const QList<QAction *> & actions);
void setDefaultConfiguredActions();
+ void setVisibleInFullscreen(bool visible) { fullscreen = visible; }
+ bool visibleInFullscreen() { return fullscreen; }
private:
QToolBar * const toolBar;
const QList<QAction *> available;
const QList<QAction *> defaultActions;
QList<QAction *> configured;
+ bool fullscreen = false;
};
#endif //CTOOLBARCONFIG_H
diff --git a/src/helpers/CToolBarSetupDialog.cpp b/src/helpers/CToolBarSetupDialog.cpp
index ec94d87..47fa1d6 100644
--- a/src/helpers/CToolBarSetupDialog.cpp
+++ b/src/helpers/CToolBarSetupDialog.cpp
@@ -25,7 +25,7 @@ bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item)
CDialogItem * dialogItem = dynamic_cast<CDialogItem *>(item);
if (dialogItem != nullptr)
{
- return dialogItem->actionName != QStringLiteral("separator");
+ return dialogItem->actionName != "separator";
}
return true;
}
@@ -61,6 +61,7 @@ void CToolBarSetupDialog::accept()
}
}
config->setConfiguredActionsByName(actionNames);
+ config->setVisibleInFullscreen(checkFullscreen->isChecked());
QDialog::accept();
}
@@ -86,7 +87,7 @@ void CToolBarSetupDialog::configure() const
{
if (action->isSeparator())
{
- selectedItems << new CDialogItem(action->icon(),QStringLiteral("---------------"),action->objectName());
+ selectedItems << new CDialogItem(action->icon(),"---------------",action->objectName());
}
else
{
@@ -103,5 +104,6 @@ void CToolBarSetupDialog::configure() const
}
selectActionsWidget->setSelected(selectedItems);
selectActionsWidget->setAvailable(availableItems);
+ checkFullscreen->setChecked(config->visibleInFullscreen());
}
diff --git a/src/helpers/IToolBarSetupDialog.ui b/src/helpers/IToolBarSetupDialog.ui
index 7d8ffd0..8417868 100644
--- a/src/helpers/IToolBarSetupDialog.ui
+++ b/src/helpers/IToolBarSetupDialog.ui
@@ -18,6 +18,13 @@
<widget class="CSelectDoubleListWidget" name="selectActionsWidget" native="true"/>
</item>
<item>
+ <widget class="QCheckBox" name="checkFullscreen">
+ <property name="text">
+ <string>Toolbar is visible in Fullscreen-mode</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults</set>
diff --git a/src/icons/16x16/ActNone.png b/src/icons/16x16/ActNone.png
index d581361..0e1bab1 100644
Binary files a/src/icons/16x16/ActNone.png and b/src/icons/16x16/ActNone.png differ
diff --git a/src/icons/16x16/ActTrain.png b/src/icons/16x16/ActTrain.png
new file mode 100644
index 0000000..3cf4d7a
Binary files /dev/null and b/src/icons/16x16/ActTrain.png differ
diff --git a/src/icons/16x16/NoActivity.png b/src/icons/16x16/NoActivity.png
new file mode 100644
index 0000000..0e1bab1
Binary files /dev/null and b/src/icons/16x16/NoActivity.png differ
diff --git a/src/icons/32x32/ActNone.png b/src/icons/32x32/ActNone.png
index cc2ec04..5e81c2c 100644
Binary files a/src/icons/32x32/ActNone.png and b/src/icons/32x32/ActNone.png differ
diff --git a/src/icons/32x32/ActTrain.png b/src/icons/32x32/ActTrain.png
new file mode 100644
index 0000000..89f0f00
Binary files /dev/null and b/src/icons/32x32/ActTrain.png differ
diff --git a/src/icons/32x32/AutoSave.png b/src/icons/32x32/AutoSave.png
new file mode 100644
index 0000000..350c3c6
Binary files /dev/null and b/src/icons/32x32/AutoSave.png differ
diff --git a/src/icons/32x32/CSrcDistance.png b/src/icons/32x32/CSrcDistance.png
index 71517f0..9adc95b 100644
Binary files a/src/icons/32x32/CSrcDistance.png and b/src/icons/32x32/CSrcDistance.png differ
diff --git a/src/icons/32x32/CSrcEnergy.png b/src/icons/32x32/CSrcEnergy.png
new file mode 100644
index 0000000..75a59f1
Binary files /dev/null and b/src/icons/32x32/CSrcEnergy.png differ
diff --git a/src/icons/32x32/CSrcSeaLevelPressure.png b/src/icons/32x32/CSrcSeaLevelPressure.png
index 2098dd5..db2f5df 100644
Binary files a/src/icons/32x32/CSrcSeaLevelPressure.png and b/src/icons/32x32/CSrcSeaLevelPressure.png differ
diff --git a/src/icons/32x32/CSrcVertSpeed.png b/src/icons/32x32/CSrcVertSpeed.png
index a002a88..13564c3 100644
Binary files a/src/icons/32x32/CSrcVertSpeed.png and b/src/icons/32x32/CSrcVertSpeed.png differ
diff --git a/src/icons/32x32/CutHistoryAfter.png b/src/icons/32x32/CutHistoryAfter.png
index 82acf6d..5a85d56 100644
Binary files a/src/icons/32x32/CutHistoryAfter.png and b/src/icons/32x32/CutHistoryAfter.png differ
diff --git a/src/icons/32x32/CutHistoryBefore.png b/src/icons/32x32/CutHistoryBefore.png
index a6b8bc6..caf16a7 100644
Binary files a/src/icons/32x32/CutHistoryBefore.png and b/src/icons/32x32/CutHistoryBefore.png differ
diff --git a/src/icons/32x32/FitProject.png b/src/icons/32x32/FitProject.png
index b23a00b..c0e5261 100644
Binary files a/src/icons/32x32/FitProject.png and b/src/icons/32x32/FitProject.png differ
diff --git a/src/icons/32x32/FullScreen.png b/src/icons/32x32/FullScreen.png
new file mode 100644
index 0000000..3065c50
Binary files /dev/null and b/src/icons/32x32/FullScreen.png differ
diff --git a/src/icons/32x32/MimeGEMF.png b/src/icons/32x32/MimeGEMF.png
index f8e68c3..5c10e62 100644
Binary files a/src/icons/32x32/MimeGEMF.png and b/src/icons/32x32/MimeGEMF.png differ
diff --git a/src/icons/32x32/MySQLNoConn.png b/src/icons/32x32/MySQLNoConn.png
index 5597bc4..14fa6ee 100644
Binary files a/src/icons/32x32/MySQLNoConn.png and b/src/icons/32x32/MySQLNoConn.png differ
diff --git a/src/icons/32x32/PastePlain.png b/src/icons/32x32/PastePlain.png
index 70f5b53..ba0fca7 100644
Binary files a/src/icons/32x32/PastePlain.png and b/src/icons/32x32/PastePlain.png differ
diff --git a/src/icons/32x32/RegularScreen.png b/src/icons/32x32/RegularScreen.png
new file mode 100644
index 0000000..4fa80bd
Binary files /dev/null and b/src/icons/32x32/RegularScreen.png differ
diff --git a/src/icons/32x32/SQLiteNoConn.png b/src/icons/32x32/SQLiteNoConn.png
index b702b6c..5ef05e5 100644
Binary files a/src/icons/32x32/SQLiteNoConn.png and b/src/icons/32x32/SQLiteNoConn.png differ
diff --git a/src/icons/32x32/Template.png b/src/icons/32x32/Template.png
new file mode 100644
index 0000000..fd17d07
Binary files /dev/null and b/src/icons/32x32/Template.png differ
diff --git a/src/icons/32x32/ToggleDem.png b/src/icons/32x32/ToggleDem.png
index 9dadf27..05dca92 100644
Binary files a/src/icons/32x32/ToggleDem.png and b/src/icons/32x32/ToggleDem.png differ
diff --git a/src/icons/32x32/ToggleDocks.png b/src/icons/32x32/ToggleDocks.png
index 54b9140..b721f95 100644
Binary files a/src/icons/32x32/ToggleDocks.png and b/src/icons/32x32/ToggleDocks.png differ
diff --git a/src/icons/32x32/ToggleGis.png b/src/icons/32x32/ToggleGis.png
index 46ada30..e9b98f5 100644
Binary files a/src/icons/32x32/ToggleGis.png and b/src/icons/32x32/ToggleGis.png differ
diff --git a/src/icons/32x32/ToggleMaps.png b/src/icons/32x32/ToggleMaps.png
index 5a495f1..24f6915 100644
Binary files a/src/icons/32x32/ToggleMaps.png and b/src/icons/32x32/ToggleMaps.png differ
diff --git a/src/icons/32x32/ToggleRouter.png b/src/icons/32x32/ToggleRouter.png
index 41b7006..c00a0d0 100644
Binary files a/src/icons/32x32/ToggleRouter.png and b/src/icons/32x32/ToggleRouter.png differ
diff --git a/src/icons/32x32/ToolBar.png b/src/icons/32x32/ToolBar.png
index 2bd0b39..fdc16fb 100644
Binary files a/src/icons/32x32/ToolBar.png and b/src/icons/32x32/ToolBar.png differ
diff --git a/src/icons/32x32/ToolBarSetup.png b/src/icons/32x32/ToolBarSetup.png
index 121943e..e8aa752 100644
Binary files a/src/icons/32x32/ToolBarSetup.png and b/src/icons/32x32/ToolBarSetup.png differ
diff --git a/src/icons/48x48/ActNone.png b/src/icons/48x48/ActNone.png
index 277f4a2..f9ba139 100644
Binary files a/src/icons/48x48/ActNone.png and b/src/icons/48x48/ActNone.png differ
diff --git a/src/icons/48x48/ActTrain.png b/src/icons/48x48/ActTrain.png
new file mode 100644
index 0000000..7ba5bad
Binary files /dev/null and b/src/icons/48x48/ActTrain.png differ
diff --git a/src/icons/48x48/AutoSave.png b/src/icons/48x48/AutoSave.png
new file mode 100644
index 0000000..5761af1
Binary files /dev/null and b/src/icons/48x48/AutoSave.png differ
diff --git a/src/icons/48x48/CSrcDistance.png b/src/icons/48x48/CSrcDistance.png
index d6b4cdb..8c3e1e3 100644
Binary files a/src/icons/48x48/CSrcDistance.png and b/src/icons/48x48/CSrcDistance.png differ
diff --git a/src/icons/48x48/CSrcEnergy.png b/src/icons/48x48/CSrcEnergy.png
new file mode 100644
index 0000000..42b2f81
Binary files /dev/null and b/src/icons/48x48/CSrcEnergy.png differ
diff --git a/src/icons/48x48/CSrcSeaLevelPressure.png b/src/icons/48x48/CSrcSeaLevelPressure.png
index a3833c6..56b9595 100644
Binary files a/src/icons/48x48/CSrcSeaLevelPressure.png and b/src/icons/48x48/CSrcSeaLevelPressure.png differ
diff --git a/src/icons/48x48/CSrcVertSpeed.png b/src/icons/48x48/CSrcVertSpeed.png
index 375c50b..ce14540 100644
Binary files a/src/icons/48x48/CSrcVertSpeed.png and b/src/icons/48x48/CSrcVertSpeed.png differ
diff --git a/src/icons/48x48/CutHistoryAfter.png b/src/icons/48x48/CutHistoryAfter.png
index b67f82c..535aa19 100644
Binary files a/src/icons/48x48/CutHistoryAfter.png and b/src/icons/48x48/CutHistoryAfter.png differ
diff --git a/src/icons/48x48/CutHistoryBefore.png b/src/icons/48x48/CutHistoryBefore.png
index d5cb4eb..575608e 100644
Binary files a/src/icons/48x48/CutHistoryBefore.png and b/src/icons/48x48/CutHistoryBefore.png differ
diff --git a/src/icons/48x48/FitProject.png b/src/icons/48x48/FitProject.png
index bd98150..02a53dc 100644
Binary files a/src/icons/48x48/FitProject.png and b/src/icons/48x48/FitProject.png differ
diff --git a/src/icons/48x48/FullScreen.png b/src/icons/48x48/FullScreen.png
new file mode 100644
index 0000000..ce576f5
Binary files /dev/null and b/src/icons/48x48/FullScreen.png differ
diff --git a/src/icons/48x48/MimeGEMF.png b/src/icons/48x48/MimeGEMF.png
index 50776ed..e2c855c 100644
Binary files a/src/icons/48x48/MimeGEMF.png and b/src/icons/48x48/MimeGEMF.png differ
diff --git a/src/icons/48x48/MySQLNoConn.png b/src/icons/48x48/MySQLNoConn.png
index fb40a92..9e1fd41 100644
Binary files a/src/icons/48x48/MySQLNoConn.png and b/src/icons/48x48/MySQLNoConn.png differ
diff --git a/src/icons/48x48/PastePlain.png b/src/icons/48x48/PastePlain.png
index c98a333..ad984e5 100644
Binary files a/src/icons/48x48/PastePlain.png and b/src/icons/48x48/PastePlain.png differ
diff --git a/src/icons/48x48/RegularScreen.png b/src/icons/48x48/RegularScreen.png
new file mode 100644
index 0000000..3af0298
Binary files /dev/null and b/src/icons/48x48/RegularScreen.png differ
diff --git a/src/icons/48x48/SQLiteNoConn.png b/src/icons/48x48/SQLiteNoConn.png
index e39ebbb..a307350 100644
Binary files a/src/icons/48x48/SQLiteNoConn.png and b/src/icons/48x48/SQLiteNoConn.png differ
diff --git a/src/icons/48x48/Template.png b/src/icons/48x48/Template.png
new file mode 100644
index 0000000..f3077d3
Binary files /dev/null and b/src/icons/48x48/Template.png differ
diff --git a/src/icons/48x48/ToggleDem.png b/src/icons/48x48/ToggleDem.png
index 6502b02..4c30a52 100644
Binary files a/src/icons/48x48/ToggleDem.png and b/src/icons/48x48/ToggleDem.png differ
diff --git a/src/icons/48x48/ToggleDocks.png b/src/icons/48x48/ToggleDocks.png
index a6720b2..82fed7c 100644
Binary files a/src/icons/48x48/ToggleDocks.png and b/src/icons/48x48/ToggleDocks.png differ
diff --git a/src/icons/48x48/ToggleGis.png b/src/icons/48x48/ToggleGis.png
index 26c49b4..6b6cab6 100644
Binary files a/src/icons/48x48/ToggleGis.png and b/src/icons/48x48/ToggleGis.png differ
diff --git a/src/icons/48x48/ToggleMaps.png b/src/icons/48x48/ToggleMaps.png
index bbcb81d..799ec1b 100644
Binary files a/src/icons/48x48/ToggleMaps.png and b/src/icons/48x48/ToggleMaps.png differ
diff --git a/src/icons/48x48/ToggleRouter.png b/src/icons/48x48/ToggleRouter.png
index 9304788..f1c518d 100644
Binary files a/src/icons/48x48/ToggleRouter.png and b/src/icons/48x48/ToggleRouter.png differ
diff --git a/src/icons/48x48/ToolBar.png b/src/icons/48x48/ToolBar.png
index 9155472..89a7275 100644
Binary files a/src/icons/48x48/ToolBar.png and b/src/icons/48x48/ToolBar.png differ
diff --git a/src/icons/48x48/ToolBarSetup.png b/src/icons/48x48/ToolBarSetup.png
index 6aa98c1..e025a34 100644
Binary files a/src/icons/48x48/ToolBarSetup.png and b/src/icons/48x48/ToolBarSetup.png differ
diff --git a/src/icons/ActNone.svg b/src/icons/ActNone.svg
index 72bd7fc..c1b735f 100644
--- a/src/icons/ActNone.svg
+++ b/src/icons/ActNone.svg
@@ -13,8 +13,8 @@
height="64"
id="svg2"
version="1.1"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="Neues Dokument 1">
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="NoActivity.svg">
<defs
id="defs4" />
<sodipodi:namedview
@@ -25,15 +25,15 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6"
- inkscape:cx="18.118764"
+ inkscape:cx="-24.024093"
inkscape:cy="14.956729"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
- inkscape:window-height="1010"
- inkscape:window-x="-4"
- inkscape:window-y="-4"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
@@ -51,7 +51,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>
@@ -62,22 +62,189 @@
transform="translate(0,-988.3622)">
<rect
style="fill:none;stroke:none"
- id="rect2987"
- width="40"
- height="40"
- x="5"
- y="991.62561" />
- <text
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- x="15.15625"
- y="1025.9713"
- id="text2989"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan2991"
- x="15.15625"
- y="1025.9713"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Serif;-inkscape-font-specification:Droid Serif">?</tspan></text>
+ id="rect3792"
+ width="60"
+ height="60"
+ x="0"
+ y="988.61218" />
+ <g
+ id="g3217"
+ transform="translate(80,-5)">
+ <g
+ transform="translate(25,5)"
+ id="g3785">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000080;fill-opacity:1;stroke:none"
+ id="path3005"
+ sodipodi:cx="-55"
+ sodipodi:cy="9"
+ sodipodi:rx="5"
+ sodipodi:ry="5"
+ d="m -50,9 a 5,5 0 0 1 -4.994507,4.999997 5,5 0 0 1 -5.005481,-4.9890115 5,5 0 0 1 4.98351,-5.0109583 5,5 0 0 1 5.01643,4.9780018"
+ transform="matrix(1.5,0,0,1.5,27.5,986.3622)"
+ sodipodi:start="0"
+ sodipodi:end="6.2787911"
+ sodipodi:open="true" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -55,14 0,20 10,10 0,10"
+ id="path3009"
+ inkscape:connector-curvature="0"
+ transform="translate(0,988.3622)"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="M -55,34 -65,54"
+ id="path3011"
+ inkscape:connector-curvature="0"
+ transform="translate(0,988.3622)"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -55,19 -10,5 0,10"
+ id="path3013"
+ inkscape:connector-curvature="0"
+ transform="translate(0,988.3622)"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -55,24 10,10"
+ id="path3015"
+ inkscape:connector-curvature="0"
+ transform="translate(0,988.3622)"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <g
+ transform="matrix(0.65909091,0,0,0.76190476,-75.977273,236.56243)"
+ id="g3790">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000080;fill-opacity:1;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path2991"
+ sodipodi:cx="12.5"
+ sodipodi:cy="41.5"
+ sodipodi:rx="2.5"
+ sodipodi:ry="2.5"
+ d="m 15,41.5 a 2.5,2.5 0 0 1 -2.497254,2.499998 2.5,2.5 0 0 1 -2.50274,-2.494505 2.5,2.5 0 0 1 2.491755,-2.505479 2.5,2.5 0 0 1 2.508215,2.489001"
+ transform="translate(0,988.6177)"
+ sodipodi:start="0"
+ sodipodi:end="6.2787911"
+ sodipodi:open="true" />
+ <path
+ transform="translate(24.000024,988.6177)"
+ sodipodi:type="arc"
+ style="fill:#000080;fill-opacity:1;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path2991-0"
+ sodipodi:cx="12.5"
+ sodipodi:cy="41.5"
+ sodipodi:rx="2.5"
+ sodipodi:ry="2.5"
+ d="m 15,41.5 a 2.5,2.5 0 0 1 -2.497254,2.499998 2.5,2.5 0 0 1 -2.50274,-2.494505 2.5,2.5 0 0 1 2.491755,-2.505479 2.5,2.5 0 0 1 2.508215,2.489001"
+ sodipodi:start="0"
+ sodipodi:end="6.2787911"
+ sodipodi:open="true" />
+ <path
+ style="fill:#000080;stroke:none"
+ d="m 10,22 -7,10 0,10 4,0 c 0.3852531,-2.94808 1.1917681,-3.474899 3,-5 1.513423,-0.766219 3.253592,-0.398706 5,0 2.497722,2.333333 2.024416,2.666667 3,5 l 13,0 c 0.304003,-2.397713 0,-3 2,-5 4,-1 4.733951,-0.403707 7,0 2.037552,2.676055 1.757044,3.772594 2,6 l 5,0 0,-9 -12,-5 -5,-7 z"
+ transform="translate(0,988.3622)"
+ id="path3779"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccccc" />
+ <path
+ transform="translate(0,988.3622)"
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ d="m 21,24 9,0 4,7 -13,0 z"
+ id="rect3784"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ transform="translate(0,988.3622)"
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ d="m 11,24 8,0 0,7 -11,0 z"
+ id="rect3786"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ </g>
+ <g
+ style="stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none"
+ transform="matrix(0.55391146,0,0,0.65998364,-17.917526,359.31996)"
+ id="g3851">
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#000080;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+ id="path3813"
+ sodipodi:cx="-95"
+ sodipodi:cy="54"
+ sodipodi:rx="10"
+ sodipodi:ry="10"
+ d="m -85,54 a 10,10 0 0 1 -9.989014,9.999994 10,10 0 0 1 -10.010966,-9.978023 10,10 0 0 1 9.967024,-10.021917 10,10 0 0 1 10.032859,9.956004"
+ transform="translate(0,988.3622)"
+ sodipodi:start="0"
+ sodipodi:end="6.2787911"
+ sodipodi:open="true" />
+ <path
+ transform="translate(35.000097,988.40614)"
+ sodipodi:type="arc"
+ style="fill:none;stroke:#000080;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+ id="path3813-2"
+ sodipodi:cx="-95"
+ sodipodi:cy="54"
+ sodipodi:rx="10"
+ sodipodi:ry="10"
+ d="m -85,54 a 10,10 0 0 1 -9.989014,9.999994 10,10 0 0 1 -10.010966,-9.978023 10,10 0 0 1 9.967024,-10.021917 10,10 0 0 1 10.032859,9.956004"
+ sodipodi:start="0"
+ sodipodi:end="6.2787911"
+ sodipodi:open="true" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -60,1042.3622 -5,-15"
+ id="path3833"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -95,54 10,-15 20,0"
+ id="path3835"
+ inkscape:connector-curvature="0"
+ transform="translate(0,988.3622)"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -65,39 -15,15 -5,-15 -2,-5"
+ id="path3839"
+ inkscape:connector-curvature="0"
+ transform="translate(0,988.3622)"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -80,54 -15,0"
+ id="path3841"
+ inkscape:connector-curvature="0"
+ transform="translate(0,988.3622)" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -90,1022.3622 7,0 -7,1"
+ id="path3843"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -65,39 0,-4 3,-2 -6,-1"
+ id="path3845"
+ inkscape:connector-curvature="0"
+ transform="translate(0,988.3622)" />
+ </g>
+ </g>
+ <path
+ style="fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 4.6428571,1047.5408 60,992.3622"
+ id="path4176"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+ d="m 5,992.3622 55,55"
+ id="path4178"
+ inkscape:connector-curvature="0" />
</g>
</svg>
diff --git a/src/icons/ActTrain.svg b/src/icons/ActTrain.svg
new file mode 100644
index 0000000..774c5f8
--- /dev/null
+++ b/src/icons/ActTrain.svg
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="64"
+ height="64"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="ActTrain.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="84.154362"
+ inkscape:cy="20.610697"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2985"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-988.3622)">
+ <rect
+ style="fill:none;stroke:none"
+ id="rect3797"
+ width="45"
+ height="45"
+ x="9.8482141"
+ y="997.36218" />
+ <g
+ id="g4195"
+ transform="translate(1.0267859,5.2128889)">
+ <rect
+ y="1014.0586"
+ x="10.446428"
+ height="13"
+ width="43"
+ id="rect4165"
+ style="opacity:1;fill:#000080;fill-opacity:1;stroke:none;stroke-width:7.08661413;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ sodipodi:open="true"
+ sodipodi:end="6.2787911"
+ sodipodi:start="0"
+ d="m 23.517772,1027.6864 a 3.7499592,3.7500033 0 0 1 -3.74584,3.75 3.7499592,3.7500033 0 0 1 -3.754069,-3.7418 3.7499592,3.7500033 0 0 1 3.737591,-3.7582 3.7499592,3.7500033 0 0 1 3.762282,3.7335"
+ sodipodi:ry="3.7500033"
+ sodipodi:rx="3.7499592"
+ sodipodi:cy="1027.6864"
+ sodipodi:cx="19.767813"
+ id="path2991"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:open="true"
+ sodipodi:end="6.2787911"
+ sodipodi:start="0"
+ d="m 48.91063,1027.615 a 3.7499592,3.7500033 0 0 1 -3.745839,3.75 3.7499592,3.7500033 0 0 1 -3.75407,-3.7418 3.7499592,3.7500033 0 0 1 3.737592,-3.7582 3.7499592,3.7500033 0 0 1 3.762281,3.7335"
+ sodipodi:ry="3.7500033"
+ sodipodi:rx="3.7499592"
+ sodipodi:cy="1027.615"
+ sodipodi:cx="45.160671"
+ id="path2991-3"
+ style="fill:#000080;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <rect
+ y="1002.2729"
+ x="10.446428"
+ height="12"
+ width="16"
+ id="rect4185"
+ style="opacity:1;fill:#000080;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <rect
+ y="997.36218"
+ x="45"
+ height="17"
+ width="5"
+ id="rect4187"
+ style="opacity:1;fill:#000080;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <rect
+ y="1000.0943"
+ x="9.1964283"
+ height="3"
+ width="20"
+ id="rect4189"
+ style="opacity:1;fill:#000080;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <rect
+ y="1004.1122"
+ x="13.303572"
+ height="8.7678566"
+ width="9.75"
+ id="rect4191"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <rect
+ y="1009.3622"
+ x="33"
+ height="5"
+ width="6"
+ id="rect4193"
+ style="opacity:1;fill:#000080;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/AutoSave.svg b/src/icons/AutoSave.svg
new file mode 100644
index 0000000..0931946
--- /dev/null
+++ b/src/icons/AutoSave.svg
@@ -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="64"
+ height="64"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="AutoSave.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="-28.807789"
+ inkscape:cy="39.059244"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2985"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-988.36218)">
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot3859"
+ style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:12px;line-height:125%;letter-spacing:0px;word-spacing:0px"><flowRegion
+ id="flowRegion3861"><rect
+ id="rect3863"
+ width="75.35714"
+ height="62.142857"
+ x="-9.4642859"
+ y="2.2142856" /></flowRegion><flowPara
+ id="flowPara3865" /></flowRoot> <rect
+ style="fill:none;stroke:none"
+ id="rect3769"
+ width="40"
+ height="40"
+ x="19.823658"
+ y="994.70831" />
+ <g
+ id="g4549"
+ transform="translate(56.785717,-3.3928571)">
+ <rect
+ y="998.10114"
+ x="-49.82143"
+ height="29.999996"
+ width="30"
+ id="rect3366-5"
+ style="fill:#000080;fill-opacity:1;stroke:#0000ff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+ <rect
+ y="1017.6011"
+ x="-44.464287"
+ height="10.499999"
+ width="19.5"
+ id="rect4136-7"
+ style="fill:#cccccc;fill-opacity:1;stroke:#0000ff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+ <rect
+ y="1020.2748"
+ x="-40.067711"
+ height="5.0856576"
+ width="3.8534257"
+ id="rect4138-5"
+ style="fill:#000080;fill-opacity:1;stroke:#0000ff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+ <rect
+ y="1000.1259"
+ x="-45.793831"
+ height="14.050763"
+ width="21.944799"
+ id="rect4145-7"
+ style="fill:#ececec;fill-opacity:1;stroke:#0000ff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:16px;line-height:125%;font-family:Sans;-inkscape-font-specification: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"
+ x="35"
+ y="1042.3622"
+ id="text4183"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan4185"
+ x="35"
+ y="1042.3622"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:30px;font-family:Sans;-inkscape-font-specification:'Sans Bold'">A</tspan></text>
+ </g>
+</svg>
diff --git a/src/icons/CSrcEnergy.svg b/src/icons/CSrcEnergy.svg
new file mode 100644
index 0000000..156421c
--- /dev/null
+++ b/src/icons/CSrcEnergy.svg
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="64"
+ height="64"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.92.1 r15371"
+ sodipodi:docname="CSrcEnergy.svg">
+ <defs
+ id="defs4">
+ <marker
+ inkscape:isstock="true"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5745"
+ inkscape:stockid="InfiniteLineEnd"
+ style="overflow:visible">
+ <g
+ style="fill:#000000;stroke:#000000;stroke-opacity:1;fill-opacity:1"
+ id="g5747">
+ <circle
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ cx="3"
+ cy="0"
+ r="0.8"
+ id="circle5749" />
+ <circle
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ cx="6.5"
+ cy="0"
+ r="0.8"
+ id="circle5751" />
+ <circle
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ cx="10"
+ cy="0"
+ r="0.8"
+ id="circle5753" />
+ </g>
+ </marker>
+ <marker
+ inkscape:isstock="true"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5413"
+ inkscape:stockid="InfiniteLineEnd"
+ style="overflow:visible">
+ <g
+ style="fill:#000000;stroke:#000000;stroke-opacity:1;fill-opacity:1"
+ id="g5415">
+ <circle
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ cx="3"
+ cy="0"
+ r="0.8"
+ id="circle5417" />
+ <circle
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ cx="6.5"
+ cy="0"
+ r="0.8"
+ id="circle5419" />
+ <circle
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ cx="10"
+ cy="0"
+ r="0.8"
+ id="circle5421" />
+ </g>
+ </marker>
+ <marker
+ inkscape:isstock="true"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5277"
+ inkscape:stockid="InfiniteLineEnd"
+ style="overflow:visible">
+ <g
+ style="fill:#000000;stroke:#000000;stroke-opacity:1;fill-opacity:1"
+ id="g5279">
+ <circle
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ cx="3"
+ cy="0"
+ r="0.8"
+ id="circle5281" />
+ <circle
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ cx="6.5"
+ cy="0"
+ r="0.8"
+ id="circle5283" />
+ <circle
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ cx="10"
+ cy="0"
+ r="0.8"
+ id="circle5285" />
+ </g>
+ </marker>
+ <marker
+ inkscape:stockid="Tail"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Tail"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <g
+ id="g4297"
+ transform="scale(-1.2)"
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1">
+ <path
+ id="path4299"
+ d="M -3.8048674,-3.9585227 L 0.54352094,0"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round;stroke-opacity:1;fill-opacity:1" />
+ <path
+ id="path4301"
+ d="M -1.2866832,-3.9585227 L 3.0617053,0"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round;stroke-opacity:1;fill-opacity:1" />
+ <path
+ id="path4303"
+ d="M 1.3053582,-3.9585227 L 5.6537466,0"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round;stroke-opacity:1;fill-opacity:1" />
+ <path
+ id="path4305"
+ d="M -3.8048674,4.1775838 L 0.54352094,0.21974226"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round;stroke-opacity:1;fill-opacity:1" />
+ <path
+ id="path4307"
+ d="M -1.2866832,4.1775838 L 3.0617053,0.21974226"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round;stroke-opacity:1;fill-opacity:1" />
+ <path
+ id="path4309"
+ d="M 1.3053582,4.1775838 L 5.6537466,0.21974226"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:round;stroke-opacity:1;fill-opacity:1" />
+ </g>
+ </marker>
+ <marker
+ style="overflow:visible"
+ inkscape:stockid="InfiniteLineEnd"
+ id="InfiniteLineEnd"
+ refX="0"
+ refY="0"
+ orient="auto"
+ inkscape:isstock="true">
+ <g
+ id="g4496"
+ style="fill:#000000;stroke:#000000;stroke-opacity:1;fill-opacity:1">
+ <circle
+ id="circle4498"
+ r="0.8"
+ cy="0"
+ cx="3"
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1" />
+ <circle
+ id="circle4500"
+ r="0.8"
+ cy="0"
+ cx="6.5"
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1" />
+ <circle
+ id="circle4502"
+ r="0.8"
+ cy="0"
+ cx="10"
+ style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1" />
+ </g>
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Send"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Send"
+ style="overflow:visible;"
+ inkscape:isstock="true">
+ <path
+ id="path4276"
+ 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="Arrow1Sstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Sstart"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ id="path4273"
+ 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) translate(6,0)" />
+ </marker>
+ <marker
+ inkscape:isstock="true"
+ style="overflow:visible;"
+ id="marker5453"
+ 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:#000080;stroke-width:1pt;stroke-opacity:1;fill:#000080;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="path5455" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Sstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="marker5203"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ id="path5205"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1;fill:#000080;fill-opacity:1"
+ transform="scale(0.2) translate(6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Mstart"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ id="path4156"
+ 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.4) translate(10,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Lstart"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ id="path4150"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000080;stroke-width:1pt;stroke-opacity:1;fill:#000080;fill-opacity:1"
+ transform="scale(0.8) translate(12.5,0)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.12"
+ inkscape:cx="-4.4608462"
+ inkscape:cy="5.4009322"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1058"
+ inkscape:window-x="1912"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ gridtolerance="10">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2985"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-988.36218)">
+ <g
+ id="g4594"
+ transform="matrix(1.8321266,0,0,1.0760874,-25.942077,-79.941076)">
+ <path
+ sodipodi:nodetypes="cccsccccc"
+ inkscape:connector-curvature="0"
+ id="path4661"
+ d="m 35,993.36218 c -6,21.00002 10,18.00002 9,38.00002 1,-1 0.07758,-3.0776 4,-7 -2.282872,4.5657 4,8 -2.448622,19.8886 C 44.01654,1047.0805 39,1052.3622 33,1052.3622 c -12,0 -16,-15 -16,-22 0,-9 2,-11 -2,-18 3,1 5.172633,1.2762 9,4.4488 2,-6.4488 1,-8.4488 11,-23.44882 z"
+ style="fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4661-0"
+ d="m 35,1017.8622 c -5,14.5 6,13.5 6,21.5 0,6 -1.879845,10.752 -8,11 -6,0 -9,-7.5 -9,-11 -0.739778,-10.187 2,-13 11,-21.5 z"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/FullScreen.svg b/src/icons/FullScreen.svg
new file mode 100644
index 0000000..102b683
--- /dev/null
+++ b/src/icons/FullScreen.svg
@@ -0,0 +1,193 @@
+<?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="FullScreen.svg"
+ inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_shortcut/src/icons/32x32/FullScreen.png"
+ inkscape:export-xdpi="45"
+ inkscape:export-ydpi="45">
+ <defs
+ id="defs3515">
+ <marker
+ inkscape:stockid="Arrow1Mstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mstart"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4038"
+ 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="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mend"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4041"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.9200534"
+ inkscape:cx="10.0025"
+ inkscape:cy="30.667212"
+ 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"
+ inkscape:snap-grids="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3092"
+ empspacing="4" />
+ </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></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:#000080;stroke-width:2.02185273;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4224"
+ width="56.450459"
+ height="56.3265"
+ x="3.7674229"
+ y="3.9060819"
+ ry="0.55861032" />
+ <g
+ id="g4204"
+ transform="matrix(1.0090129,0,0,1.0051413,-0.67058836,0.40584258)">
+ <g
+ id="g4173">
+ <g
+ id="g4157">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3358"
+ d="m 9.9746251,24.360854 0,-15.241799 15.0839479,0"
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4.1458993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4155"
+ d="M 10,9 25,24"
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ id="g4161">
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4.1458993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 9.9746251,24.360854 0,-15.241799 15.0839479,0"
+ id="path4163"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 10,9 25,24"
+ id="path4165"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g4167"
+ transform="matrix(-1,0,0,-1,64.986556,63.114643)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4169"
+ d="m 9.9746251,24.360854 0,-15.241799 15.0839479,0"
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4.1458993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4171"
+ d="M 10,9 25,24"
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ transform="matrix(0,1,-1,0,64.0506,-0.9359565)"
+ id="g4184">
+ <g
+ id="g4186">
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4.1458993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 9.9746251,24.360854 0,-15.241799 15.0839479,0"
+ id="path4188"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 10,9 25,24"
+ id="path4190"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g4192">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4194"
+ d="m 9.9746251,24.360854 0,-15.241799 15.0839479,0"
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4.1458993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4196"
+ d="M 10,9 25,24"
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ transform="matrix(-1,0,0,-1,64.986556,63.114643)"
+ id="g4198">
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4.1458993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 9.9746251,24.360854 0,-15.241799 15.0839479,0"
+ id="path4200"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 10,9 25,24"
+ id="path4202"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/RegularScreen.svg b/src/icons/RegularScreen.svg
new file mode 100644
index 0000000..da2f74a
--- /dev/null
+++ b/src/icons/RegularScreen.svg
@@ -0,0 +1,156 @@
+<?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="Regularscreen.svg"
+ inkscape:export-filename="/home/norbert/Development/QMapShack/QMapShack_shortcut/src/icons/32x32/Regularscreen.png"
+ inkscape:export-xdpi="45"
+ inkscape:export-ydpi="45">
+ <defs
+ id="defs3515">
+ <marker
+ inkscape:stockid="Arrow1Mstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mstart"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4038"
+ 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="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mend"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4041"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.9200534"
+ inkscape:cx="21.901404"
+ inkscape:cy="34.045021"
+ 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">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3092" />
+ </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></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:#000080;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4224"
+ width="55.714741"
+ height="55.843304"
+ x="4.5140672"
+ y="3.6426322"
+ ry="0.55381829" />
+ <g
+ id="g4157"
+ transform="matrix(-1,0,0,-1,35.062515,33.443127)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3358"
+ d="m 9.9746251,24.360854 0,-15.241799 15.0839479,0"
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4.1458993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4155"
+ d="M 10,9 25,24"
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ id="g4167"
+ transform="translate(29.924041,29.797778)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4169"
+ d="m 9.9746251,24.360854 0,-15.241799 15.0839479,0"
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4.1458993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4171"
+ d="M 10,9 25,24"
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ id="g4186"
+ transform="matrix(0,-1,1,0,30.607473,34.126558)">
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4.1458993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 9.9746251,24.360854 0,-15.241799 15.0839479,0"
+ id="path4188"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 10,9 25,24"
+ id="path4190"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="matrix(0,1,-1,0,34.379084,28.988084)"
+ id="g4198">
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4.1458993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 9.9746251,24.360854 0,-15.241799 15.0839479,0"
+ id="path4200"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 10,9 25,24"
+ id="path4202"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/Template.svg b/src/icons/Template.svg
new file mode 100644
index 0000000..1cc63fe
--- /dev/null
+++ b/src/icons/Template.svg
@@ -0,0 +1,104 @@
+<?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="svg2985"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="Template.svg">
+ <defs
+ id="defs2987" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11"
+ inkscape:cx="26.074897"
+ inkscape:cy="29.596654"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="989"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ gridtolerance="10">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3019"
+ units="mm"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <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:#ffffff;fill-opacity:1;stroke:#000080;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect4139"
+ width="55"
+ height="55"
+ x="5"
+ y="4" />
+ <rect
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000080;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect4141"
+ width="11"
+ height="11"
+ x="10"
+ y="9" />
+ <rect
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000080;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect4141-3"
+ width="11"
+ height="11"
+ x="10"
+ y="24" />
+ <rect
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000080;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect4160"
+ width="45"
+ height="15"
+ x="10"
+ y="39" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+ d="m 25,14 30,0"
+ id="path4162"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000080;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+ d="m 25,29 30,0"
+ id="path4164"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/src/icons/waypoints/32x32/1stCategory.png b/src/icons/waypoints/32x32/1stCategory.png
index 2f6b974..d2e4962 100644
Binary files a/src/icons/waypoints/32x32/1stCategory.png and b/src/icons/waypoints/32x32/1stCategory.png differ
diff --git a/src/icons/waypoints/32x32/2ndCategory.png b/src/icons/waypoints/32x32/2ndCategory.png
index 9330ebc..a66cad7 100644
Binary files a/src/icons/waypoints/32x32/2ndCategory.png and b/src/icons/waypoints/32x32/2ndCategory.png differ
diff --git a/src/icons/waypoints/32x32/3rdCategory.png b/src/icons/waypoints/32x32/3rdCategory.png
index 5e91fb3..59bed28 100644
Binary files a/src/icons/waypoints/32x32/3rdCategory.png and b/src/icons/waypoints/32x32/3rdCategory.png differ
diff --git a/src/icons/waypoints/32x32/4thCategory.png b/src/icons/waypoints/32x32/4thCategory.png
index 125253c..9cc620f 100644
Binary files a/src/icons/waypoints/32x32/4thCategory.png and b/src/icons/waypoints/32x32/4thCategory.png differ
diff --git a/src/icons/waypoints/32x32/BoxBlue.png b/src/icons/waypoints/32x32/BoxBlue.png
index 624c62b..a77ff34 100644
Binary files a/src/icons/waypoints/32x32/BoxBlue.png and b/src/icons/waypoints/32x32/BoxBlue.png differ
diff --git a/src/icons/waypoints/32x32/BoxGreen.png b/src/icons/waypoints/32x32/BoxGreen.png
index 7c6b80c..4aebd34 100644
Binary files a/src/icons/waypoints/32x32/BoxGreen.png and b/src/icons/waypoints/32x32/BoxGreen.png differ
diff --git a/src/icons/waypoints/32x32/BoxRed.png b/src/icons/waypoints/32x32/BoxRed.png
index 1d4d6cc..65e93a0 100644
Binary files a/src/icons/waypoints/32x32/BoxRed.png and b/src/icons/waypoints/32x32/BoxRed.png differ
diff --git a/src/icons/waypoints/32x32/CityCapitol.png b/src/icons/waypoints/32x32/CityCapitol.png
index 448941e..d142310 100644
Binary files a/src/icons/waypoints/32x32/CityCapitol.png and b/src/icons/waypoints/32x32/CityCapitol.png differ
diff --git a/src/icons/waypoints/32x32/CityLarge.png b/src/icons/waypoints/32x32/CityLarge.png
index a292f91..2f40c77 100644
Binary files a/src/icons/waypoints/32x32/CityLarge.png and b/src/icons/waypoints/32x32/CityLarge.png differ
diff --git a/src/icons/waypoints/32x32/CityMedium.png b/src/icons/waypoints/32x32/CityMedium.png
index c1e64b4..3fac0b0 100644
Binary files a/src/icons/waypoints/32x32/CityMedium.png and b/src/icons/waypoints/32x32/CityMedium.png differ
diff --git a/src/icons/waypoints/32x32/CitySmall.png b/src/icons/waypoints/32x32/CitySmall.png
index 65893fd..8f59120 100644
Binary files a/src/icons/waypoints/32x32/CitySmall.png and b/src/icons/waypoints/32x32/CitySmall.png differ
diff --git a/src/icons/waypoints/32x32/Danger.png b/src/icons/waypoints/32x32/Danger.png
index 1355239..ed5c0ff 100644
Binary files a/src/icons/waypoints/32x32/Danger.png and b/src/icons/waypoints/32x32/Danger.png differ
diff --git a/src/icons/waypoints/32x32/Default.png b/src/icons/waypoints/32x32/Default.png
index d5bb175..d98ba62 100644
Binary files a/src/icons/waypoints/32x32/Default.png and b/src/icons/waypoints/32x32/Default.png differ
diff --git a/src/icons/waypoints/32x32/DiamondBlue.png b/src/icons/waypoints/32x32/DiamondBlue.png
index ede3cd8..00fdefd 100644
Binary files a/src/icons/waypoints/32x32/DiamondBlue.png and b/src/icons/waypoints/32x32/DiamondBlue.png differ
diff --git a/src/icons/waypoints/32x32/DiamondGreen.png b/src/icons/waypoints/32x32/DiamondGreen.png
index 55f8c12..d43d795 100644
Binary files a/src/icons/waypoints/32x32/DiamondGreen.png and b/src/icons/waypoints/32x32/DiamondGreen.png differ
diff --git a/src/icons/waypoints/32x32/DiamondRed.png b/src/icons/waypoints/32x32/DiamondRed.png
index 8ad8042..7689158 100644
Binary files a/src/icons/waypoints/32x32/DiamondRed.png and b/src/icons/waypoints/32x32/DiamondRed.png differ
diff --git a/src/icons/waypoints/32x32/End.png b/src/icons/waypoints/32x32/End.png
new file mode 100644
index 0000000..1ebf318
Binary files /dev/null and b/src/icons/waypoints/32x32/End.png differ
diff --git a/src/icons/waypoints/32x32/FirstAid.png b/src/icons/waypoints/32x32/FirstAid.png
index 0732650..a901321 100644
Binary files a/src/icons/waypoints/32x32/FirstAid.png and b/src/icons/waypoints/32x32/FirstAid.png differ
diff --git a/src/icons/waypoints/32x32/FlagBlue.png b/src/icons/waypoints/32x32/FlagBlue.png
index 47c39ce..b5678e7 100644
Binary files a/src/icons/waypoints/32x32/FlagBlue.png and b/src/icons/waypoints/32x32/FlagBlue.png differ
diff --git a/src/icons/waypoints/32x32/FlagGreen.png b/src/icons/waypoints/32x32/FlagGreen.png
index d247f37..81ba20d 100644
Binary files a/src/icons/waypoints/32x32/FlagGreen.png and b/src/icons/waypoints/32x32/FlagGreen.png differ
diff --git a/src/icons/waypoints/32x32/FlagRed.png b/src/icons/waypoints/32x32/FlagRed.png
index f27386c..3dd2bc3 100644
Binary files a/src/icons/waypoints/32x32/FlagRed.png and b/src/icons/waypoints/32x32/FlagRed.png differ
diff --git a/src/icons/waypoints/32x32/Food.png b/src/icons/waypoints/32x32/Food.png
index b9a64c4..7aa1499 100644
Binary files a/src/icons/waypoints/32x32/Food.png and b/src/icons/waypoints/32x32/Food.png differ
diff --git a/src/icons/waypoints/32x32/Generic.png b/src/icons/waypoints/32x32/Generic.png
index b11dae6..e077f49 100644
Binary files a/src/icons/waypoints/32x32/Generic.png and b/src/icons/waypoints/32x32/Generic.png differ
diff --git a/src/icons/waypoints/32x32/HorsCategory.png b/src/icons/waypoints/32x32/HorsCategory.png
index 92d0bf7..92355df 100644
Binary files a/src/icons/waypoints/32x32/HorsCategory.png and b/src/icons/waypoints/32x32/HorsCategory.png differ
diff --git a/src/icons/waypoints/32x32/Left.png b/src/icons/waypoints/32x32/Left.png
index d5d51af..b610a3d 100644
Binary files a/src/icons/waypoints/32x32/Left.png and b/src/icons/waypoints/32x32/Left.png differ
diff --git a/src/icons/waypoints/32x32/LeftFork.png b/src/icons/waypoints/32x32/LeftFork.png
new file mode 100644
index 0000000..18dcff5
Binary files /dev/null and b/src/icons/waypoints/32x32/LeftFork.png differ
diff --git a/src/icons/waypoints/32x32/MiddleFork.png b/src/icons/waypoints/32x32/MiddleFork.png
new file mode 100644
index 0000000..89b36a0
Binary files /dev/null and b/src/icons/waypoints/32x32/MiddleFork.png differ
diff --git a/src/icons/waypoints/32x32/PinBlue.png b/src/icons/waypoints/32x32/PinBlue.png
index d760bb2..d533ce8 100644
Binary files a/src/icons/waypoints/32x32/PinBlue.png and b/src/icons/waypoints/32x32/PinBlue.png differ
diff --git a/src/icons/waypoints/32x32/PinGreen.png b/src/icons/waypoints/32x32/PinGreen.png
index 90cc8d8..1ad64d5 100644
Binary files a/src/icons/waypoints/32x32/PinGreen.png and b/src/icons/waypoints/32x32/PinGreen.png differ
diff --git a/src/icons/waypoints/32x32/PinRed.png b/src/icons/waypoints/32x32/PinRed.png
index 39d16e4..3146445 100644
Binary files a/src/icons/waypoints/32x32/PinRed.png and b/src/icons/waypoints/32x32/PinRed.png differ
diff --git a/src/icons/waypoints/32x32/Residence.png b/src/icons/waypoints/32x32/Residence.png
index 3f554d3..294ae3c 100644
Binary files a/src/icons/waypoints/32x32/Residence.png and b/src/icons/waypoints/32x32/Residence.png differ
diff --git a/src/icons/waypoints/32x32/Right.png b/src/icons/waypoints/32x32/Right.png
index f66062a..bbe9eeb 100644
Binary files a/src/icons/waypoints/32x32/Right.png and b/src/icons/waypoints/32x32/Right.png differ
diff --git a/src/icons/waypoints/32x32/RightFork.png b/src/icons/waypoints/32x32/RightFork.png
new file mode 100644
index 0000000..ea93ef3
Binary files /dev/null and b/src/icons/waypoints/32x32/RightFork.png differ
diff --git a/src/icons/waypoints/32x32/SharpLeft.png b/src/icons/waypoints/32x32/SharpLeft.png
new file mode 100644
index 0000000..e58c4c8
Binary files /dev/null and b/src/icons/waypoints/32x32/SharpLeft.png differ
diff --git a/src/icons/waypoints/32x32/SharpRight.png b/src/icons/waypoints/32x32/SharpRight.png
new file mode 100644
index 0000000..374d271
Binary files /dev/null and b/src/icons/waypoints/32x32/SharpRight.png differ
diff --git a/src/icons/waypoints/32x32/SlightLeft.png b/src/icons/waypoints/32x32/SlightLeft.png
new file mode 100644
index 0000000..7423b0b
Binary files /dev/null and b/src/icons/waypoints/32x32/SlightLeft.png differ
diff --git a/src/icons/waypoints/32x32/SlightRight.png b/src/icons/waypoints/32x32/SlightRight.png
new file mode 100644
index 0000000..c9e598f
Binary files /dev/null and b/src/icons/waypoints/32x32/SlightRight.png differ
diff --git a/src/icons/waypoints/32x32/Sprint.png b/src/icons/waypoints/32x32/Sprint.png
index f15179a..e76f759 100644
Binary files a/src/icons/waypoints/32x32/Sprint.png and b/src/icons/waypoints/32x32/Sprint.png differ
diff --git a/src/icons/waypoints/32x32/Start.png b/src/icons/waypoints/32x32/Start.png
new file mode 100644
index 0000000..db52174
Binary files /dev/null and b/src/icons/waypoints/32x32/Start.png differ
diff --git a/src/icons/waypoints/32x32/Straight.png b/src/icons/waypoints/32x32/Straight.png
index 56fc47a..1a07356 100644
Binary files a/src/icons/waypoints/32x32/Straight.png and b/src/icons/waypoints/32x32/Straight.png differ
diff --git a/src/icons/waypoints/32x32/Summit.png b/src/icons/waypoints/32x32/Summit.png
index e9707b7..bb5e10d 100644
Binary files a/src/icons/waypoints/32x32/Summit.png and b/src/icons/waypoints/32x32/Summit.png differ
diff --git a/src/icons/waypoints/32x32/UTurn.png b/src/icons/waypoints/32x32/UTurn.png
new file mode 100644
index 0000000..a5cbd70
Binary files /dev/null and b/src/icons/waypoints/32x32/UTurn.png differ
diff --git a/src/icons/waypoints/32x32/Valley.png b/src/icons/waypoints/32x32/Valley.png
index e824f03..9135a9a 100644
Binary files a/src/icons/waypoints/32x32/Valley.png and b/src/icons/waypoints/32x32/Valley.png differ
diff --git a/src/icons/waypoints/32x32/Water.png b/src/icons/waypoints/32x32/Water.png
index 615e49e..f04d29a 100644
Binary files a/src/icons/waypoints/32x32/Water.png and b/src/icons/waypoints/32x32/Water.png differ
diff --git a/src/icons/waypoints/32x32/Waypoint.png b/src/icons/waypoints/32x32/Waypoint.png
index dfed9aa..f41bc3c 100644
Binary files a/src/icons/waypoints/32x32/Waypoint.png and b/src/icons/waypoints/32x32/Waypoint.png differ
diff --git a/src/icons/waypoints/End.svg b/src/icons/waypoints/End.svg
new file mode 100644
index 0000000..7653e5e
--- /dev/null
+++ b/src/icons/waypoints/End.svg
@@ -0,0 +1,101 @@
+<?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="95.780891"
+ height="95.337105"
+ viewBox="0 0 27.031496 26.906251"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="End.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#cac8c4"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4.973029"
+ inkscape:cx="57.230301"
+ inkscape:cy="51.968073"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="0.77504622px"
+ originy="-256.63005px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <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(-14.249877,-12.28125)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="21.840176"
+ height="21.708317"
+ x="16.841925"
+ y="14.894976" />
+ <g
+ id="g4167"
+ transform="translate(0.09426598,-0.53155228)">
+ <path
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-9"
+ d="m 34.28233,36.426405 -6.614583,-7.9375 -6.614584,7.9375"
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:open="true"
+ d="m 24.140043,19.642377 a 3.5277779,3.5277779 0 0 1 3.534482,-3.518367 3.5277779,3.5277779 0 0 1 3.521059,3.5318 3.5277779,3.5277779 0 0 1 -3.529117,3.523749 3.5277779,3.5277779 0 0 1 -3.526436,-3.526432"
+ sodipodi:end="3.141211"
+ sodipodi:start="3.1442583"
+ sodipodi:ry="3.5277779"
+ sodipodi:rx="3.5277779"
+ sodipodi:cy="19.651781"
+ sodipodi:cx="27.667809"
+ sodipodi:type="arc"
+ id="path4140"
+ style="opacity:1;fill:#000080;fill-opacity:1;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/LeftFork.svg b/src/icons/waypoints/LeftFork.svg
new file mode 100644
index 0000000..38b3271
--- /dev/null
+++ b/src/icons/waypoints/LeftFork.svg
@@ -0,0 +1,107 @@
+<?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="95.780045"
+ height="95.347755"
+ viewBox="0 0 27.031258 26.909256"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="LeftFork.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#504a52"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="51.534694"
+ inkscape:cy="22.589572"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="-33.204752px"
+ originy="-247.77444px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <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(-34.281241,-5.2782433)">
+ <g
+ id="g3384">
+ <rect
+ y="7.8784599"
+ x="36.886787"
+ height="21.708315"
+ width="21.840176"
+ id="rect2995"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <g
+ transform="translate(0,0.49218683)"
+ id="g3359">
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 43.64195,24.855014 -7.9375,-6.614583 7.9375,-6.614584"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <g
+ id="g3355">
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7"
+ d="m 59.516953,18.240432 -18.520836,-3e-6"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7-3"
+ d="m 50.256536,8.9800121 -3e-6,18.5208369"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/MiddleFork.svg b/src/icons/waypoints/MiddleFork.svg
new file mode 100644
index 0000000..233d1ae
--- /dev/null
+++ b/src/icons/waypoints/MiddleFork.svg
@@ -0,0 +1,108 @@
+<?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="95.780045"
+ height="95.347755"
+ viewBox="0 0 27.031258 26.909256"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="MiddleFork.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#504a52"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="51.534694"
+ inkscape:cy="22.589572"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="-33.204752px"
+ originy="-247.77444px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <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(-34.281241,-5.2782433)">
+ <g
+ id="g3436">
+ <rect
+ transform="scale(-1,1)"
+ y="7.8784599"
+ x="-58.726963"
+ height="21.708315"
+ width="21.840176"
+ id="rect2995"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="matrix(0,1,1,0,29.762618,-28.878084)"
+ id="g3359">
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 43.64195,24.855014 -7.9375,-6.614583 7.9375,-6.614584"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <g
+ id="g3355">
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7"
+ d="m 59.516953,18.240432 -18.520836,-3e-6"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7-3"
+ d="m 50.256536,8.9800121 -3e-6,18.5208369"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/RightFork.svg b/src/icons/waypoints/RightFork.svg
new file mode 100644
index 0000000..b5517b3
--- /dev/null
+++ b/src/icons/waypoints/RightFork.svg
@@ -0,0 +1,108 @@
+<?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="95.780045"
+ height="95.347755"
+ viewBox="0 0 27.031258 26.909256"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="RightFork.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#504a52"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="51.534694"
+ inkscape:cy="22.589572"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="-33.204752px"
+ originy="-247.77444px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <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(-34.281241,-5.2782433)">
+ <g
+ id="g3384"
+ transform="matrix(-1,0,0,1,95.61375,0)">
+ <rect
+ y="7.8784599"
+ x="36.886787"
+ height="21.708315"
+ width="21.840176"
+ id="rect2995"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="translate(0,0.49218683)"
+ id="g3359">
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 43.64195,24.855014 -7.9375,-6.614583 7.9375,-6.614584"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <g
+ id="g3355">
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7"
+ d="m 59.516953,18.240432 -18.520836,-3e-6"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7-3"
+ d="m 50.256536,8.9800121 -3e-6,18.5208369"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/SharpLeft.svg b/src/icons/waypoints/SharpLeft.svg
new file mode 100644
index 0000000..9dc027a
--- /dev/null
+++ b/src/icons/waypoints/SharpLeft.svg
@@ -0,0 +1,110 @@
+<?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="95.780045"
+ height="95.347755"
+ viewBox="0 0 27.031258 26.909256"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="SharpLeft.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#504a52"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="-6.7625316"
+ inkscape:cy="22.589572"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="-33.204752px"
+ originy="-247.77444px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <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(-34.281241,-5.2782433)">
+ <g
+ id="g3485"
+ transform="matrix(1,0,0,-1,0,37.465235)">
+ <rect
+ transform="scale(-1,1)"
+ y="7.8784599"
+ x="-58.726963"
+ height="21.708315"
+ width="21.840176"
+ id="rect2995"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="translate(0.53316472,-0.00714895)"
+ id="g3479">
+ <g
+ id="g3475"
+ transform="matrix(0.8660254,-0.5,0.5,0.8660254,-2.9386944,26.512177)">
+ <path
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2"
+ d="m 54.617632,14.763866 -6.614583,-7.9375 -6.614584,7.9375"
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7"
+ d="m 48.00305,30.638869 -3e-6,-18.520836"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 54.263129,29.03372 -3e-6,-18.520837"
+ id="path3789-1-2-7-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/SharpRight.svg b/src/icons/waypoints/SharpRight.svg
new file mode 100644
index 0000000..42625e0
--- /dev/null
+++ b/src/icons/waypoints/SharpRight.svg
@@ -0,0 +1,110 @@
+<?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="95.780045"
+ height="95.347755"
+ viewBox="0 0 27.031258 26.909256"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="SharpRight.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#504a52"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="-6.7625316"
+ inkscape:cy="22.589572"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="-33.204752px"
+ originy="-247.77444px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <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(-34.281241,-5.2782433)">
+ <g
+ id="g3485"
+ transform="matrix(-1,0,0,-1,95.61375,37.465235)">
+ <rect
+ transform="scale(-1,1)"
+ y="7.8784599"
+ x="-58.726963"
+ height="21.708315"
+ width="21.840176"
+ id="rect2995"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="translate(0.53316472,-0.00714895)"
+ id="g3479">
+ <g
+ id="g3475"
+ transform="matrix(0.8660254,-0.5,0.5,0.8660254,-2.9386944,26.512177)">
+ <path
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2"
+ d="m 54.617632,14.763866 -6.614583,-7.9375 -6.614584,7.9375"
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7"
+ d="m 48.00305,30.638869 -3e-6,-18.520836"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 54.263129,29.03372 -3e-6,-18.520837"
+ id="path3789-1-2-7-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/SlightLeft.svg b/src/icons/waypoints/SlightLeft.svg
new file mode 100644
index 0000000..f96c411
--- /dev/null
+++ b/src/icons/waypoints/SlightLeft.svg
@@ -0,0 +1,109 @@
+<?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="95.780045"
+ height="95.347755"
+ viewBox="0 0 27.031258 26.909256"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="SlightLeft.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#504a52"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="43.287769"
+ inkscape:cy="22.589572"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="-33.204752px"
+ originy="-247.77444px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <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(-34.281241,-5.2782433)">
+ <g
+ id="g3485">
+ <rect
+ transform="scale(-1,1)"
+ y="7.8784599"
+ x="-58.726963"
+ height="21.708315"
+ width="21.840176"
+ id="rect2995"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="translate(0.53316472,-0.00714895)"
+ id="g3479">
+ <g
+ id="g3475"
+ transform="matrix(0.8660254,-0.5,0.5,0.8660254,-2.9386944,26.512177)">
+ <path
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2"
+ d="m 54.617632,14.763866 -6.614583,-7.9375 -6.614584,7.9375"
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7"
+ d="m 48.00305,30.638869 -3e-6,-18.520836"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 54.263129,29.03372 -3e-6,-18.520837"
+ id="path3789-1-2-7-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/SlightRight.svg b/src/icons/waypoints/SlightRight.svg
new file mode 100644
index 0000000..8412fed
--- /dev/null
+++ b/src/icons/waypoints/SlightRight.svg
@@ -0,0 +1,110 @@
+<?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="95.780045"
+ height="95.347755"
+ viewBox="0 0 27.031258 26.909256"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="SlightRight.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#504a52"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="43.287769"
+ inkscape:cy="22.589572"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="-33.204752px"
+ originy="-247.77444px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <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(-34.281241,-5.2782433)">
+ <g
+ id="g3485"
+ transform="matrix(-1,0,0,1,95.61375,0)">
+ <rect
+ transform="scale(-1,1)"
+ y="7.8784599"
+ x="-58.726963"
+ height="21.708315"
+ width="21.840176"
+ id="rect2995"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="translate(0.53316472,-0.00714895)"
+ id="g3479">
+ <g
+ id="g3475"
+ transform="matrix(0.8660254,-0.5,0.5,0.8660254,-2.9386944,26.512177)">
+ <path
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2"
+ d="m 54.617632,14.763866 -6.614583,-7.9375 -6.614584,7.9375"
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7"
+ d="m 48.00305,30.638869 -3e-6,-18.520836"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 54.263129,29.03372 -3e-6,-18.520837"
+ id="path3789-1-2-7-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/Start.svg b/src/icons/waypoints/Start.svg
new file mode 100644
index 0000000..ef20a64
--- /dev/null
+++ b/src/icons/waypoints/Start.svg
@@ -0,0 +1,101 @@
+<?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="95.780891"
+ height="95.337105"
+ viewBox="0 0 27.031496 26.906251"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="Start.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#cac8c4"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4.973029"
+ inkscape:cx="57.230301"
+ inkscape:cy="51.968073"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="0.77504622px"
+ originy="-256.63005px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <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(-14.249877,-12.28125)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2995"
+ width="21.840176"
+ height="21.708317"
+ x="16.841925"
+ y="14.894976" />
+ <g
+ id="g4142"
+ transform="translate(0,2.5051979)">
+ <path
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-9"
+ d="m 34.395831,21.833335 -6.614583,-7.9375 -6.614584,7.9375"
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:open="true"
+ d="m 24.253544,29.054799 a 3.5277779,3.5277779 0 0 1 3.534481,-3.518367 3.5277779,3.5277779 0 0 1 3.52106,3.5318 3.5277779,3.5277779 0 0 1 -3.529117,3.523749 3.5277779,3.5277779 0 0 1 -3.526437,-3.526431"
+ sodipodi:end="3.141211"
+ sodipodi:start="3.1442583"
+ sodipodi:ry="3.5277779"
+ sodipodi:rx="3.5277779"
+ sodipodi:cy="29.064203"
+ sodipodi:cx="27.781309"
+ sodipodi:type="arc"
+ id="path4140"
+ style="opacity:1;fill:#000080;fill-opacity:1;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
diff --git a/src/icons/waypoints/UTurn.svg b/src/icons/waypoints/UTurn.svg
new file mode 100644
index 0000000..d1d34e8
--- /dev/null
+++ b/src/icons/waypoints/UTurn.svg
@@ -0,0 +1,118 @@
+<?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="95.780045"
+ height="95.347755"
+ viewBox="0 0 27.031258 26.909256"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="UTurn.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#504a52"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.5164624"
+ inkscape:cx="-8.7531685"
+ inkscape:cy="22.589572"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="993"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5059"
+ originx="-33.204752px"
+ originy="-247.77444px"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <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(-34.281241,-5.2782433)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.19885206;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2995"
+ width="21.840176"
+ height="21.708315"
+ x="36.886787"
+ y="-29.586775"
+ transform="scale(1,-1)" />
+ <g
+ id="g4197"
+ transform="translate(2.8183294,-1.2855568)">
+ <g
+ transform="matrix(0.8660254,0.5,-0.5,0.8660254,11.21687,-21.148576)"
+ id="g3391">
+ <path
+ style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 43.337089,25.48314 9.697147,3.566785 1.759648,-10.181368"
+ id="path3789-1-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ <path
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 45.290618,15.477071 5.097787,8.990135"
+ id="path3789-1-2-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <path
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0"
+ id="path3789-1-2-7-3"
+ d="M 53.979675,15.42106 53.819163,30.490827"
+ style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ d="m 42.707811,14.742466 a 5.6444445,5.6444445 0 0 1 5.726137,-5.2317387 5.6444445,5.6444445 0 0 1 5.543466,5.4249177"
+ sodipodi:open="true"
+ sodipodi:end="6.2444299"
+ sodipodi:start="3.2146278"
+ sodipodi:ry="5.6444445"
+ sodipodi:rx="5.6444445"
+ sodipodi:cy="15.154343"
+ sodipodi:cx="48.337208"
+ sodipodi:type="arc"
+ id="path3395"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
diff --git a/src/locale/qmapshack.ts b/src/locale/qmapshack.ts
index 615cefb..8dfff11 100644
--- a/src/locale/qmapshack.ts
+++ b/src/locale/qmapshack.ts
@@ -22,97 +22,100 @@
<context>
<name>CActivityTrk</name>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="51"/>
<source>Foot</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="59"/>
<source>Bicycle</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="67"/>
<source>Motor Bike</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="75"/>
<source>Car</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="83"/>
<source>Cable Car</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="91"/>
<source>Swim</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="99"/>
<source>Ship</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="115"/>
<source>Ski/Winter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
+ <source>No Activity</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
+ <source>Total</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
<source>Ascent:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="329"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="372"/>
<source>Descent:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="107"/>
<source>Aeronautics</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="307"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+ <source>Public Transport</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
<source>Distance:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="396"/>
<source>Speed Moving:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="351"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="420"/>
<source>Speed Total:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="275"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="362"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="444"/>
<source>Time Moving:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="277"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="468"/>
<source>Time Total:</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="414"/>
- <source>None</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>CCanvas</name>
@@ -267,86 +270,86 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
<source>Failed to load...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <location filename="../gis/db/CDBProject.cpp" line="114"/>
<source>Can't load file "%1" . It will be skipped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
<source>Project already in database...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <location filename="../gis/db/CDBProject.cpp" line="128"/>
<source>The project "%1" has already been imported into the database. It will be skipped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="278"/>
+ <location filename="../gis/db/CDBProject.cpp" line="279"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="284"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Conflict with database...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="285"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Clone && Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="286"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Force Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="287"/>
+ <location filename="../gis/db/CDBProject.cpp" line="288"/>
<source>Take remote</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="569"/>
+ <location filename="../gis/db/CDBProject.cpp" line="572"/>
<source>Missing folder...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="570"/>
+ <location filename="../gis/db/CDBProject.cpp" line="573"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="577"/>
+ <location filename="../gis/db/CDBProject.cpp" line="580"/>
<source>Save ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>There was an unexpected database error:
%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="755"/>
+ <location filename="../gis/db/CDBProject.cpp" line="760"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="756"/>
+ <location filename="../gis/db/CDBProject.cpp" line="761"/>
<source>Save changes?</source>
<translation type="unfinished"></translation>
</message>
@@ -442,7 +445,7 @@ To solve this conflict you can create and save a clone, force your version or dr
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="267"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="774"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>none</source>
<translation type="unfinished"></translation>
</message>
@@ -457,97 +460,97 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="437"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="419"/>
<source><h2>Waypoints</h2></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="444"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="470"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="591"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="709"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="739"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="426"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="452"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="573"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="691"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="721"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="471"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="427"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="574"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="692"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="722"/>
<source>Comment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="463"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
<source><h2>Tracks</h2></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>From Start</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To Next</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="613"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
<source>distance: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="623"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
<source>ascent: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="633"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
<source>descent: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="702"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
<source><h2>Areas</h2></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="732"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
<source><h2>Routes</h2></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Edit name...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Enter new project name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Edit keywords...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Enter keywords.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="915"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="897"/>
<source>Print Diary</source>
<translation type="unfinished"></translation>
</message>
@@ -555,45 +558,35 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CDetailsTrk</name>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
<source>Reduce visible track points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
<source>Change elevation of track points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
<source>Change timestamp of track points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
<source>Miscellaneous</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
<source>Color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>Reset activities...</source>
- <translation type="unfinished"></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>
- </message>
</context>
<context>
<name>CDetailsWpt</name>
@@ -606,7 +599,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CDeviceGarmin</name>
<message>
- <location filename="../device/CDeviceGarmin.cpp" line="265"/>
+ <location filename="../device/CDeviceGarmin.cpp" line="272"/>
<source>Picture%1</source>
<translation type="unfinished"></translation>
</message>
@@ -968,7 +961,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisItemTrk</name>
<message>
- <location filename="../gis/fit/serialization.cpp" line="246"/>
+ <location filename="../gis/fit/serialization.cpp" line="285"/>
<source>FIT file %1 contains no GPS data.</source>
<translation type="unfinished"></translation>
</message>
@@ -1009,252 +1002,252 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="305"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
<source>Length: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="312"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
<source>, %1-, %2-</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="328"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
<source>Time: -, Speed: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
<source>Moving: -, Speed: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="346"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
<source>Start: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="350"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
<source>Start: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="356"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
<source>End: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="360"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
<source>End: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="364"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
<source>Points: %1 (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="368"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
<source>Invalid elevations!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
<source>Invalid timestamps!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="378"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
<source>Invalid positions!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="387"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
<source>Activities: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="495"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
<source>Index: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="499"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
<source>Index: visible %1, total %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="510"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
<source>Ele.: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="513"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
<source> slope: %1%3 (%2%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="518"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
<source> speed: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="546"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
<source>... and %1 tags not displayed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
<source>Distance: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="559"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source>Moving: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
<source>track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
<source>Hide point %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
<source>Hide points %1..%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="582"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
<source> Moving: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
<source>, %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
<source> Time: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="324"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
<source>Time: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="556"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
<source>Ascent: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="557"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
<source>Descent: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="564"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
<source>Ascent: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="570"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
<source> Descent: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
<source>Distance: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Ascent: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Descent: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
<source>Ascent: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
<source> Descent: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
<source>Distance: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
<source>Permanently removed points %1..%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
<source>Show points.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
<source>Changed name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
<source>Changed comment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
<source>Changed description</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
<source>Changed links</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
<source>Changed elevation of point %1 to %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2041"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
<source>Changed activity to '%1' for complete track.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation type="unfinished"></translation>
</message>
@@ -1595,191 +1588,201 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="110"/>
+ <location filename="../gis/CGisListWks.cpp" line="109"/>
<source>Sort by Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="111"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="117"/>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <location filename="../gis/CGisListWks.cpp" line="122"/>
<source>Send to Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Sync. with Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="123"/>
+ <location filename="../gis/CGisListWks.cpp" line="126"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
+ <location filename="../gis/CGisListWks.cpp" line="135"/>
<source>Update Project on Device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="134"/>
- <location filename="../gis/CGisListWks.cpp" line="157"/>
+ <location filename="../gis/CGisListWks.cpp" line="137"/>
+ <location filename="../gis/CGisListWks.cpp" line="161"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="146"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Edit...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/CGisListWks.cpp" line="102"/>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="150"/>
<source>Copy to...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <source>Autom. Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="118"/>
<source>Save as...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Track Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Select Range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Edit Track Points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="156"/>
<source>Reverse Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="154"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Combine Tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="159"/>
<source>Copy Track with Waypoints</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="167"/>
<source>Show Bubble</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="165"/>
+ <location filename="../gis/CGisListWks.cpp" line="169"/>
<source>Move Waypoint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <location filename="../gis/CGisListWks.cpp" line="170"/>
<source>Proj. Waypoint...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Route Instructions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="180"/>
<source>Calculate Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="181"/>
<source>Reset Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="178"/>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Edit Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="179"/>
+ <location filename="../gis/CGisListWks.cpp" line="183"/>
<source>Convert to Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="188"/>
+ <location filename="../gis/CGisListWks.cpp" line="192"/>
<source>Edit Area Points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="195"/>
+ <location filename="../gis/CGisListWks.cpp" line="199"/>
<source>Create Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <location filename="../gis/CGisListWks.cpp" line="200"/>
<source>Change Icon (sel. waypt. only)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="627"/>
+ <location filename="../gis/CGisListWks.cpp" line="158"/>
+ <source>Set Track Activity</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="634"/>
<source>Drop items...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="652"/>
- <location filename="../gis/CGisListWks.cpp" line="1646"/>
- <location filename="../gis/CGisListWks.cpp" line="1684"/>
+ <location filename="../gis/CGisListWks.cpp" line="659"/>
+ <location filename="../gis/CGisListWks.cpp" line="1691"/>
+ <location filename="../gis/CGisListWks.cpp" line="1729"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="778"/>
+ <location filename="../gis/CGisListWks.cpp" line="785"/>
<source>Saving workspace. Please wait.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="824"/>
+ <location filename="../gis/CGisListWks.cpp" line="831"/>
<source>Loading workspace. Please wait.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>Close all projects...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>This will remove all projects from the workspace.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Delete project...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Do you really want to delete %1?</source>
<translation type="unfinished"></translation>
</message>
@@ -1797,22 +1800,22 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="554"/>
+ <location filename="../gis/CGisWidget.cpp" line="559"/>
<source>Copy items...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="573"/>
+ <location filename="../gis/CGisWidget.cpp" line="578"/>
<source>Change waypoint symbols.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Cut Track...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Do you want to delete the original track?</source>
<translation type="unfinished"></translation>
</message>
@@ -1968,7 +1971,7 @@ line %2, column %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
<source>Speed</source>
<translation type="unfinished"></translation>
</message>
@@ -1994,37 +1997,42 @@ line %2, column %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+ <source>Energy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
<source>Sea Level Pressure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
<source>Speed (vertical)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
<source>Slope*</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
<source>Speed*</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
<source>Elevation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
<source>Progress</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
<source>Terrain slope</source>
<translation type="unfinished"></translation>
</message>
@@ -2040,53 +2048,53 @@ line %2, column %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="769"/>
+ <location filename="../CMainWindow.cpp" line="813"/>
<source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="897"/>
+ <location filename="../CMainWindow.cpp" line="941"/>
<source>Ele: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="909"/>
+ <location filename="../CMainWindow.cpp" line="953"/>
<source>Slope: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="925"/>
+ <location filename="../CMainWindow.cpp" line="969"/>
<source>[Grid: %1]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1066"/>
+ <location filename="../CMainWindow.cpp" line="1110"/>
<source>Load GIS Data...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
<source>Select output file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>QMapShack View (*.view)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>Select file to load</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1369"/>
+ <location filename="../CMainWindow.cpp" line="1481"/>
<source>Fatal...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1370"/>
+ <location filename="../CMainWindow.cpp" line="1482"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation type="unfinished"></translation>
</message>
@@ -2846,46 +2854,35 @@ Fall back to internal types.</source>
<context>
<name>CMapTMS</name>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
- <location filename="../map/CMapTMS.cpp" line="77"/>
- <location filename="../map/CMapTMS.cpp" line="136"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Error...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
<source>Failed to open %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="77"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="115"/>
+ <location filename="../map/CMapTMS.cpp" line="116"/>
<source>Layer %1</source>
<translation type="unfinished"></translation>
</message>
- <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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../map/CMapTMS.cpp" line="299"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>CMapVRT</name>
<message>
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation type="unfinished"></translation>
@@ -2897,7 +2894,7 @@ line %2, column %3:
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<source>File must be 8 bit palette or gray indexed.</source>
<translation type="unfinished"></translation>
</message>
@@ -2915,17 +2912,17 @@ line %2, column %3:
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="63"/>
<source>Select files...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="87"/>
<source>Select target file...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="150"/>
<source>!!! done !!!
</source>
<translation type="unfinished"></translation>
@@ -2938,8 +2935,7 @@ line %2, column %3:
<location filename="../map/CMapWMTS.cpp" line="53"/>
<location filename="../map/CMapWMTS.cpp" line="63"/>
<location filename="../map/CMapWMTS.cpp" line="72"/>
- <location filename="../map/CMapWMTS.cpp" line="157"/>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>Error...</source>
<translation type="unfinished"></translation>
</message>
@@ -2967,20 +2963,10 @@ Unknown structure.</source>
<translation type="unfinished"></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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>No georeference information found.</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="413"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>CMouseEditArea</name>
@@ -2996,7 +2982,7 @@ Unknown structure.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <location filename="../mouse/CMouseEditArea.cpp" line="94"/>
<source>area</source>
<translation type="unfinished"></translation>
</message>
@@ -3015,7 +3001,7 @@ Unknown structure.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <location filename="../mouse/CMouseEditRte.cpp" line="105"/>
<source>route</source>
<translation type="unfinished"></translation>
</message>
@@ -3044,7 +3030,7 @@ Unknown structure.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="110"/>
<source>track</source>
<translation type="unfinished"></translation>
</message>
@@ -3116,27 +3102,27 @@ Unknown structure.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="99"/>
<source><b>Selected:</b><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="106"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="107"/>
<source>%1 waypoints<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="101"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="102"/>
<source>%1 tracks<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="111"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="112"/>
<source>%1 routes<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="116"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="117"/>
<source>%1 areas<br/></source>
<translation type="unfinished"></translation>
</message>
@@ -3220,12 +3206,12 @@ y: %4 m/px</source>
<context>
<name>CProgressDialog</name>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="40"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="46"/>
<source>Elapsed time: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="87"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="132"/>
<source>Elapsed time: %1 seconds.</source>
<translation type="unfinished"></translation>
</message>
@@ -4598,14 +4584,47 @@ line %2, column %3:
</message>
</context>
<context>
+ <name>CTemplateWidget</name>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
+ <source>choose one...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
+ <source>Hiking Tour Summary (built-in)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
+ <source>-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
+ <source>Template path...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
+ <source>Failed to read template file %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
+ <source>Preview...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="71"/>
<source>&Color...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="117"/>
<source>Reset format</source>
<translation type="unfinished"></translation>
</message>
@@ -4672,6 +4691,194 @@ line %2, column %3:
</message>
</context>
<context>
+ <name>Form</name>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
+ <source>Form</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
+ <source>Participants</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
+ <source>Weather</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
+ <source>rain</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
+ <source>sunny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
+ <source>snow</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
+ <source>clouds</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
+ <source>windy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
+ <source>hot</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
+ <source>warm</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
+ <source>cold</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
+ <source>freezing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
+ <source>foggy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
+ <source>humid</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
+ <source>Character</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
+ <source>easy hiking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
+ <source>climbing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
+ <source>alpine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
+ <source>large ascend</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
+ <source>long distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
+ <source>via ferrata</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
+ <source>hail/soft hail</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
+ <source>Rating</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
+ <source>Rating 5 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
+ <source>Rating 4 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
+ <source>Rating 3 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
+ <source>Rating 2 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
+ <source>Rating 1 star</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
+ <source>aborted</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
+ <source>Equipment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
+ <source>ferrata gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
+ <source>night gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
+ <source>snow shoes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
+ <source>climbing gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
+ <source>ski</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
+ <source>camping gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IAbout</name>
<message>
<location filename="../IAbout.ui" line="14"/>
@@ -4859,7 +5066,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="66"/>
- <source>Square (optimized for TMS and WTMS tiles)</source>
+ <source>Square (optimized for TMS and WMTS tiles)</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -5602,72 +5809,67 @@ If you want to keep just one half you can simply remove the points, or check thi
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
- <source>Remove Track Activity</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1400"/>
<source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1427"/>
<source>Points</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ele.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Delta</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Dist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1495"/>
<source>Speed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1500"/>
<source>Slope</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1505"/>
<source>Ascent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1510"/>
<source>Descent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1515"/>
<source>Position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1524"/>
<source>Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1561"/>
<source>Hist.</source>
<translation type="unfinished"></translation>
</message>
@@ -6334,69 +6536,69 @@ It is either a new item or it has been deleted in the database by someone else.<
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source>Save project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="329"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="356"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="366"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="340"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="367"/>
<source>Canceled correlation...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="385"/>
- <location filename="../gis/prj/IGisProject.cpp" line="442"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="412"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="469"/>
<source>Save "%1" to...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="527"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="554"/>
<source><br/>
Filename: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="532"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="559"/>
<source>Waypoints: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="536"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="563"/>
<source>Tracks: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="540"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="567"/>
<source>Routes: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="544"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="571"/>
<source>Areas: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="664"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="691"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="665"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="692"/>
<source>Delete...</source>
<translation type="unfinished"></translation>
</message>
@@ -6604,363 +6806,373 @@ Filename: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="112"/>
+ <location filename="../IMainWindow.ui" line="113"/>
<source>?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="120"/>
+ <location filename="../IMainWindow.ui" line="121"/>
<source>Project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="131"/>
+ <location filename="../IMainWindow.ui" line="132"/>
<source>Tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="156"/>
+ <location filename="../IMainWindow.ui" line="157"/>
<source>Maps</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="199"/>
+ <location filename="../IMainWindow.ui" line="200"/>
<source>Dig. Elev. Model (DEM)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="238"/>
+ <location filename="../IMainWindow.ui" line="239"/>
<source>Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="256"/>
+ <location filename="../IMainWindow.ui" line="257"/>
<source>Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
+ <location filename="../IMainWindow.ui" line="287"/>
<source>Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="301"/>
- <location filename="../IMainWindow.ui" line="304"/>
+ <location filename="../IMainWindow.ui" line="302"/>
+ <location filename="../IMainWindow.ui" line="305"/>
<source>Add Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="308"/>
<source>Ctrl+T</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="322"/>
+ <location filename="../IMainWindow.ui" line="323"/>
<source>Show Scale</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="335"/>
<source>Setup Map Font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="350"/>
<source>Show Grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="353"/>
<source>Ctrl+G</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="364"/>
+ <location filename="../IMainWindow.ui" line="365"/>
<source>Setup Grid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="368"/>
<source>Ctrl+Alt+G</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="383"/>
<source>Flip Mouse Wheel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="394"/>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="395"/>
+ <location filename="../IMainWindow.ui" line="398"/>
<source>Setup Map Paths</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="413"/>
<source>POI Text</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="428"/>
<source>Night / Day</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="443"/>
<source>Map Tool Tip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="445"/>
+ <location filename="../IMainWindow.ui" line="446"/>
<source>Ctrl+I</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="457"/>
+ <location filename="../IMainWindow.ui" line="458"/>
<source>Setup DEM Paths</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="470"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
+ <location filename="../IMainWindow.ui" line="482"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="485"/>
<source>F1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="497"/>
+ <location filename="../IMainWindow.ui" line="500"/>
<source>Setup Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="511"/>
+ <location filename="../IMainWindow.ui" line="512"/>
<source>Load GIS Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="515"/>
<source>Load projects from file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="518"/>
<source>Ctrl+L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="529"/>
+ <location filename="../IMainWindow.ui" line="530"/>
<source>Save All GIS Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="533"/>
<source>Save all projects in the workspace</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="535"/>
+ <location filename="../IMainWindow.ui" line="536"/>
<source>Ctrl+S</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="547"/>
+ <location filename="../IMainWindow.ui" line="548"/>
<source>Setup Time Zone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="560"/>
<source>Add empty project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="575"/>
<source>Search Google</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="587"/>
<source>Close all projects</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="589"/>
+ <location filename="../IMainWindow.ui" line="590"/>
<source>F8</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="602"/>
<source>Setup Units</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="614"/>
<source>Setup Workspace</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="617"/>
<source>Setup save on exit.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="629"/>
<source>Import Database from QLandkarte</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="632"/>
<source>Import QLandkarte GT database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="644"/>
<source>VRT Builder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="647"/>
<source>GUI front end to gdalbuildvrt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="659"/>
<source>Store Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="662"/>
<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="673"/>
+ <location filename="../IMainWindow.ui" line="674"/>
<source>Load Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="677"/>
<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="691"/>
+ <location filename="../IMainWindow.ui" line="692"/>
<source>Ext. Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="695"/>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="707"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="710"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="722"/>
<source>Clone Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="724"/>
+ <location filename="../IMainWindow.ui" line="725"/>
<source>Ctrl+Shift+T</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="737"/>
<source>Create Routino Database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="748"/>
+ <location filename="../IMainWindow.ui" line="749"/>
<source>Save(Print) Map Screenshot</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="752"/>
<source>Print a selected area of the map</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="755"/>
<source>Ctrl+P</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="767"/>
<source>Setup Coord. Format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="769"/>
+ <location filename="../IMainWindow.ui" line="770"/>
<source>Change the format coordinates are displayed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="782"/>
<source>Setup Map Background</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="794"/>
<source>Setup Waypoint Icons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="796"/>
+ <location filename="../IMainWindow.ui" line="797"/>
<source>Setup path to custom icons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="805"/>
+ <location filename="../IMainWindow.ui" line="806"/>
<source>Close Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="808"/>
+ <location filename="../IMainWindow.ui" line="809"/>
<source>Ctrl+W</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="817"/>
+ <location filename="../IMainWindow.ui" line="818"/>
<source>Quickstart Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="826"/>
+ <location filename="../IMainWindow.ui" line="827"/>
<source>Setup Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="838"/>
+ <location filename="../IMainWindow.ui" line="839"/>
<source>Toggle Docks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="841"/>
+ <location filename="../IMainWindow.ui" line="842"/>
<source>Toggle visibility of dockable windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="844"/>
+ <location filename="../IMainWindow.ui" line="845"/>
<source>Ctrl+D</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../IMainWindow.ui" line="854"/>
+ <source>Full Screen</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="857"/>
+ <source>F11</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IMapList</name>
@@ -7017,6 +7229,24 @@ I don't want to read the documentation!</source>
</message>
</context>
<context>
+ <name>IMapOnline</name>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="41"/>
+ <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="47"/>
+ <source>Error...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="98"/>
+ <source><b>%1</b>: %2 tiles pending<br/></source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IMapPathSetup</name>
<message>
<location filename="../map/IMapPathSetup.ui" line="14"/>
@@ -7147,28 +7377,65 @@ I don't want to read the documentation!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="22"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
+ <source>Advanced Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <source>Source No Data (-srcnodata)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="46"/>
+ <source>Target No Data (-vrtnodata)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../tool/IMapVrtBuilder.ui" line="56"/>
+ <source>Target Projection (-a_srs)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="63"/>
+ <source>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
+ <source>1. Select one or multiple source files.
+2. Select a file name for the target VRT file.
+3. Press "Start" button.
+
+Tip:
+* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
+* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
+* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="139"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="156"/>
<source>Select source files:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="79"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="121"/>
<source>Target Filename:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="86"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="128"/>
<source>-</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="95"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="20"/>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
@@ -7947,12 +8214,12 @@ or
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
- <source>Delete a point. (Ctrl+D)</source>
+ <source>Delete a point. (Ctrl+-)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
- <source>Ctrl+D</source>
+ <source>Ctrl+-</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8127,7 +8394,7 @@ or
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
- <source>Select an activity for the selected range.</source>
+ <source>Set an activity for the selected range.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8219,12 +8486,13 @@ or
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
<location filename="../mouse/IScrOptSelect.ui" line="142"/>
- <location filename="../mouse/IScrOptSelect.ui" line="196"/>
- <location filename="../mouse/IScrOptSelect.ui" line="225"/>
- <location filename="../mouse/IScrOptSelect.ui" line="285"/>
- <location filename="../mouse/IScrOptSelect.ui" line="312"/>
- <location filename="../mouse/IScrOptSelect.ui" line="339"/>
- <location filename="../mouse/IScrOptSelect.ui" line="366"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="156"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="210"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="239"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="299"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="326"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="353"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="380"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
@@ -8245,36 +8513,41 @@ or
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="139"/>
+ <source>Set an activity for all selected tracks.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="153"/>
<source>Delete all selected items.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="193"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="207"/>
<source>Select all items that intersect the selected area.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="222"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="236"/>
<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"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="296"/>
<source>Add tracks to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="309"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="323"/>
<source>Add waypoints to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="336"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="350"/>
<source>Add routes to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="363"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="377"/>
<source>Add areas to selection.</source>
<translation type="unfinished"></translation>
</message>
@@ -8302,6 +8575,7 @@ or
<location filename="../gis/trk/IScrOptTrk.ui" line="151"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="170"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="184"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="198"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
@@ -8352,11 +8626,16 @@ or
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
+ <source>Set an activity for the complete track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
<source>Copy track together with all attached waypoints into another project.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="210"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="224"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
@@ -8863,6 +9142,34 @@ or
</message>
</context>
<context>
+ <name>ITemplateWidget</name>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="14"/>
+ <source>Insert Template...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="32"/>
+ <source>Templates</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="42"/>
+ <source>Select a path with your own templates.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="45"/>
+ <source>...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="77"/>
+ <source>Preview</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ITextEditWidget</name>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="14"/>
@@ -8870,264 +9177,279 @@ or
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="25"/>
- <location filename="../widgets/ITextEditWidget.ui" line="331"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="45"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="351"/>
<source>Undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="354"/>
<source>Ctrl+Z</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="38"/>
- <location filename="../widgets/ITextEditWidget.ui" line="343"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="58"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="363"/>
<source>Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="346"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="366"/>
<source>Ctrl+Shift+Z</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="51"/>
- <location filename="../widgets/ITextEditWidget.ui" line="355"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="71"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="375"/>
<source>Cut</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="358"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="378"/>
<source>Ctrl+X</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="64"/>
- <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="84"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="387"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="370"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="390"/>
<source>Ctrl+C</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="77"/>
- <location filename="../widgets/ITextEditWidget.ui" line="375"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="97"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="395"/>
<source>Paste</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="25"/>
+ <source>Templ.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="120"/>
<source>A:L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="133"/>
<source>A:C</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="146"/>
<source>A:R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="159"/>
<source>A:B</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="192"/>
<source>B</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="205"/>
<source>I</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="218"/>
<source>U</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="238"/>
<source>C</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="285"/>
<source>Standard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="290"/>
<source>Bullet List (Disc)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="295"/>
<source>Bullet List (Circle)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="300"/>
<source>Bullet List (Square)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="305"/>
<source>Ordered List (Decimal)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="310"/>
<source>Ordered List (Alpha lower)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="315"/>
<source>Ordered List (Alpha upper)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="320"/>
<source>Ordered List (Roman lower)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="325"/>
<source>Ordered List (Roman upper)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="378"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="398"/>
<source>Ctrl+V</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="390"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="410"/>
<source>Align Left</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="393"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="413"/>
<source>Ctrl+L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="405"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="425"/>
<source>Align Right</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="408"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="428"/>
<source>Ctrl+R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="420"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="440"/>
<source>Align Center</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="423"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="443"/>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="435"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="455"/>
<source>Align Block</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="438"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="458"/>
<source>Ctrl+J</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="450"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="470"/>
<source>Underline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="453"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="473"/>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="465"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="485"/>
<source>Bold</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="468"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="488"/>
<source>Ctrl+B</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="480"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="500"/>
<source>Italic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="483"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="503"/>
<source>Ctrl+I</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="515"/>
<source>Plain</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="518"/>
<source>Reset the text's format before pasting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="503"/>
- <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="523"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="526"/>
<source>Select All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="529"/>
<source>Ctrl+A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="514"/>
- <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="534"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="537"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="522"/>
- <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="542"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="545"/>
<source>Reset Font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="530"/>
- <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="550"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="553"/>
<source>Reset Layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="565"/>
<source>Normal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="568"/>
<source>Paste without resetting the text's format</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="577"/>
+ <source>Insert From Template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="580"/>
+ <source>Create text from template.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ITextEditWidgetSelMenu</name>
@@ -9207,6 +9529,11 @@ or
<source>Setup Toolbar</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
+ <source>Toolbar is visible in Fullscreen-mode</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IToolShell</name>
diff --git a/src/locale/qmapshack_cs.ts b/src/locale/qmapshack_cs.ts
index 68fcef1..b5a193d 100644
--- a/src/locale/qmapshack_cs.ts
+++ b/src/locale/qmapshack_cs.ts
@@ -22,97 +22,100 @@
<context>
<name>CActivityTrk</name>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="51"/>
<source>Foot</source>
<translation>Chodec</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="59"/>
<source>Bicycle</source>
<translation>Jízdní kolo</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="67"/>
<source>Motor Bike</source>
<translation>Motocykl</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="75"/>
<source>Car</source>
<translation>Auto</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="83"/>
<source>Cable Car</source>
<translation>Lanovka</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="91"/>
<source>Swim</source>
<translation>Plavání</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="99"/>
<source>Ship</source>
<translation>Loď</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
+ <source>No Activity</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
+ <source>Total</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
<source>Ascent:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="329"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="372"/>
<source>Descent:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="115"/>
<source>Ski/Winter</source>
<translation>Lyže/Zima</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="107"/>
<source>Aeronautics</source>
<translation>Letectví</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="307"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+ <source>Public Transport</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
<source>Distance:</source>
<translation>Vzdálenost:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="396"/>
<source>Speed Moving:</source>
<translation>Rychlost při pohybu:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="351"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="420"/>
<source>Speed Total:</source>
<translation>Celková rychlost:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="275"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="362"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="444"/>
<source>Time Moving:</source>
<translation>Čas při pohybu:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="277"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="468"/>
<source>Time Total:</source>
<translation>Celkový čas:</translation>
</message>
- <message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="414"/>
- <source>None</source>
- <translation>Žádné</translation>
- </message>
</context>
<context>
<name>CCanvas</name>
@@ -267,27 +270,27 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
<source>Failed to load...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <location filename="../gis/db/CDBProject.cpp" line="114"/>
<source>Can't load file "%1" . It will be skipped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
<source>Project already in database...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <location filename="../gis/db/CDBProject.cpp" line="128"/>
<source>The project "%1" has already been imported into the database. It will be skipped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="278"/>
+ <location filename="../gis/db/CDBProject.cpp" line="279"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -296,47 +299,47 @@ To solve this conflict you can create and save a clone, force your version or dr
K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji verzi, nebo ji zahodit a vzít jednu z databáze</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="284"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Conflict with database...</source>
<translation>Střet s databází...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="285"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Clone && Save</source>
<translation>Klonovat a uložit</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="286"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Force Save</source>
<translation>Vynutit uložení</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="287"/>
+ <location filename="../gis/db/CDBProject.cpp" line="288"/>
<source>Take remote</source>
<translation>Vzít vzdálenou verzi</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="569"/>
+ <location filename="../gis/db/CDBProject.cpp" line="572"/>
<source>Missing folder...</source>
<translation>Chybí složka...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="570"/>
+ <location filename="../gis/db/CDBProject.cpp" line="573"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation>Nepodařilo se uložit projekt. Složka byla v databázi smazána.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="577"/>
+ <location filename="../gis/db/CDBProject.cpp" line="580"/>
<source>Save ...</source>
<translation>Uložit...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>There was an unexpected database error:
%1</source>
@@ -345,12 +348,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
%1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="755"/>
+ <location filename="../gis/db/CDBProject.cpp" line="760"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation>Projekt '%1' se právě bude aktualizovat z databáze. Jsou tu ovšem neuložené změny.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="756"/>
+ <location filename="../gis/db/CDBProject.cpp" line="761"/>
<source>Save changes?</source>
<translation>Uložit změny?</translation>
</message>
@@ -436,7 +439,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<name>CDetailsPrj</name>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="267"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="774"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>none</source>
<translation>žádné</translation>
</message>
@@ -446,65 +449,65 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Sestavit deník...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="437"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="419"/>
<source><h2>Waypoints</h2></source>
<translation><h2>Cestovní body</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="444"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="470"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="591"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="709"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="739"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="426"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="452"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="573"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="691"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="721"/>
<source>Info</source>
<translation>Informace</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="471"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="427"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="574"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="692"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="722"/>
<source>Comment</source>
<translation>Poznámka</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="463"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
<source><h2>Tracks</h2></source>
<translation><h2>Stopy</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>From Start</source>
<translation>Od začátku</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To Next</source>
<translation>K další</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To End</source>
<translation>Na konec</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="613"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
<source>distance: </source>
<translation>Vzdálenost: </translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="623"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
<source>ascent: </source>
<translation>Stoupání: </translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="633"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
<source>descent: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="702"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
<source><h2>Areas</h2></source>
<translation><h2>Oblasti</h2></translation>
</message>
@@ -524,34 +527,34 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation><b>Přehled všech stop v projektu</b><br/></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="732"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
<source><h2>Routes</h2></source>
<translation><h2>Cesty</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Edit name...</source>
<translation>Upravit název...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Enter new project name.</source>
<translation>Zadejte nový název projektu.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Edit keywords...</source>
<translation>Upravit klíčová slova...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Enter keywords.</source>
<translation>Zadejte klíčová slova.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="915"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="897"/>
<source>Print Diary</source>
<translation>Tisk deníku</translation>
</message>
@@ -559,45 +562,35 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<context>
<name>CDetailsTrk</name>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
<source>Reduce visible track points</source>
<translation>Omezit počet viditelných bodů stopy</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
<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="175"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
<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="178"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
<source>Miscellaneous</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
<source>Color</source>
<translation>Barva</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
<source>Activity</source>
<translation>Činnost</translation>
</message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>Reset activities...</source>
- <translation>Nastavit činnosti znovu...</translation>
- </message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>This will remove all activities from the track. Proceed?</source>
- <translation>Tímto budou všechny činnosti odstraněny ze stopy. Pokračovat?</translation>
- </message>
</context>
<context>
<name>CDetailsWpt</name>
@@ -610,7 +603,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<context>
<name>CDeviceGarmin</name>
<message>
- <location filename="../device/CDeviceGarmin.cpp" line="265"/>
+ <location filename="../device/CDeviceGarmin.cpp" line="272"/>
<source>Picture%1</source>
<translation>Obrázek %1</translation>
</message>
@@ -972,7 +965,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<context>
<name>CGisItemTrk</name>
<message>
- <location filename="../gis/fit/serialization.cpp" line="246"/>
+ <location filename="../gis/fit/serialization.cpp" line="285"/>
<source>FIT file %1 contains no GPS data.</source>
<translation>Soubor FIT %1 neobsahuje žádná data GPS.</translation>
</message>
@@ -1013,252 +1006,252 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Změněny body stop. Obětována veškerá předchozí data.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="305"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
<source>Length: %1 %2</source>
<translation>Délka: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="312"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation>, %1%2 %3, %4%5 %6</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="346"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
<source>Start: %1</source>
<translation>Začátek: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="350"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
<source>Start: -</source>
<translation>Začátek: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="356"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
<source>End: %1</source>
<translation>Konec: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="360"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
<source>End: -</source>
<translation>Konec: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="364"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
<source>Points: %1 (%2)</source>
<translation>Body: %1 (%2)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="368"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
<source>Invalid elevations!</source>
<translation>Neplatné výšky!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
<source>Invalid timestamps!</source>
<translation>Neplatná časová razítka!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="378"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
<source>Invalid positions!</source>
<translation>Neplatné polohy!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="387"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
<source>Activities: %1</source>
<translation>Činnosti: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="495"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
<source>Index: %1</source>
<translation>Rejstřík: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="499"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
<source>Index: visible %1, total %2</source>
<translation>Rejstřík: viditelné %1, celkem %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="510"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
<source>Ele.: %1 %2</source>
<translation>Výška: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="513"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
<source> slope: %1%3 (%2%)</source>
<translation> sklon: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="518"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
<source> speed: %1%2</source>
<translation> rychlost: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="546"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
<source>... and %1 tags not displayed</source>
<translation>... a %1 značek nezobrazeno</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
<source>Distance: - (-)</source>
<translation>Vzdálenost: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="559"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source>Moving: - (-)</source>
<translation>Pohyb: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
<source>track</source>
<translation>Stopa</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
<source>Hide point %1.</source>
<translation>Skrýt bod %1.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
<source>Hide points %1..%2.</source>
<translation>Skrýt body %1 %2.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="582"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
<source> Moving: %1%2 (%3%)</source>
<translation> Pohyb: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
<source>, %1%2</source>
<translation>, %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
<source> Time: %1%2</source>
<translation> Čas: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
<source>, %1-, %2-</source>
<translation>, %1-, %2-</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="324"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
<source>Time: %1, Speed: %2 %3</source>
<translation>Čas: %1, Rychlost: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="328"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
<source>Time: -, Speed: -</source>
<translation>Čas: -, Rychlost: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation>Pohyb: %1, Rychlost: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
<source>Moving: -, Speed: -</source>
<translation>Pohyb: -, Rychlost: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="556"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
<source>Ascent: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="557"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
<source>Descent: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="564"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
<source>Ascent: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="570"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
<source> Descent: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
<source>Distance: %1%2 (%3%)</source>
<translation>Vzdálenost: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Ascent: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Descent: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
<source>Ascent: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
<source> Descent: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
<source>Distance: %1%2</source>
<translation>Vzdálenost: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
<source>Permanently removed points %1..%2</source>
<translation>Trvale odstraněné body %1 ... %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
<source>Show points.</source>
<translation>Ukázat body.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
<source>Changed name</source>
<translation>Změněný název</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
<source>Changed comment</source>
<translation>Změněná poznámka</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
<source>Changed description</source>
<translation>Změněný popis</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
<source>Changed links</source>
<translation>Změněné odkazy</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
<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="2041"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
<source>Changed activity to '%1' for complete track.</source>
<translation>Činnost byla pro celou stopu změněna na '%1'.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation>Činnost byla změněna pro oblast (%2...%3) na '%1'.</translation>
</message>
@@ -1584,7 +1577,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="117"/>
<source>Save</source>
<translation>Uložit</translation>
</message>
@@ -1594,110 +1587,120 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Upravit...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="123"/>
+ <location filename="../gis/CGisListWks.cpp" line="126"/>
<source>Close</source>
<translation>Zavřít</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
+ <location filename="../gis/CGisListWks.cpp" line="135"/>
<source>Update Project on Device</source>
<translation>Aktualizovat projekt na zařízení</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="146"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Edit...</source>
<translation>Upravit...</translation>
</message>
<message>
<location filename="../gis/CGisListWks.cpp" line="102"/>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="150"/>
<source>Copy to...</source>
<translation>Kopírovat do...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <source>Autom. Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="118"/>
<source>Save as...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="159"/>
<source>Copy Track with Waypoints</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="167"/>
<source>Show Bubble</source>
<translation>Ukázat bublinu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="165"/>
+ <location filename="../gis/CGisListWks.cpp" line="169"/>
<source>Move Waypoint</source>
<translation>Přesunout cestovní bod</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <location filename="../gis/CGisListWks.cpp" line="170"/>
<source>Proj. Waypoint...</source>
<translation>Promítnutí cestovního bodu...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Route Instructions</source>
<translation>Pokyny pro cestu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="180"/>
<source>Calculate Route</source>
<translation>Spočítat cestu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="181"/>
<source>Reset Route</source>
<translation>Nastavit cestu znovu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="178"/>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Edit Route</source>
<translation>Upravit cestu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="179"/>
+ <location filename="../gis/CGisListWks.cpp" line="183"/>
<source>Convert to Track</source>
<translation>Převést na stopu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="195"/>
+ <location filename="../gis/CGisListWks.cpp" line="199"/>
<source>Create Route</source>
<translation>Vytvořit cestu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <location filename="../gis/CGisListWks.cpp" line="200"/>
<source>Change Icon (sel. waypt. only)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="627"/>
+ <location filename="../gis/CGisListWks.cpp" line="158"/>
+ <source>Set Track Activity</source>
+ <translation type="unfinished">Nastavit činnost stopy</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="634"/>
<source>Drop items...</source>
<translation>Zahodit prvky...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="652"/>
- <location filename="../gis/CGisListWks.cpp" line="1646"/>
- <location filename="../gis/CGisListWks.cpp" line="1684"/>
+ <location filename="../gis/CGisListWks.cpp" line="659"/>
+ <location filename="../gis/CGisListWks.cpp" line="1691"/>
+ <location filename="../gis/CGisListWks.cpp" line="1729"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation><b>Aktualizovat zařízení</b><p>Aktualizovat %1<br/>Počkejte, prosím...</p></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Delete project...</source>
<translation>Smazat projekt...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Do you really want to delete %1?</source>
<translation>Opravdu chcete smazat %1?</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Track Profile</source>
<translation>Profil stopy</translation>
</message>
@@ -1712,78 +1715,78 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Skrýt v mapě</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="110"/>
+ <location filename="../gis/CGisListWks.cpp" line="109"/>
<source>Sort by Time</source>
<translation>Třídit podle času</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="111"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Name</source>
<translation>Třídit podle názvu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <location filename="../gis/CGisListWks.cpp" line="122"/>
<source>Send to Devices</source>
<translation>Poslat do zařízení</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Sync. with Database</source>
<translation>Seřídit s databází</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Select Range</source>
<translation>Vybrat rozsah</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Edit Track Points</source>
<translation>Upravit body stopy</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="156"/>
<source>Reverse Track</source>
<translation>Obrátit stopu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="154"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Combine Tracks</source>
<translation>Spojit stopy</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="188"/>
+ <location filename="../gis/CGisListWks.cpp" line="192"/>
<source>Edit Area Points</source>
<translation>Upravit body oblasti</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="134"/>
- <location filename="../gis/CGisListWks.cpp" line="157"/>
+ <location filename="../gis/CGisListWks.cpp" line="137"/>
+ <location filename="../gis/CGisListWks.cpp" line="161"/>
<source>Delete</source>
<translation>Smazat</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="778"/>
+ <location filename="../gis/CGisListWks.cpp" line="785"/>
<source>Saving workspace. Please wait.</source>
<translation>Ukládá se pracovní prostor. Počkejte, prosím.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="824"/>
+ <location filename="../gis/CGisListWks.cpp" line="831"/>
<source>Loading workspace. Please wait.</source>
<translation>Nahrává se pracovní prostor. Počkejte, prosím.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>Close all projects...</source>
<translation>Zavřít všechny projekty...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>This will remove all projects from the workspace.</source>
<translation>Tímto budou všechny projekty odstraněny z pracovního prostoru.</translation>
</message>
@@ -1801,22 +1804,22 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
<translation>Projekt "%1" je již náhrán do pracovního prostoru.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="554"/>
+ <location filename="../gis/CGisWidget.cpp" line="559"/>
<source>Copy items...</source>
<translation>Kopírovat prvky...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="573"/>
+ <location filename="../gis/CGisWidget.cpp" line="578"/>
<source>Change waypoint symbols.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Cut Track...</source>
<translation>Rozkrojit stopu...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Do you want to delete the original track?</source>
<translation>Opravdu chcete smazat původní stopu?</translation>
</message>
@@ -1974,7 +1977,7 @@ line %2, column %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
<source>Speed</source>
<translation>Rychlost</translation>
</message>
@@ -2000,37 +2003,42 @@ line %2, column %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+ <source>Energy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
<source>Sea Level Pressure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
<source>Speed (vertical)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
<source>Slope*</source>
<translation>Sklon*</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
<source>Speed*</source>
<translation>Rychlost*</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
<source>Elevation</source>
<translation>Výška</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
<source>Progress</source>
<translation>Postup</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
<source>Terrain slope</source>
<translation type="unfinished"></translation>
</message>
@@ -2046,53 +2054,53 @@ line %2, column %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="769"/>
+ <location filename="../CMainWindow.cpp" line="813"/>
<source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
<translation>Použít <b>Nabídka → Pohled → Přidat pohled na mapu</b> k otevření nového pohledu. Nebo <b>Nabídka → Soubor → Nahrát pohled na mapu</b> k obnovení uložené. Nebo klepněte <a href='newview'>sem</a>.</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="897"/>
+ <location filename="../CMainWindow.cpp" line="941"/>
<source>Ele: %1%2</source>
<translation>Výška: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="909"/>
+ <location filename="../CMainWindow.cpp" line="953"/>
<source>Slope: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="925"/>
+ <location filename="../CMainWindow.cpp" line="969"/>
<source>[Grid: %1]</source>
<translation>[Mřížka: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1066"/>
+ <location filename="../CMainWindow.cpp" line="1110"/>
<source>Load GIS Data...</source>
<translation>Nahrát data GIS...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
<source>Select output file</source>
<translation>Vybrat výstupní soubor</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>QMapShack View (*.view)</source>
<translation>Pohled QMapShack (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>Select file to load</source>
<translation>Vybrat soubor k nahrání</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1369"/>
+ <location filename="../CMainWindow.cpp" line="1481"/>
<source>Fatal...</source>
<translation>Kritické...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1370"/>
+ <location filename="../CMainWindow.cpp" line="1482"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation type="unfinished"></translation>
</message>
@@ -2852,19 +2860,18 @@ Fall back to internal types.</source>
<context>
<name>CMapTMS</name>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
- <location filename="../map/CMapTMS.cpp" line="77"/>
- <location filename="../map/CMapTMS.cpp" line="136"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Error...</source>
<translation>Chyba...</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
<source>Failed to open %1</source>
<translation>Nepodařilo se otevřít %1</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="77"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
@@ -2873,27 +2880,17 @@ line %2, column %3:
%4</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="115"/>
+ <location filename="../map/CMapTMS.cpp" line="116"/>
<source>Layer %1</source>
<translation>Vrstva %1</translation>
</message>
- <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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Tato mapa vyžaduje podporu pro OpenSSL. Nicméně kvůli právním omezením v některých zemích není OpenSSL k QMapShack přibaleno. Můžete se podívat na <a href='https://www.openssl.org/community/binaries.html'>stránky OpenSSL</a>, kde najdete spustitelné soubory. Musíte zkopírovat libeay32.dll a ssleay32.dll do adresáře s programem QMapShack.</translation>
- </message>
- <message>
- <location filename="../map/CMapTMS.cpp" line="299"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 dlaždic čeká<br/></translation>
- </message>
</context>
<context>
<name>CMapVRT</name>
<message>
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation>Chyba...</translation>
@@ -2906,7 +2903,7 @@ line %2, column %3:
</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<source>File must be 8 bit palette or gray indexed.</source>
<translation>Soubor musí mít 8 bitovou barevnou paletu nebo být v odstínech šedi.</translation>
</message>
@@ -2924,17 +2921,17 @@ line %2, column %3:
<translation>Sestavit GDAL VRT</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="63"/>
<source>Select files...</source>
<translation>Vybrat soubory...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="87"/>
<source>Select target file...</source>
<translation>Vybrat cílový soubor...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="150"/>
<source>!!! done !!!
</source>
<translation>Hotovo!</translation>
@@ -2947,8 +2944,7 @@ line %2, column %3:
<location filename="../map/CMapWMTS.cpp" line="53"/>
<location filename="../map/CMapWMTS.cpp" line="63"/>
<location filename="../map/CMapWMTS.cpp" line="72"/>
- <location filename="../map/CMapWMTS.cpp" line="157"/>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>Error...</source>
<translation>Chyba...</translation>
</message>
@@ -2979,20 +2975,10 @@ Neznámá stavba.</translation>
<translation>Neočekávaná služba. Očekáváno '* WMTS 1.0.0'. Přečteno '%1 %2'.</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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Tato mapa vyžaduje podporu pro OpenSSL. Nicméně kvůli právním omezením v některých zemích není OpenSSL k QMapShack přibaleno. Můžete se podívat na <a href='https://www.openssl.org/community/binaries.html'>stránky OpenSSL</a>, kde najdete spustitelné soubory. Musíte zkopírovat libeay32.dll a ssleay32.dll do adresáře s programem QMapShack.</translation>
- </message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>No georeference information found.</source>
<translation>Nenalezeny žádné údaje o soustavě souřadnic.</translation>
</message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="413"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 dlaždic čeká<br/></translation>
- </message>
</context>
<context>
<name>CMouseEditArea</name>
@@ -3008,7 +2994,7 @@ Neznámá stavba.</translation>
<translation><b>Upravit oblast</b><br/>Vyberte funkci a režim stanovení směru cesty přes nástrojová tlačítka. Dále vyberte bod na čáře. Lze měnit pouze body označené velkým čtverečkem. Černé body jsou podbody vytvořenými při stanovení směru cesty.<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <location filename="../mouse/CMouseEditArea.cpp" line="94"/>
<source>area</source>
<translation>Oblast</translation>
</message>
@@ -3027,7 +3013,7 @@ Neznámá stavba.</translation>
<translation><b>Upravit body cesty</b><br/>Vyberte funkci a režim stanovení směru cesty přes nástrojová tlačítka. Dále vyberte bod na čáře. Lze měnit pouze body označené velkým čtverečkem. Černé body jsou podbody vytvořenými při stanovení směru cesty.<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <location filename="../mouse/CMouseEditRte.cpp" line="105"/>
<source>route</source>
<translation>Cesta</translation>
</message>
@@ -3056,7 +3042,7 @@ Neznámá stavba.</translation>
<translation>Tímto budou všechny původní údaje nahrazeny jednoduchou čárou souřadnic. Všechna ostatní data budou trvale ztracena.</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="110"/>
<source>track</source>
<translation>Stopa</translation>
</message>
@@ -3128,27 +3114,27 @@ Neznámá stavba.</translation>
<translation><b>Vybrat prvky na mapě</b><br/>Vyberte na mapě klepnutím levým tlačítkem myši obdélníkovou oblast. Výběr zrušíte klepnutím pravým tlačítkem myši. Výběr lze upravit posunutím rohových bodů myší.</translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="99"/>
<source><b>Selected:</b><br/></source>
<translation><b>Vybráno:</b><br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="106"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="107"/>
<source>%1 waypoints<br/></source>
<translation>%1 cestovní body<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="101"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="102"/>
<source>%1 tracks<br/></source>
<translation>%1 stopy<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="111"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="112"/>
<source>%1 routes<br/></source>
<translation>%1 cesty<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="116"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="117"/>
<source>%1 areas<br/></source>
<translation>%1 oblasti<br/></translation>
</message>
@@ -3236,12 +3222,12 @@ y: %4 m/px</translation>
<context>
<name>CProgressDialog</name>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="40"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="46"/>
<source>Elapsed time: %1</source>
<translation>Uplynulý čas: %1</translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="87"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="132"/>
<source>Elapsed time: %1 seconds.</source>
<translation>Uplynulý čas: %1 sekund.</translation>
</message>
@@ -4621,14 +4607,47 @@ line %2, column %3:
</message>
</context>
<context>
+ <name>CTemplateWidget</name>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
+ <source>choose one...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
+ <source>Hiking Tour Summary (built-in)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
+ <source>-</source>
+ <translation type="unfinished">-</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
+ <source>Template path...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
+ <source>Failed to read template file %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
+ <source>Preview...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="71"/>
<source>&Color...</source>
<translation>B&arva...</translation>
</message>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="117"/>
<source>Reset format</source>
<translation>Nastavit formát znovu</translation>
</message>
@@ -4695,6 +4714,194 @@ line %2, column %3:
</message>
</context>
<context>
+ <name>Form</name>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
+ <source>Form</source>
+ <translation type="unfinished">Formulář</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
+ <source>Participants</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
+ <source>Weather</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
+ <source>rain</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
+ <source>sunny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
+ <source>snow</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
+ <source>clouds</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
+ <source>windy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
+ <source>hot</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
+ <source>warm</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
+ <source>cold</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
+ <source>freezing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
+ <source>foggy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
+ <source>humid</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
+ <source>Character</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
+ <source>easy hiking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
+ <source>climbing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
+ <source>alpine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
+ <source>large ascend</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
+ <source>long distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
+ <source>via ferrata</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
+ <source>hail/soft hail</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
+ <source>Rating</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
+ <source>Rating 5 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
+ <source>Rating 4 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
+ <source>Rating 3 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
+ <source>Rating 2 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
+ <source>Rating 1 star</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
+ <source>aborted</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
+ <source>Equipment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
+ <source>ferrata gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
+ <source>night gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
+ <source>snow shoes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
+ <source>climbing gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
+ <source>ski</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
+ <source>camping gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IAbout</name>
<message>
<location filename="../IAbout.ui" line="14"/>
@@ -4882,8 +5089,8 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="66"/>
- <source>Square (optimized for TMS and WTMS tiles)</source>
- <translation>Čtvereční (vyladěné pro dlaždice TMS a WTMS)</translation>
+ <source>Square (optimized for TMS and WMTS tiles)</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -5469,7 +5676,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>Profil</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1495"/>
<source>Speed</source>
<translation>Rychlost</translation>
</message>
@@ -5575,47 +5782,42 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>Nastavit činnost stopy</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
- <source>Remove Track Activity</source>
- <translation>Odstranit činnost stopy</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1400"/>
<source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
<translation>K rozlišení statistik stop zvolte v seznamu činnost pro celou stopu. Nebo vyberte část stopy a přiřaďte jí činnost.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1427"/>
<source>Points</source>
<translation>Body</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Time</source>
<translation>Čas</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ele.</source>
<translation>Výška</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Delta</source>
<translation>Rozdíl</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Dist.</source>
<translation>Vzdál.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1500"/>
<source>Slope</source>
<translation>Sklon</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1515"/>
<source>Position</source>
<translation>Poloha</translation>
</message>
@@ -5682,22 +5884,22 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
<translation>Barva</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1505"/>
<source>Ascent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1510"/>
<source>Descent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1524"/>
<source>Filter</source>
<translation>Filtr</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1561"/>
<source>Hist.</source>
<translation>Historie</translation>
</message>
@@ -6365,70 +6567,70 @@ Buď je to nový symbol nebo byl v databázi někým smazán.</translation>
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source>Save project?</source>
<translation>Uložit projekt?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation><h3>%1</h3>Projekt byl změněn. Uložit jej před zavřením?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="329"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="356"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation>%1: Svázat stopy a cestovní body.</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="366"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation><h3>%1</h3>Trvalo to moc dlouho? Chcete svázání stop a cestovních bodů pro tento projekt přeskočit i v budoucnu?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="340"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="367"/>
<source>Canceled correlation...</source>
<translation>Svázání zrušeno...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="385"/>
- <location filename="../gis/prj/IGisProject.cpp" line="442"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="412"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="469"/>
<source>Save "%1" to...</source>
<translation>Uložit "%1" do...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="527"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="554"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Název souboru: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="532"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="559"/>
<source>Waypoints: %1</source>
<translation>Cestovní body: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="536"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="563"/>
<source>Tracks: %1</source>
<translation>Stopy: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="540"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="567"/>
<source>Routes: %1</source>
<translation>Cesty: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="544"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="571"/>
<source>Areas: %1</source>
<translation>Oblasti: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="664"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="691"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Jste si jistý, že chcete smazat '%1' z projektu '%2'?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="665"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="692"/>
<source>Delete...</source>
<translation>Smazat...</translation>
</message>
@@ -6636,363 +6838,373 @@ Název souboru: %1</translation>
<translation>Okno</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="112"/>
+ <location filename="../IMainWindow.ui" line="113"/>
<source>?</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="120"/>
+ <location filename="../IMainWindow.ui" line="121"/>
<source>Project</source>
<translation>Projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="131"/>
+ <location filename="../IMainWindow.ui" line="132"/>
<source>Tool</source>
<translation>Nástroj</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="156"/>
+ <location filename="../IMainWindow.ui" line="157"/>
<source>Maps</source>
<translation>Mapy</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="199"/>
+ <location filename="../IMainWindow.ui" line="200"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Digitální výškový model</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="238"/>
+ <location filename="../IMainWindow.ui" line="239"/>
<source>Data</source>
<translation>Data</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="308"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="322"/>
+ <location filename="../IMainWindow.ui" line="323"/>
<source>Show Scale</source>
<translation>Ukázat měřítko</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="335"/>
<source>Setup Map Font</source>
<translation>Nastavit písmo mapy</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="350"/>
<source>Show Grid</source>
<translation>Ukázat mřížku</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="353"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="364"/>
+ <location filename="../IMainWindow.ui" line="365"/>
<source>Setup Grid</source>
<translation>Nastavit mřížku</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="368"/>
<source>Ctrl+Alt+G</source>
<translation>Ctrl+Alt+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="383"/>
<source>Flip Mouse Wheel</source>
<translation>Obrátit kolečko myši</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="394"/>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="395"/>
+ <location filename="../IMainWindow.ui" line="398"/>
<source>Setup Map Paths</source>
<translation>Nastavit cesty k mapám</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="413"/>
<source>POI Text</source>
<translation>Text POI</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="428"/>
<source>Night / Day</source>
<translation>Noc/Den</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="443"/>
<source>Map Tool Tip</source>
<translation>Rada k nástroji pro mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="457"/>
+ <location filename="../IMainWindow.ui" line="458"/>
<source>Setup DEM Paths</source>
<translation>Nastavit cesty k výškovým modelům</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="470"/>
<source>About</source>
<translation>O programu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
+ <location filename="../IMainWindow.ui" line="482"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="256"/>
+ <location filename="../IMainWindow.ui" line="257"/>
<source>Route</source>
<translation>Cesta</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
+ <location filename="../IMainWindow.ui" line="287"/>
<source>Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="301"/>
- <location filename="../IMainWindow.ui" line="304"/>
+ <location filename="../IMainWindow.ui" line="302"/>
+ <location filename="../IMainWindow.ui" line="305"/>
<source>Add Map View</source>
<translation>Přidat pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="445"/>
+ <location filename="../IMainWindow.ui" line="446"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="485"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="497"/>
+ <location filename="../IMainWindow.ui" line="500"/>
<source>Setup Map View</source>
<translation>Nastavit pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="511"/>
+ <location filename="../IMainWindow.ui" line="512"/>
<source>Load GIS Data</source>
<translation>Nahrát data GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="515"/>
<source>Load projects from file</source>
<translation>Nahrát projekty ze souboru</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="518"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="529"/>
+ <location filename="../IMainWindow.ui" line="530"/>
<source>Save All GIS Data</source>
<translation>Uložit všechna data GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="533"/>
<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="535"/>
+ <location filename="../IMainWindow.ui" line="536"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="547"/>
+ <location filename="../IMainWindow.ui" line="548"/>
<source>Setup Time Zone</source>
<translation>Nastavit časové pásmo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="560"/>
<source>Add empty project</source>
<translation>Přidat prázdný projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="575"/>
<source>Search Google</source>
<translation>Hledat pomocí Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="587"/>
<source>Close all projects</source>
<translation>Zavřít všechny projekty</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="589"/>
+ <location filename="../IMainWindow.ui" line="590"/>
<source>F8</source>
<translation>F8</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="602"/>
<source>Setup Units</source>
<translation>Nastavit jednotky</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="614"/>
<source>Setup Workspace</source>
<translation>Nastavit pracovní prostor</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="617"/>
<source>Setup save on exit.</source>
<translation>Nastavit uložení při ukončení.</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="629"/>
<source>Import Database from QLandkarte</source>
<translation>Zavést databázi z QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="632"/>
<source>Import QLandkarte GT database</source>
<translation>Zavést databázi GT QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="644"/>
<source>VRT Builder</source>
<translation>Sestavovač VRT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="647"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>Rozhraní pro gdalbuildvrt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="659"/>
<source>Store Map View</source>
<translation>Uložit pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="662"/>
<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="673"/>
+ <location filename="../IMainWindow.ui" line="674"/>
<source>Load Map View</source>
<translation>Nahrát pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="677"/>
<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="691"/>
+ <location filename="../IMainWindow.ui" line="692"/>
<source>Ext. Profile</source>
<translation>Ext. Profil</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="695"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="707"/>
<source>Close</source>
<translation>Zavřít</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="710"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="722"/>
<source>Clone Map View</source>
<translation>Klonovat pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="724"/>
+ <location filename="../IMainWindow.ui" line="725"/>
<source>Ctrl+Shift+T</source>
<translation>Ctrl+Shift+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="737"/>
<source>Create Routino Database</source>
<translation>Vytvořit databázi Routino</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="748"/>
+ <location filename="../IMainWindow.ui" line="749"/>
<source>Save(Print) Map Screenshot</source>
<translation>Uložit (vytisknout) snímek obrazovky s mapou</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="752"/>
<source>Print a selected area of the map</source>
<translation>Vytisknout vybranou oblast mapy</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="755"/>
<source>Ctrl+P</source>
<translation>Ctrl+P</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="767"/>
<source>Setup Coord. Format</source>
<translation>Nastavit formát souřadnic</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="769"/>
+ <location filename="../IMainWindow.ui" line="770"/>
<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="781"/>
+ <location filename="../IMainWindow.ui" line="782"/>
<source>Setup Map Background</source>
<translation>Nastavit pozadí mapy</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="794"/>
<source>Setup Waypoint Icons</source>
<translation>Stanovit ikony cestovních bodů</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="796"/>
+ <location filename="../IMainWindow.ui" line="797"/>
<source>Setup path to custom icons</source>
<translation>Stanovit cestu k vlastním ikonám</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="805"/>
+ <location filename="../IMainWindow.ui" line="806"/>
<source>Close Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="808"/>
+ <location filename="../IMainWindow.ui" line="809"/>
<source>Ctrl+W</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="817"/>
+ <location filename="../IMainWindow.ui" line="818"/>
<source>Quickstart Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="826"/>
+ <location filename="../IMainWindow.ui" line="827"/>
<source>Setup Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="838"/>
+ <location filename="../IMainWindow.ui" line="839"/>
<source>Toggle Docks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="841"/>
+ <location filename="../IMainWindow.ui" line="842"/>
<source>Toggle visibility of dockable windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="844"/>
+ <location filename="../IMainWindow.ui" line="845"/>
<source>Ctrl+D</source>
<translation type="unfinished">Ctrl+D</translation>
</message>
+ <message>
+ <location filename="../IMainWindow.ui" line="854"/>
+ <source>Full Screen</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="857"/>
+ <source>F11</source>
+ <translation type="unfinished">F11</translation>
+ </message>
</context>
<context>
<name>IMapList</name>
@@ -7050,6 +7262,24 @@ Nechce se mi číst dokumentaci!</translation>
</message>
</context>
<context>
+ <name>IMapOnline</name>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="41"/>
+ <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
+ <translation type="unfinished">Tato mapa vyžaduje podporu pro OpenSSL. Nicméně kvůli právním omezením v některých zemích není OpenSSL k QMapShack přibaleno. Můžete se podívat na <a href='https://www.openssl.org/community/binaries.html'>stránky OpenSSL</a>, kde najdete spustitelné soubory. Musíte zkopírovat libeay32.dll a ssleay32.dll do adresáře s programem QMapShack.</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="47"/>
+ <source>Error...</source>
+ <translation type="unfinished">Chyba...</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="98"/>
+ <source><b>%1</b>: %2 tiles pending<br/></source>
+ <translation type="unfinished"><b>%1</b>: %2 dlaždic čeká<br/></translation>
+ </message>
+</context>
+<context>
<name>IMapPathSetup</name>
<message>
<location filename="../map/IMapPathSetup.ui" line="14"/>
@@ -7181,28 +7411,65 @@ Nechce se mi číst dokumentaci!</translation>
<translation>Formulář</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="22"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
+ <source>Advanced Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <source>Source No Data (-srcnodata)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="46"/>
+ <source>Target No Data (-vrtnodata)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../tool/IMapVrtBuilder.ui" line="56"/>
+ <source>Target Projection (-a_srs)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="63"/>
+ <source>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
+ <source>1. Select one or multiple source files.
+2. Select a file name for the target VRT file.
+3. Press "Start" button.
+
+Tip:
+* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
+* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
+* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="139"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="156"/>
<source>Select source files:</source>
<translation>Vybrat zdrojové soubory:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="79"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="121"/>
<source>Target Filename:</source>
<translation>Název cílového souboru:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="86"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="128"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="95"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="20"/>
<source>Start</source>
<translation>Spustit</translation>
</message>
@@ -7973,16 +8240,6 @@ nebo
<translation>Ctrl+R</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
- <source>Delete a point. (Ctrl+D)</source>
- <translation>Smazat bod. (Ctrl+D)</translation>
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
- <source>Ctrl+D</source>
- <translation>Ctrl+D</translation>
- </message>
- <message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="215"/>
<source>No auto-routing or line snapping (Ctrl+O)</source>
<translation>Žádné automatické stanovení cesty nebo přichycení k čáře (Ctrl+O)</translation>
@@ -8018,6 +8275,16 @@ nebo
<translation>...</translation>
</message>
<message>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
+ <source>Delete a point. (Ctrl+-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
+ <source>Ctrl+-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
<source>0</source>
<translation>0</translation>
@@ -8164,8 +8431,8 @@ nebo
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
- <source>Select an activity for the selected range.</source>
- <translation>Vybrat činnost pro vybranou oblast.</translation>
+ <source>Set an activity for the selected range.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
@@ -8256,12 +8523,13 @@ nebo
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
<location filename="../mouse/IScrOptSelect.ui" line="142"/>
- <location filename="../mouse/IScrOptSelect.ui" line="196"/>
- <location filename="../mouse/IScrOptSelect.ui" line="225"/>
- <location filename="../mouse/IScrOptSelect.ui" line="285"/>
- <location filename="../mouse/IScrOptSelect.ui" line="312"/>
- <location filename="../mouse/IScrOptSelect.ui" line="339"/>
- <location filename="../mouse/IScrOptSelect.ui" line="366"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="156"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="210"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="239"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="299"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="326"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="353"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="380"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -8282,36 +8550,41 @@ nebo
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="139"/>
+ <source>Set an activity for all selected tracks.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="153"/>
<source>Delete all selected items.</source>
<translation>Smazat všechny vybrané prvky.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="193"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="207"/>
<source>Select all items that intersect the selected area.</source>
<translation>Vybrat všechny prvky, které protínají vybranou oblast.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="222"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="236"/>
<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"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="296"/>
<source>Add tracks to selection.</source>
<translation>Přidat stopy do výběru.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="309"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="323"/>
<source>Add waypoints to selection.</source>
<translation>Přidat cestovní body do výběru.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="336"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="350"/>
<source>Add routes to selection.</source>
<translation>Přidat cesty do výběru.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="363"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="377"/>
<source>Add areas to selection.</source>
<translation>Přidat oblasti do výběru.</translation>
</message>
@@ -8378,7 +8651,7 @@ nebo
* vyjmutí dlouhé stopy do úseků</translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
<source>Copy track together with all attached waypoints into another project.</source>
<translation type="unfinished"></translation>
</message>
@@ -8393,11 +8666,17 @@ nebo
<location filename="../gis/trk/IScrOptTrk.ui" line="151"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="170"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="184"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="198"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="210"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
+ <source>Set an activity for the complete track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="224"/>
<source>TextLabel</source>
<translation>Textový štítek</translation>
</message>
@@ -8908,6 +9187,34 @@ nebo
</message>
</context>
<context>
+ <name>ITemplateWidget</name>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="14"/>
+ <source>Insert Template...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="32"/>
+ <source>Templates</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="42"/>
+ <source>Select a path with your own templates.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="45"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="77"/>
+ <source>Preview</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ITextEditWidget</name>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="14"/>
@@ -8915,264 +9222,279 @@ nebo
<translation>Upravit text...</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="25"/>
- <location filename="../widgets/ITextEditWidget.ui" line="331"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="45"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="351"/>
<source>Undo</source>
<translation>Zpět</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="354"/>
<source>Ctrl+Z</source>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="38"/>
- <location filename="../widgets/ITextEditWidget.ui" line="343"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="58"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="363"/>
<source>Redo</source>
<translation>Znovu</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="346"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="366"/>
<source>Ctrl+Shift+Z</source>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="51"/>
- <location filename="../widgets/ITextEditWidget.ui" line="355"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="71"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="375"/>
<source>Cut</source>
<translation>Vyjmout</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="358"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="378"/>
<source>Ctrl+X</source>
<translation>Ctrl+X</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="64"/>
- <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="84"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="387"/>
<source>Copy</source>
<translation>Kopírovat</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="370"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="390"/>
<source>Ctrl+C</source>
<translation>Ctrl+C</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="77"/>
- <location filename="../widgets/ITextEditWidget.ui" line="375"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="97"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="395"/>
<source>Paste</source>
<translation>Vložit</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="25"/>
+ <source>Templ.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="120"/>
<source>A:L</source>
<translation>A:L</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="133"/>
<source>A:C</source>
<translation>A:C</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="146"/>
<source>A:R</source>
<translation>A:R</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="159"/>
<source>A:B</source>
<translation>A:B</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="192"/>
<source>B</source>
<translation>B</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="205"/>
<source>I</source>
<translation>I</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="218"/>
<source>U</source>
<translation>U</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="238"/>
<source>C</source>
<translation>C</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="285"/>
<source>Standard</source>
<translation>Standardní</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="290"/>
<source>Bullet List (Disc)</source>
<translation>Seznam kulatých odrážek (kotouč)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="295"/>
<source>Bullet List (Circle)</source>
<translation>Seznam kulatých odrážek (kroužek)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="300"/>
<source>Bullet List (Square)</source>
<translation>Seznam kulatých odrážek (čtvereček)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="305"/>
<source>Ordered List (Decimal)</source>
<translation>Uspořádaný seznam (desetinný)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="310"/>
<source>Ordered List (Alpha lower)</source>
<translation>Uspořádaný seznam (abecední dolní)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="315"/>
<source>Ordered List (Alpha upper)</source>
<translation>Uspořádaný seznam (abecední horní)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="320"/>
<source>Ordered List (Roman lower)</source>
<translation>Uspořádaný seznam (antikva dolní)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="325"/>
<source>Ordered List (Roman upper)</source>
<translation>Uspořádaný seznam (antikva horní)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="378"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="398"/>
<source>Ctrl+V</source>
<translation>Ctrl+V</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="390"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="410"/>
<source>Align Left</source>
<translation>Zarovnat vlevo</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="393"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="413"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="405"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="425"/>
<source>Align Right</source>
<translation>Zarovnat vpravo</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="408"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="428"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="420"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="440"/>
<source>Align Center</source>
<translation>Zarovnat na střed</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="423"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="443"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="435"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="455"/>
<source>Align Block</source>
<translation>Zarovnat do bloku</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="438"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="458"/>
<source>Ctrl+J</source>
<translation>Ctrl+J</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="450"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="470"/>
<source>Underline</source>
<translation>Podtržení</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="453"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="473"/>
<source>Ctrl+U</source>
<translation>Ctrl+U</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="465"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="485"/>
<source>Bold</source>
<translation>Tučné</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="468"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="488"/>
<source>Ctrl+B</source>
<translation>Ctrl+B</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="480"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="500"/>
<source>Italic</source>
<translation>Kurzíva</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="483"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="503"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="515"/>
<source>Plain</source>
<translation>Prostý</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="518"/>
<source>Reset the text's format before pasting</source>
<translation>Nastavit znovu formát textu před vložením</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="503"/>
- <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="523"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="526"/>
<source>Select All</source>
<translation>Vybrat vše</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="529"/>
<source>Ctrl+A</source>
<translation>Ctrl+A</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="514"/>
- <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="534"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="537"/>
<source>Delete</source>
<translation>Smazat</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="522"/>
- <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="542"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="545"/>
<source>Reset Font</source>
<translation>Nastavit písmo znovu</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="530"/>
- <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="550"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="553"/>
<source>Reset Layout</source>
<translation>Nastavit rozvržení znovu</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="565"/>
<source>Normal</source>
<translation>Normální</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="568"/>
<source>Paste without resetting the text's format</source>
<translation>Vložit bez znovunastavení formátu textu</translation>
</message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="577"/>
+ <source>Insert From Template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="580"/>
+ <source>Create text from template.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ITextEditWidgetSelMenu</name>
@@ -9252,6 +9574,11 @@ nebo
<source>Setup Toolbar</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
+ <source>Toolbar is visible in Fullscreen-mode</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IToolShell</name>
diff --git a/src/locale/qmapshack_de.ts b/src/locale/qmapshack_de.ts
index d7c8eab..842cc6f 100644
--- a/src/locale/qmapshack_de.ts
+++ b/src/locale/qmapshack_de.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
<context>
<name>CAbout</name>
<message>
@@ -22,97 +22,100 @@
<context>
<name>CActivityTrk</name>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="51"/>
<source>Foot</source>
<translation>Fußgänger</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="59"/>
<source>Bicycle</source>
<translation>Fahrrad</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="67"/>
<source>Motor Bike</source>
<translation>Motorrad</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="75"/>
<source>Car</source>
<translation>Auto</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="83"/>
<source>Cable Car</source>
<translation>Seilbahn</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="91"/>
<source>Swim</source>
<translation>Schwimmen</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="99"/>
<source>Ship</source>
<translation>Schiff</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
+ <source>No Activity</source>
+ <translation>keine Aktivität</translation>
+ </message>
+ <message>
<location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
+ <source>Total</source>
+ <translation>Total</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
<source>Ascent:</source>
<translation>Anstieg:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="329"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="372"/>
<source>Descent:</source>
<translation>Abstieg:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="115"/>
<source>Ski/Winter</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="107"/>
<source>Aeronautics</source>
<translation>Aeronautik</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="307"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+ <source>Public Transport</source>
+ <translation>Öffentl. Verkehrsmittel</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
<source>Distance:</source>
<translation>Entfernung:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="396"/>
<source>Speed Moving:</source>
<translation>Geschwindigkeit in Bewegung:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="351"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="420"/>
<source>Speed Total:</source>
<translation>Geschwindigkeit insgesamt:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="275"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="362"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="444"/>
<source>Time Moving:</source>
<translation>Zeit in Bewegung:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="277"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="468"/>
<source>Time Total:</source>
<translation>Zeit insgesamt:</translation>
</message>
- <message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="414"/>
- <source>None</source>
- <translation>Keine</translation>
- </message>
</context>
<context>
<name>CCanvas</name>
@@ -267,27 +270,27 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
<source>Failed to load...</source>
<translation>Laden fehlgeschlagen...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <location filename="../gis/db/CDBProject.cpp" line="114"/>
<source>Can't load file "%1" . It will be skipped.</source>
<translation>Konnte die Datei "%1" nicht laden. Wird ausgelassen.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
<source>Project already in database...</source>
<translation>Das Projekt ist schon in der Datenbank...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <location filename="../gis/db/CDBProject.cpp" line="128"/>
<source>The project "%1" has already been imported into the database. It will be skipped.</source>
<translation>Das Projekt "%1" wurde schon in die Datenbank importiert. Wird asugelassen.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="278"/>
+ <location filename="../gis/db/CDBProject.cpp" line="279"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -296,47 +299,47 @@ To solve this conflict you can create and save a clone, force your version or dr
Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihre Version oder verwerfen diese und nehmen die Version in der Datenbank</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="284"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Conflict with database...</source>
<translation>Konflikt mit der Datenbank...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="285"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Clone && Save</source>
<translation>Klonen && Speichern</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="286"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Force Save</source>
<translation>Speichern erzwingen</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="287"/>
+ <location filename="../gis/db/CDBProject.cpp" line="288"/>
<source>Take remote</source>
<translation>Entfernte Version nehmen</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="569"/>
+ <location filename="../gis/db/CDBProject.cpp" line="572"/>
<source>Missing folder...</source>
<translation>Fehlender Ordner...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="570"/>
+ <location filename="../gis/db/CDBProject.cpp" line="573"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation>Speichern des Projektes fehlgeschlagen. Der Ordner wurde in der Datenbank gelöscht.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="577"/>
+ <location filename="../gis/db/CDBProject.cpp" line="580"/>
<source>Save ...</source>
<translation>Speichern ...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>There was an unexpected database error:
%1</source>
@@ -345,12 +348,12 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
%1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="755"/>
+ <location filename="../gis/db/CDBProject.cpp" line="760"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation>Das Projekt '%1' will sich gerade aus der Datenbank aktualisieren. Es gibt allerdings nicht gespeicherte Änderungen.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="756"/>
+ <location filename="../gis/db/CDBProject.cpp" line="761"/>
<source>Save changes?</source>
<translation>Änderungen speichern?</translation>
</message>
@@ -436,7 +439,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<name>CDetailsPrj</name>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="267"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="774"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>none</source>
<translation>keine</translation>
</message>
@@ -451,60 +454,60 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation><b>Auswertung aller Tracks im Projekt</b><br/></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="437"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="419"/>
<source><h2>Waypoints</h2></source>
<translation><h2>Wegpunkte</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="444"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="470"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="591"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="709"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="739"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="426"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="452"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="573"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="691"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="721"/>
<source>Info</source>
<translation>Information</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="471"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="427"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="574"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="692"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="722"/>
<source>Comment</source>
<translation>Kommentar</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="463"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
<source><h2>Tracks</h2></source>
<translation><h2>Tracks</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>From Start</source>
<translation>Vom Anfang</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To Next</source>
<translation>Zum Nächsten</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To End</source>
<translation>Zum Ende</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="613"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
<source>distance: </source>
<translation>Entfernung:</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="623"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
<source>ascent: </source>
<translation>Anstieg:</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="702"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
<source><h2>Areas</h2></source>
<translation><h2>Gebiete</h2></translation>
</message>
@@ -519,39 +522,39 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Verknüpfungen...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="732"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
<source><h2>Routes</h2></source>
<translation><h2>Routen</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Edit name...</source>
<translation>Name bearbeiten...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Enter new project name.</source>
<translation>Geben Sie einen neuen Namen für das Projekt ein.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="915"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="897"/>
<source>Print Diary</source>
<translation>Tagebuch drucken</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Edit keywords...</source>
<translation>Stichwörter bearbeiten...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="633"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
<source>descent: </source>
<translation>Abstieg: </translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Enter keywords.</source>
<translation>Stichwörter eingeben.</translation>
</message>
@@ -559,45 +562,35 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<context>
<name>CDetailsTrk</name>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
<source>Reduce visible track points</source>
<translation>Sichtbare Trackpunkte reduzieren</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
<source>Change elevation of track points</source>
<translation>Höhe von Trackpunkten ändern</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
<source>Change timestamp of track points</source>
<translation>Zeitstempel von Trackpunkten ändern</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
<source>Miscellaneous</source>
<translation>Verschiedenes</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
<source>Color</source>
<translation>Farbe</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
<source>Activity</source>
<translation>Aktivität</translation>
</message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>Reset activities...</source>
- <translation>Aktivitäten zurücksetzen...</translation>
- </message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>This will remove all activities from the track. Proceed?</source>
- <translation>Dies wird alle Aktivitäten vom Track entfernen. Fortfahren?</translation>
- </message>
</context>
<context>
<name>CDetailsWpt</name>
@@ -610,7 +603,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<context>
<name>CDeviceGarmin</name>
<message>
- <location filename="../device/CDeviceGarmin.cpp" line="265"/>
+ <location filename="../device/CDeviceGarmin.cpp" line="272"/>
<source>Picture%1</source>
<translation>Bild %1</translation>
</message>
@@ -972,7 +965,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<context>
<name>CGisItemTrk</name>
<message>
- <location filename="../gis/fit/serialization.cpp" line="246"/>
+ <location filename="../gis/fit/serialization.cpp" line="285"/>
<source>FIT file %1 contains no GPS data.</source>
<translation>FIT Dekodierfehler: Datei %1 enthält keine GPS Daten.</translation>
</message>
@@ -1013,252 +1006,252 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Wegpunkte geändert, alle vorherigen Daten sind verloren.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="305"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
<source>Length: %1 %2</source>
<translation>Länge: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="312"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
<source>, %1-, %2-</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="328"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
<source>Time: -, Speed: -</source>
<translation>Zeit: -, Geschwindigkeit: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
<source>Moving: -, Speed: -</source>
<translation>Zeit in Bew.: -, Geschw. -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="346"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
<source>Start: %1</source>
<translation>Beginn: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="350"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
<source>Start: -</source>
<translation>Beginn: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="356"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
<source>End: %1</source>
<translation>Ende: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="360"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
<source>End: -</source>
<translation>Ende: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="364"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
<source>Points: %1 (%2)</source>
<translation>Punkte: %1 von %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="368"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
<source>Invalid elevations!</source>
<translation>Ungültige Höhenwerte!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
<source>Invalid timestamps!</source>
<translation>Ungültige Zeitmarken!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="378"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
<source>Invalid positions!</source>
<translation>Ungültige Positionsdaten!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="387"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
<source>Activities: %1</source>
<translation>Aktivitäten: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="495"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
<source>Index: %1</source>
<translation>Index: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="499"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
<source>Index: visible %1, total %2</source>
<translation>Index: angez. %1, total %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="510"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
<source>Ele.: %1 %2</source>
<translation>Höhe: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="513"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
<source> slope: %1%3 (%2%)</source>
<translation>, Neigung: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="518"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
<source> speed: %1%2</source>
<translation>, Geschw.: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="546"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
<source>... and %1 tags not displayed</source>
<translation>... und %1 Tags werden nicht angezeigt</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
<source>Distance: - (-)</source>
<translation>Entfernung: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="559"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source>Moving: - (-)</source>
<translation>Zeit in Bew.: - (-) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
<source>track</source>
<translation>Track</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
<source>Hide point %1.</source>
<translation>Punkt %1 verbergen.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
<source>Hide points %1..%2.</source>
<translation>Punkte %1 %2 verbergen.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="582"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
<source> Moving: %1%2 (%3%)</source>
<translation>, Zeit in Bew.: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
<source>, %1%2</source>
<translation>, %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
<source> Time: %1%2</source>
<translation> Zeit: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="324"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
<source>Time: %1, Speed: %2 %3</source>
<translation>Zeit: %1, Geschwindigkeit: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation>Zeit in Bew.: %1, Geschw. %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="556"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
<source>Ascent: - (-)</source>
<translation>Anstieg: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="557"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
<source>Descent: - (-)</source>
<translation>Abstieg: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="564"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
<source>Ascent: %1%2 (%3%)</source>
<translation>Anstieg: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="570"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
<source> Descent: %1%2 (%3%)</source>
<translation>, Abstieg: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
<source>Distance: %1%2 (%3%)</source>
<translation>Entf.: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Ascent: -</source>
<translation>Anstieg: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Descent: -</source>
<translation>Abstieg: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
<source>Ascent: %1%2</source>
<translation>Anstieg: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
<source> Descent: %1%2</source>
<translation> Abstieg: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
<source>Distance: %1%2</source>
<translation>Entfernung: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
<source>Permanently removed points %1..%2</source>
<translation>Punkte %1..%2 dauerhaft entfernt</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
<source>Show points.</source>
<translation>Punkte anzeigen.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
<source>Changed name</source>
<translation>Name geändert</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
<source>Changed comment</source>
<translation>Kommentar geändert</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
<source>Changed description</source>
<translation>Beschreibung geändert</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
<source>Changed links</source>
<translation>Geänderte Verknüpfungen</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
<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="2041"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
<source>Changed activity to '%1' for complete track.</source>
<translation>Die Aktivität wurde für den gesamten Track auf '%1' geändert.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation>Die Aktivität wurde für den Bereich (%2..%3) auf '%1' geändert.</translation>
</message>
@@ -1584,7 +1577,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="117"/>
<source>Save</source>
<translation>Speichern</translation>
</message>
@@ -1594,156 +1587,166 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Bearbeiten..</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="110"/>
+ <location filename="../gis/CGisListWks.cpp" line="109"/>
<source>Sort by Time</source>
<translation>Nach der Zeit sortieren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="111"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Name</source>
<translation>Nach dem Namen sortieren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="123"/>
+ <location filename="../gis/CGisListWks.cpp" line="126"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
+ <location filename="../gis/CGisListWks.cpp" line="135"/>
<source>Update Project on Device</source>
<translation>Aktualisiere das Projekt auf dem Gerät</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="146"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Edit...</source>
<translation>Bearbeiten...</translation>
</message>
<message>
<location filename="../gis/CGisListWks.cpp" line="102"/>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="150"/>
<source>Copy to...</source>
<translation>Kopieren nach...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <source>Autom. Save</source>
+ <translation>Autom. Speichern</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="118"/>
<source>Save as...</source>
<translation>Speichern unter...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="159"/>
<source>Copy Track with Waypoints</source>
<translation>Track mit Wegpunkten kopieren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="167"/>
<source>Show Bubble</source>
<translation>Infoblase anzeigen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="165"/>
+ <location filename="../gis/CGisListWks.cpp" line="169"/>
<source>Move Waypoint</source>
<translation>Wegpunkt verschieben</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Route Instructions</source>
<translation>Navigationsanweisungen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="180"/>
<source>Calculate Route</source>
<translation>Route berechnen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="181"/>
<source>Reset Route</source>
<translation>Route zurücksetzen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="178"/>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Edit Route</source>
<translation>Route bearbeiten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="179"/>
+ <location filename="../gis/CGisListWks.cpp" line="183"/>
<source>Convert to Track</source>
<translation>In einen Track umwandeln</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="195"/>
+ <location filename="../gis/CGisListWks.cpp" line="199"/>
<source>Create Route</source>
<translation>Route erstellen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <location filename="../gis/CGisListWks.cpp" line="200"/>
<source>Change Icon (sel. waypt. only)</source>
<translation>Symbol änd. (nur ausgew. Wegp.)</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="627"/>
+ <location filename="../gis/CGisListWks.cpp" line="158"/>
+ <source>Set Track Activity</source>
+ <translation>Trackaktivität festlegen</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="634"/>
<source>Drop items...</source>
<translation>Elemente verwerfen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="652"/>
- <location filename="../gis/CGisListWks.cpp" line="1646"/>
- <location filename="../gis/CGisListWks.cpp" line="1684"/>
+ <location filename="../gis/CGisListWks.cpp" line="659"/>
+ <location filename="../gis/CGisListWks.cpp" line="1691"/>
+ <location filename="../gis/CGisListWks.cpp" line="1729"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation><b>Aktualisieren der Geräte</b><p>Aktualisiere %1<br/>Bitte warten...</p></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Delete project...</source>
<translation>Projekt löschen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Do you really want to delete %1?</source>
<translation>Sind Sie sicher, dass sie %1 löschen wollen?</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <location filename="../gis/CGisListWks.cpp" line="170"/>
<source>Proj. Waypoint...</source>
<translation>Wegpunkt Projektion...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Track Profile</source>
<translation>Trackprofil</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <location filename="../gis/CGisListWks.cpp" line="122"/>
<source>Send to Devices</source>
<translation>Ans Gerät senden</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Select Range</source>
<translation>Bereich wählen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Edit Track Points</source>
<translation>Trackpunkte bearbeiten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="156"/>
<source>Reverse Track</source>
<translation>Track umkehren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="154"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Combine Tracks</source>
<translation>Tracks verbinden</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="188"/>
+ <location filename="../gis/CGisListWks.cpp" line="192"/>
<source>Edit Area Points</source>
<translation>Gebietspunkte bearbeiten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="134"/>
- <location filename="../gis/CGisListWks.cpp" line="157"/>
+ <location filename="../gis/CGisListWks.cpp" line="137"/>
+ <location filename="../gis/CGisListWks.cpp" line="161"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
@@ -1758,32 +1761,32 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Auf der Karte ausblenden.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation>Als GPX o. Erw. speichern...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Sync. with Database</source>
<translation>Mit der Datenbank synchronisieren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="778"/>
+ <location filename="../gis/CGisListWks.cpp" line="785"/>
<source>Saving workspace. Please wait.</source>
<translation>Arbeitsplatz wird gespeichert. Bitte warten.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="824"/>
+ <location filename="../gis/CGisListWks.cpp" line="831"/>
<source>Loading workspace. Please wait.</source>
<translation>Arbeitsplatz laden. Bitte warten.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>Close all projects...</source>
<translation>Alle Projekte schließen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>This will remove all projects from the workspace.</source>
<translation>Dies wird alle Projekte aus dem Arbeitsplatz entfernen.</translation>
</message>
@@ -1801,22 +1804,22 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
<translation>Das Projekt "%1" ist schon im Arbeitsplatz geladen.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="554"/>
+ <location filename="../gis/CGisWidget.cpp" line="559"/>
<source>Copy items...</source>
<translation>Elemente kopieren...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="573"/>
+ <location filename="../gis/CGisWidget.cpp" line="578"/>
<source>Change waypoint symbols.</source>
<translation>Symbol der Wegpunkte wird geändert.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Cut Track...</source>
<translation>Track teilen...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Do you want to delete the original track?</source>
<translation>Wollen Sie den ursprünglichen Track löschen?</translation>
</message>
@@ -1974,7 +1977,7 @@ Zeile %2, Spalte %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
<source>Speed</source>
<translation>Geschwindigkeit</translation>
</message>
@@ -2000,37 +2003,42 @@ Zeile %2, Spalte %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+ <source>Energy</source>
+ <translation>Energie</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
<source>Sea Level Pressure</source>
<translation>Luftdruck Meereshöhe</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
<source>Speed (vertical)</source>
<translation>Geschwindigkeit (vertikal)</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
<source>Slope*</source>
<translation>Neigung*</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
<source>Speed*</source>
<translation>Geschwindigkeit*</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
<source>Elevation</source>
<translation>Höhe</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
<source>Progress</source>
<translation>Verlauf</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
<source>Terrain slope</source>
<translation>Hangneigung</translation>
</message>
@@ -2046,53 +2054,53 @@ Zeile %2, Spalte %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="769"/>
+ <location filename="../CMainWindow.cpp" line="813"/>
<source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
<translation>Benützen Sie <b>Menü->Ansicht->Kartenansicht hinzufügen</b>, um eine neue Ansicht zu öffnen. Oder <b>Menü->Datei->Kartenansicht laden</b>, um eine gespeicherte wieder herzustellen. Oder Sie klicken einfach <a href='newview'>hier</a>.</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="897"/>
+ <location filename="../CMainWindow.cpp" line="941"/>
<source>Ele: %1%2</source>
<translation>Höhe: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="909"/>
+ <location filename="../CMainWindow.cpp" line="953"/>
<source>Slope: %1%2</source>
<translation>Hangneigung: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="925"/>
+ <location filename="../CMainWindow.cpp" line="969"/>
<source>[Grid: %1]</source>
<translation>[Gitter: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1066"/>
+ <location filename="../CMainWindow.cpp" line="1110"/>
<source>Load GIS Data...</source>
<translation>GIS Daten laden...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
<source>Select output file</source>
<translation>Ausgabedatei auswählen</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>QMapShack View (*.view)</source>
<translation>QMapShack Ansicht (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>Select file to load</source>
<translation>Zu ladende Datei auswählen</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1369"/>
+ <location filename="../CMainWindow.cpp" line="1481"/>
<source>Fatal...</source>
<translation>Schwerer Fehler...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1370"/>
+ <location filename="../CMainWindow.cpp" line="1482"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation>QMapShack 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>
@@ -2856,19 +2864,18 @@ Interne Typen werden wiederhergestellt.</translation>
<context>
<name>CMapTMS</name>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
- <location filename="../map/CMapTMS.cpp" line="77"/>
- <location filename="../map/CMapTMS.cpp" line="136"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Error...</source>
<translation>Fehler...</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
<source>Failed to open %1</source>
<translation>Öffnen fehlgeschlagen: %1</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="77"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
@@ -2877,27 +2884,17 @@ Zeile %2, Spalte %3:
%4</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="115"/>
+ <location filename="../map/CMapTMS.cpp" line="116"/>
<source>Layer %1</source>
<translation></translation>
</message>
- <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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Diese Karte benötigt OpenSSL. Aufgrund rechtlicher Beschränkungen in einigen Ländern, ist OpenSSL nicht Bestandteil von QMapShack. Sie können sich auf der <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> nach Binäries umsehen. Sie müssen die Dateien libeay32.dll and ssleay32.dll in das QMapShack Programmverzeichnis kopieren.</translation>
- </message>
- <message>
- <location filename="../map/CMapTMS.cpp" line="299"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 unerledigte Kacheln<br/></translation>
- </message>
</context>
<context>
<name>CMapVRT</name>
<message>
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation>Fehler...</translation>
@@ -2909,7 +2906,7 @@ Zeile %2, Spalte %3:
<translation>Die Datei konnte nicht geladen werden: %1</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<source>File must be 8 bit palette or gray indexed.</source>
<translation>Die Datei muss eine 8 bit Palette oder Graustufen haben.</translation>
</message>
@@ -2927,17 +2924,17 @@ Zeile %2, Spalte %3:
<translation>GDAL VRT erstellen</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="63"/>
<source>Select files...</source>
<translation>Dateien auswählen...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="87"/>
<source>Select target file...</source>
<translation>Zieldatei auswählen...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="150"/>
<source>!!! done !!!
</source>
<translation>!!! erledigt !!!</translation>
@@ -2950,8 +2947,7 @@ Zeile %2, Spalte %3:
<location filename="../map/CMapWMTS.cpp" line="53"/>
<location filename="../map/CMapWMTS.cpp" line="63"/>
<location filename="../map/CMapWMTS.cpp" line="72"/>
- <location filename="../map/CMapWMTS.cpp" line="157"/>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>Error...</source>
<translation>Fehler...</translation>
</message>
@@ -2982,17 +2978,7 @@ Unbekannte Struktur.</translation>
<translation>Unerwarteter Dienst. '* WMTS 1.0.0' wird erwartet. '%1 %2' wurde gelesen.</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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Diese Karte benötigt OpenSSL. Aufgrund rechtlicher Beschränkungen in einigen Ländern, ist OpenSSL nicht Bestandteil von QMapShack. Sie können sich auf der <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> nach Binäries umsehen. Sie müssen die Dateien libeay32.dll and ssleay32.dll in das QMapShack Programmverzeichnis kopieren.</translation>
- </message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="413"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 unerledigte Kacheln</translation>
- </message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>No georeference information found.</source>
<translation>Keine Georeferenzierung gefunden.</translation>
</message>
@@ -3011,7 +2997,7 @@ Unbekannte Struktur.</translation>
<translation><b>Gebiet bearbeiten</b><br/>Wählen Sie mittels der Werkzeug-Buttons eine Funktion und einen Routing-Modus. Als nächstes wählen Sie einen Punkt auf der Linie. Es können nur Punkte geändert werden, die mit einem großen Quadrat markiert sind. Schwarze Punkte sind durchs Routing erzeugte Unterpunkte.<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <location filename="../mouse/CMouseEditArea.cpp" line="94"/>
<source>area</source>
<translation>Gebiet</translation>
</message>
@@ -3030,7 +3016,7 @@ Unbekannte Struktur.</translation>
<translation><b>Routenpunkte bearbeiten</b><br/>Wählen Sie mittels der Werkzeug-Buttons eine Funktion und einen Routing-Modus. Als nächstes wählen Sie einen Punkt auf der Linie. Es können nur Punkte geändert werden, die mit einem großen Quadrat markiert sind. Schwarze Punkte sind durchs Routing erzeugte Unterpunkte.<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <location filename="../mouse/CMouseEditRte.cpp" line="105"/>
<source>route</source>
<translation>Route</translation>
</message>
@@ -3059,7 +3045,7 @@ Unbekannte Struktur.</translation>
<translation>Alle ursprünglichen Daten werden durch eine einfache Koordinatenlinie ersetzt. Alle anderen Daten sind dauerhaft verloren.</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="110"/>
<source>track</source>
<translation>Track</translation>
</message>
@@ -3131,27 +3117,27 @@ Unbekannte Struktur.</translation>
<translation><b>Elemente auf der Karte wählen</b><br/>Wählen Sie mit der linken Maustaste einen rechteckigen Bereich auf der Karte aus. Abbruch mit Rechtsklick. Die Auswahl kann durch Verschieben der Eckpunkte mit der Maus angepasst werden.</translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="99"/>
<source><b>Selected:</b><br/></source>
<translation><b>Ausgewählt:</b><br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="101"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="102"/>
<source>%1 tracks<br/></source>
<translation>%1 Tracks<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="106"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="107"/>
<source>%1 waypoints<br/></source>
<translation>%1 Wegpunkte<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="111"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="112"/>
<source>%1 routes<br/></source>
<translation>%1 Routen<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="116"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="117"/>
<source>%1 areas<br/></source>
<translation>%1 Gebiete<br/></translation>
</message>
@@ -3239,12 +3225,12 @@ y: %4 m/px</translation>
<context>
<name>CProgressDialog</name>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="40"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="46"/>
<source>Elapsed time: %1</source>
<translation>Verstrichene Zeit: %1</translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="87"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="132"/>
<source>Elapsed time: %1 seconds.</source>
<translation>Verstrichene Zeit: %1 Sekunden.</translation>
</message>
@@ -3662,7 +3648,7 @@ ist keine gültige Koordinatensystemdefinition:
<message>
<location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="434"/>
<source>create new BRouter installation</source>
- <translation>neue BRouter-Installaion erzeugen</translation>
+ <translation>neue BRouter-Installation erzeugen</translation>
</message>
<message>
<location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="442"/>
@@ -4625,14 +4611,47 @@ Zeile %2, Spalte %3:
</message>
</context>
<context>
+ <name>CTemplateWidget</name>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
+ <source>choose one...</source>
+ <translation>auswählen...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
+ <source>Hiking Tour Summary (built-in)</source>
+ <translation>Wanderung Zusammenfassung (built-in)</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
+ <source>-</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
+ <source>Template path...</source>
+ <translation>Vorlagenpfad...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
+ <source>Failed to read template file %1.</source>
+ <translation>Datei '%1' konnte nicht gelesen werden.</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
+ <source>Preview...</source>
+ <translation>Vorschau...</translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="71"/>
<source>&Color...</source>
<translation>&Farbe...</translation>
</message>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="117"/>
<source>Reset format</source>
<translation>Format zurücksetzen</translation>
</message>
@@ -4699,6 +4718,194 @@ Zeile %2, Spalte %3:
</message>
</context>
<context>
+ <name>Form</name>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
+ <source>Form</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
+ <source>Participants</source>
+ <translation>Teilnehmer</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
+ <source>Weather</source>
+ <translation>Wetter</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
+ <source>rain</source>
+ <translation>Regen</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
+ <source>sunny</source>
+ <translation>Sonne</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
+ <source>snow</source>
+ <translation>Schnee</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
+ <source>clouds</source>
+ <translation>Wolken</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
+ <source>windy</source>
+ <translation>Wind</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
+ <source>hot</source>
+ <translation>heiß</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
+ <source>warm</source>
+ <translation>warm</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
+ <source>cold</source>
+ <translation>kalt</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
+ <source>freezing</source>
+ <translation>eiskalt</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
+ <source>foggy</source>
+ <translation>neblig</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
+ <source>humid</source>
+ <translation>schwül</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
+ <source>Character</source>
+ <translation>Charakter</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
+ <source>easy hiking</source>
+ <translation>einfache Wanderung</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
+ <source>climbing</source>
+ <translation>Klettern</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
+ <source>alpine</source>
+ <translation>alpine Tour</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
+ <source>large ascend</source>
+ <translation>langer Anstieg</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
+ <source>long distance</source>
+ <translation>lange Distanz</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
+ <source>via ferrata</source>
+ <translation>Klettersteig</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
+ <source>hail/soft hail</source>
+ <translation>Hagel/Graupel</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
+ <source>Rating</source>
+ <translation>Beurteilung</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
+ <source>Rating 5 stars</source>
+ <translation>Beurteilung 5 Sterne</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
+ <source>Rating 4 stars</source>
+ <translation>Beurteilung 4 Sterne</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
+ <source>Rating 3 stars</source>
+ <translation>Beurteilung 3 Sterne</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
+ <source>Rating 2 stars</source>
+ <translation>Beurteilung 2 Sterne</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
+ <source>Rating 1 star</source>
+ <translation>Beurteilung 1 Sterne</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
+ <source>aborted</source>
+ <translation>abgebrochen</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
+ <source>Equipment</source>
+ <translation>Ausrüstung</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
+ <source>ferrata gear</source>
+ <translation>Klettersteigset</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
+ <source>night gear</source>
+ <translation>Nachtausrüstung</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
+ <source>snow shoes</source>
+ <translation>Schneeschuhe</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
+ <source>climbing gear</source>
+ <translation>Kletterausrüstung</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
+ <source>ski</source>
+ <translation>Ski</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
+ <source>camping gear</source>
+ <translation>Campingausrüstung</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
+ <source>Details</source>
+ <translation>Details</translation>
+ </message>
+</context>
+<context>
<name>IAbout</name>
<message>
<location filename="../IAbout.ui" line="14"/>
@@ -4886,8 +5093,8 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="66"/>
- <source>Square (optimized for TMS and WTMS tiles)</source>
- <translation>Quadratisch (optimal für TMS und WMTS Karten)</translation>
+ <source>Square (optimized for TMS and WMTS tiles)</source>
+ <translation>Quadratisch (optimiert für TMS und WMTS Kacheln)</translation>
</message>
</context>
<context>
@@ -5472,7 +5679,7 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<translation>Profil</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1495"/>
<source>Speed</source>
<translation>Geschw.</translation>
</message>
@@ -5562,47 +5769,42 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<translation>Trackaktivität festlegen</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
- <source>Remove Track Activity</source>
- <translation>Trackaktivität entfernen</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1400"/>
<source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
<translation>Um Trackstatistiken zu differenzieren, wählen Sie für den gesamten Track eine Aktivität aus der Liste. Oder Sie wählen einen Teil des Tracks aus und weisen diesem eine Aktivität zu.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1427"/>
<source>Points</source>
<translation>Punkte</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Time</source>
<translation>Zeit</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ele.</source>
<translation>Höhe</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Delta</source>
<translation>Delta</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Dist.</source>
<translation>Entf.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1500"/>
<source>Slope</source>
<translation>Neigung</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1515"/>
<source>Position</source>
<translation>Position</translation>
</message>
@@ -5685,22 +5887,22 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
<translation>Farbe</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1505"/>
<source>Ascent</source>
<translation>Anstieg</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1510"/>
<source>Descent</source>
<translation>Abstieg</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1524"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1561"/>
<source>Hist.</source>
<translation>Historie</translation>
</message>
@@ -6367,70 +6569,70 @@ It is either a new item or it has been deleted in the database by someone else.<
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source>Save project?</source>
<translation>Projekt speichern?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation><h3>%1</h3>Das Projekt wurde geändert. Speichern, bevor es geschlossen wird?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="329"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="356"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation>%1: Tracks und Wegpunkte verknüpfen.</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="366"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation><h3>%1</h3>Hat das zu lange gedauert? Wollen Sie die Verknüpfung von Tracks und Wegpunkten auch in Zukunft für dieses Projekt überspringen?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="340"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="367"/>
<source>Canceled correlation...</source>
<translation>Verknüpfung abgebrochen...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="385"/>
- <location filename="../gis/prj/IGisProject.cpp" line="442"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="412"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="469"/>
<source>Save "%1" to...</source>
<translation>Speichere "%1" nach...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="527"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="554"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Dateiname: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="532"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="559"/>
<source>Waypoints: %1</source>
<translation>Wegpunkte: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="536"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="563"/>
<source>Tracks: %1</source>
<translation>Tracks: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="540"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="567"/>
<source>Routes: %1</source>
<translation>Routen: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="544"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="571"/>
<source>Areas: %1</source>
<translation>Gebiete: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="664"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="691"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Sind Sie sicher, dass Sie '%1' aus dem Projekt '%2' löschen wollen? </translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="665"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="692"/>
<source>Delete...</source>
<translation>Löschen...</translation>
</message>
@@ -6638,360 +6840,370 @@ Dateiname: %1</translation>
<translation>Fenster</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="112"/>
+ <location filename="../IMainWindow.ui" line="113"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="120"/>
+ <location filename="../IMainWindow.ui" line="121"/>
<source>Project</source>
<translation>Projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="131"/>
+ <location filename="../IMainWindow.ui" line="132"/>
<source>Tool</source>
<translation>Werkzeug</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="156"/>
+ <location filename="../IMainWindow.ui" line="157"/>
<source>Maps</source>
<translation>Karten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="199"/>
+ <location filename="../IMainWindow.ui" line="200"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Dig. Höhenmodell (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="238"/>
+ <location filename="../IMainWindow.ui" line="239"/>
<source>Data</source>
<translation>Daten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="256"/>
+ <location filename="../IMainWindow.ui" line="257"/>
<source>Route</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
+ <location filename="../IMainWindow.ui" line="287"/>
<source>Toolbar</source>
<translation>Werkzeugleiste</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="301"/>
- <location filename="../IMainWindow.ui" line="304"/>
+ <location filename="../IMainWindow.ui" line="302"/>
+ <location filename="../IMainWindow.ui" line="305"/>
<source>Add Map View</source>
<translation>Kartenansicht hinzufügen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="308"/>
<source>Ctrl+T</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="322"/>
+ <location filename="../IMainWindow.ui" line="323"/>
<source>Show Scale</source>
<translation>Maßstab</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="335"/>
<source>Setup Map Font</source>
<translation>Kartenfont einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="350"/>
<source>Show Grid</source>
<translation>Gitter</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="353"/>
<source>Ctrl+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="364"/>
+ <location filename="../IMainWindow.ui" line="365"/>
<source>Setup Grid</source>
<translation>Gitter einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="368"/>
<source>Ctrl+Alt+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="383"/>
<source>Flip Mouse Wheel</source>
<translation>Mausrad umdrehen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="394"/>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="395"/>
+ <location filename="../IMainWindow.ui" line="398"/>
<source>Setup Map Paths</source>
<translation>Kartenverzeichnisse angeben</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="413"/>
<source>POI Text</source>
<translation>POI Text</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="428"/>
<source>Night / Day</source>
<translation>Nacht / Tag</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="443"/>
<source>Map Tool Tip</source>
<translation>Kartentooltip</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="445"/>
+ <location filename="../IMainWindow.ui" line="446"/>
<source>Ctrl+I</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="457"/>
+ <location filename="../IMainWindow.ui" line="458"/>
<source>Setup DEM Paths</source>
<translation>DEM Verzeichnisse angeben</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="470"/>
<source>About</source>
<translation>Über</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
+ <location filename="../IMainWindow.ui" line="482"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="485"/>
<source>F1</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="497"/>
+ <location filename="../IMainWindow.ui" line="500"/>
<source>Setup Map View</source>
<translation>Kartenansicht einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="644"/>
<source>VRT Builder</source>
<translation>VRT Builder</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="647"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>Eine graphische Benutzerschnittstelle zu gdalbuildvrt </translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="659"/>
<source>Store Map View</source>
<translation>Kartenansicht speichern</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="662"/>
<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="673"/>
+ <location filename="../IMainWindow.ui" line="674"/>
<source>Load Map View</source>
<translation>Kartenansicht laden</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="677"/>
<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="691"/>
+ <location filename="../IMainWindow.ui" line="692"/>
<source>Ext. Profile</source>
<translation>Erw. Profil</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="695"/>
<source>Ctrl+E</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="707"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="710"/>
<source>Ctrl+Q</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="722"/>
<source>Clone Map View</source>
<translation>Kartenansicht klonen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="724"/>
+ <location filename="../IMainWindow.ui" line="725"/>
<source>Ctrl+Shift+T</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="737"/>
<source>Create Routino Database</source>
<translation>Routino Datenbank erstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="748"/>
+ <location filename="../IMainWindow.ui" line="749"/>
<source>Save(Print) Map Screenshot</source>
<translation>Kartenausschnitt speichern (drucken)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="752"/>
<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="754"/>
+ <location filename="../IMainWindow.ui" line="755"/>
<source>Ctrl+P</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="767"/>
<source>Setup Coord. Format</source>
<translation>Koordinatenformat einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="769"/>
+ <location filename="../IMainWindow.ui" line="770"/>
<source>Change the format coordinates are displayed</source>
<translation>Ändert das Format der angezeigten Koordinaten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="782"/>
<source>Setup Map Background</source>
<translation>Kartenhintergrund einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="794"/>
<source>Setup Waypoint Icons</source>
<translation>Wegpunktsymbole konfigurieren</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="796"/>
+ <location filename="../IMainWindow.ui" line="797"/>
<source>Setup path to custom icons</source>
<translation>Pfad zu individuellen Symbolen einrichten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="805"/>
+ <location filename="../IMainWindow.ui" line="806"/>
<source>Close Tab</source>
<translation>Reiter schließen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="808"/>
+ <location filename="../IMainWindow.ui" line="809"/>
<source>Ctrl+W</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="817"/>
+ <location filename="../IMainWindow.ui" line="818"/>
<source>Quickstart Help</source>
<translation>Schnellstartanleitung</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="826"/>
+ <location filename="../IMainWindow.ui" line="827"/>
<source>Setup Toolbar</source>
<translation>Werkzeugleiste einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="838"/>
+ <location filename="../IMainWindow.ui" line="839"/>
<source>Toggle Docks</source>
<translation>Fenster umschalten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="841"/>
+ <location filename="../IMainWindow.ui" line="842"/>
<source>Toggle visibility of dockable windows</source>
<translation>Sichtbarkeit der andockbaren Fenster umschalten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="844"/>
+ <location filename="../IMainWindow.ui" line="845"/>
<source>Ctrl+D</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="511"/>
+ <location filename="../IMainWindow.ui" line="854"/>
+ <source>Full Screen</source>
+ <translation>Vollbild</translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="857"/>
+ <source>F11</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="512"/>
<source>Load GIS Data</source>
<translation>GIS Daten laden</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="515"/>
<source>Load projects from file</source>
<translation>Lade Datei als Projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="518"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="529"/>
+ <location filename="../IMainWindow.ui" line="530"/>
<source>Save All GIS Data</source>
<translation>Alle GIS Daten speichern</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="533"/>
<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="535"/>
+ <location filename="../IMainWindow.ui" line="536"/>
<source>Ctrl+S</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="547"/>
+ <location filename="../IMainWindow.ui" line="548"/>
<source>Setup Time Zone</source>
<translation>Zeitzone einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="560"/>
<source>Add empty project</source>
<translation>Leeres Projekt hinzufügen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="575"/>
<source>Search Google</source>
<translation>Mit Google suchen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="587"/>
<source>Close all projects</source>
<translation>Alle Projekte schließen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="589"/>
+ <location filename="../IMainWindow.ui" line="590"/>
<source>F8</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="602"/>
<source>Setup Units</source>
<translation>Einheiten einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="614"/>
<source>Setup Workspace</source>
<translation>Arbeitsplatz konfigurieren</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="617"/>
<source>Setup save on exit.</source>
<translation>Speichert Einstellungen beim Beenden.</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="629"/>
<source>Import Database from QLandkarte</source>
<translation>Datenbankimport aus QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="632"/>
<source>Import QLandkarte GT database</source>
<translation>QLandkarte GT Datenbank importieren</translation>
</message>
@@ -7052,6 +7264,24 @@ Keine Lust die Anleitung zu lesen!</translation>
</message>
</context>
<context>
+ <name>IMapOnline</name>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="41"/>
+ <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
+ <translation>Diese Karte benötigt OpenSSL. Aufgrund rechtlicher Beschränkungen in einigen Ländern, ist OpenSSL nicht Bestandteil von QMapShack. Sie können sich auf der <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> nach Binäries umsehen. Sie müssen die Dateien libeay32.dll and ssleay32.dll in das QMapShack Programmverzeichnis kopieren.</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="47"/>
+ <source>Error...</source>
+ <translation>Fehler...</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="98"/>
+ <source><b>%1</b>: %2 tiles pending<br/></source>
+ <translation><b>%1</b>: warte auf %2 Kacheln<br/></translation>
+ </message>
+</context>
+<context>
<name>IMapPathSetup</name>
<message>
<location filename="../map/IMapPathSetup.ui" line="14"/>
@@ -7183,28 +7413,72 @@ Keine Lust die Anleitung zu lesen!</translation>
<translation></translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="22"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
+ <source>Advanced Options</source>
+ <translation>Erweiterte Optionen</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <source>Source No Data (-srcnodata)</source>
+ <translation>Kein Datenwert Quelle (-srcndata)</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="46"/>
+ <source>Target No Data (-vrtnodata)</source>
+ <translation>Kein Datenwert Zieldatei (-vrtnodata)</translation>
+ </message>
+ <message>
<location filename="../tool/IMapVrtBuilder.ui" line="56"/>
+ <source>Target Projection (-a_srs)</source>
+ <translation>Projektion Zieldatei</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="63"/>
+ <source>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</source>
+ <translation>Diese Optionen sind für spezielle Fälle. Normalerweise werden sie leer gelassen. Für mehr Information lesen Sie die GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Hilfe</a>.</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
+ <source>1. Select one or multiple source files.
+2. Select a file name for the target VRT file.
+3. Press "Start" button.
+
+Tip:
+* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
+* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
+* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
+ <translation>1. Wählen Sie eine oder mehrere Quelldateien.
+2. Geben Sie einen Namen für die VRT Zieldatei an.
+3. Drücken Sie "Start"
+
+Tipp:
+* Wenn Sie mehrere Dateien haben, verschieben Sie sie in einnen Unterordner des Kartenpfades. Erstellen Sie die VRT Datei im Kartenpfad.
+* Benützen Sie die erweiterten Optionen, um einen "keine Daten" Wert anzugeben, wenn ihre Quelldateien keinen haben und keinen rechteckigen Bereich abdecken. Gebiete ohne Karte werden dann transparent dargestellt.
+* Mit der "-a_srs" Option können sie eine Projektion/Datum vorgeben, wenn dieses in den Quellen fehlt. Damit werden die Daten aber NICHT neu projiziert. </translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="139"/>
<source>...</source>
<translation></translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="156"/>
<source>Select source files:</source>
<translation>Quelldateien auswählen:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="79"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="121"/>
<source>Target Filename:</source>
<translation>Zieldatei auswählen:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="86"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="128"/>
<source>-</source>
<translation></translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="95"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="20"/>
<source>Start</source>
<translation></translation>
</message>
@@ -7949,7 +8223,7 @@ sein</translation>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="89"/>
<source>Move points. (Ctrl+M)</source>
- <translation>Punkte verschieben. (Ctrl+M)</translation>
+ <translation>Punkte verschieben. (Strg+M)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="99"/>
@@ -7959,7 +8233,7 @@ sein</translation>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="115"/>
<source>Add new points. (Ctrl++)</source>
- <translation>Punkte hinzufügen. (Ctrl++)</translation>
+ <translation>Punkte hinzufügen. (Strg++)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="125"/>
@@ -7969,7 +8243,7 @@ sein</translation>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="138"/>
<source>Select a range of points. (Ctrl+R)</source>
- <translation>Einen Punktebereich wählen (Ctrl+R)</translation>
+ <translation>Einen Punktebereich wählen (Strg+R)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="148"/>
@@ -7977,19 +8251,9 @@ sein</translation>
<translation></translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
- <source>Delete a point. (Ctrl+D)</source>
- <translation>Einen Punkt löschen (Ctrl+D)</translation>
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
- <source>Ctrl+D</source>
- <translation></translation>
- </message>
- <message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="215"/>
<source>No auto-routing or line snapping (Ctrl+O)</source>
- <translation>Kein Auto-Routing oder Fangen an Linie (Ctrl+O)</translation>
+ <translation>Kein Auto-Routing oder Fangen an Linie (Strg+O)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="225"/>
@@ -7999,7 +8263,7 @@ sein</translation>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="238"/>
<source>Use auto-routing to between points. (Ctrl+A)</source>
- <translation>Auto-Routing zwischen Punkten benutzen. (Ctrl+A)</translation>
+ <translation>Auto-Routing zwischen Punkten benutzen. (Strg+A)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="248"/>
@@ -8009,7 +8273,7 @@ sein</translation>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="261"/>
<source>Snap line along lines of a vector map. (Ctrl+V)</source>
- <translation>Fängt die Linie entlang Linien einer Vektorkarte. (Ctrl+V)</translation>
+ <translation>Fängt die Linie entlang Linien einer Vektorkarte. (Strg+V)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="92"/>
@@ -8022,6 +8286,16 @@ sein</translation>
<translation></translation>
</message>
<message>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
+ <source>Delete a point. (Ctrl+-)</source>
+ <translation>Punkte löschen (Strg+-)</translation>
+ </message>
+ <message>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
+ <source>Ctrl+-</source>
+ <translation></translation>
+ </message>
+ <message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
<source>0</source>
<translation></translation>
@@ -8160,8 +8434,8 @@ sein</translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
- <source>Select an activity for the selected range.</source>
- <translation>Wählen Sie eine Aktivität für den ausgewählten Bereich.</translation>
+ <source>Set an activity for the selected range.</source>
+ <translation>Für den ausgewählten Bereich eine Aktivität festlegen.</translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
@@ -8260,12 +8534,13 @@ sein</translation>
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
<location filename="../mouse/IScrOptSelect.ui" line="142"/>
- <location filename="../mouse/IScrOptSelect.ui" line="196"/>
- <location filename="../mouse/IScrOptSelect.ui" line="225"/>
- <location filename="../mouse/IScrOptSelect.ui" line="285"/>
- <location filename="../mouse/IScrOptSelect.ui" line="312"/>
- <location filename="../mouse/IScrOptSelect.ui" line="339"/>
- <location filename="../mouse/IScrOptSelect.ui" line="366"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="156"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="210"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="239"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="299"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="326"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="353"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="380"/>
<source>...</source>
<translation></translation>
</message>
@@ -8286,36 +8561,41 @@ sein</translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="139"/>
+ <source>Set an activity for all selected tracks.</source>
+ <translation>Für alle ausgewählten Tracks eine Aktivität festlegen.</translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="153"/>
<source>Delete all selected items.</source>
<translation>Löscht alle gewählten Elemente.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="193"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="207"/>
<source>Select all items that intersect the selected area.</source>
<translation>Wählt alle Elemente, die den gewählten Bereich schneiden.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="222"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="236"/>
<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"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="296"/>
<source>Add tracks to selection.</source>
<translation>Fügt Tracks zur Auswahl hinzu.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="309"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="323"/>
<source>Add waypoints to selection.</source>
<translation>Fügt Wegpunkte zur Auswahl hinzu.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="336"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="350"/>
<source>Add routes to selection.</source>
<translation>Fügt Routen zur Auswahl hinzu.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="363"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="377"/>
<source>Add areas to selection.</source>
<translation>Fügt Gebiete zur Auswahl hinzu.</translation>
</message>
@@ -8382,6 +8662,11 @@ sein</translation>
* einen langen Track in Etappen zerteilen</translation>
</message>
<message>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
+ <source>Set an activity for the complete track.</source>
+ <translation>Für den ganzen Track eine Aktivität festlegen.</translation>
+ </message>
+ <message>
<location filename="../gis/trk/IScrOptTrk.ui" line="43"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="57"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="71"/>
@@ -8392,16 +8677,17 @@ sein</translation>
<location filename="../gis/trk/IScrOptTrk.ui" line="151"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="170"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="184"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="198"/>
<source>...</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
<source>Copy track together with all attached waypoints into another project.</source>
<translation>Kopiert den Track zusammen mit allen verknüpften Wegpunkten.</translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="210"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="224"/>
<source>TextLabel</source>
<translation>Bezeichnung</translation>
</message>
@@ -8913,6 +9199,34 @@ sein</translation>
</message>
</context>
<context>
+ <name>ITemplateWidget</name>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="14"/>
+ <source>Insert Template...</source>
+ <translation>Vorlage einfügen...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="32"/>
+ <source>Templates</source>
+ <translation>Vorlagen</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="42"/>
+ <source>Select a path with your own templates.</source>
+ <translation>Wählen Sie einen Pfad mit ihren eigenen Vorlagen aus.</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="45"/>
+ <source>...</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="77"/>
+ <source>Preview</source>
+ <translation>Vorschau</translation>
+ </message>
+</context>
+<context>
<name>ITextEditWidget</name>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="14"/>
@@ -8920,264 +9234,279 @@ sein</translation>
<translation>Text bearbeiten...</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="25"/>
- <location filename="../widgets/ITextEditWidget.ui" line="331"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="45"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="351"/>
<source>Undo</source>
<translation>Rückgängig</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="354"/>
<source>Ctrl+Z</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="38"/>
- <location filename="../widgets/ITextEditWidget.ui" line="343"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="58"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="363"/>
<source>Redo</source>
<translation>Wiederherstellen</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="346"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="366"/>
<source>Ctrl+Shift+Z</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="51"/>
- <location filename="../widgets/ITextEditWidget.ui" line="355"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="71"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="375"/>
<source>Cut</source>
<translation>Ausschneiden</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="358"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="378"/>
<source>Ctrl+X</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="64"/>
- <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="84"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="387"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="370"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="390"/>
<source>Ctrl+C</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="77"/>
- <location filename="../widgets/ITextEditWidget.ui" line="375"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="97"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="395"/>
<source>Paste</source>
<translation>Einfügen</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="25"/>
+ <source>Templ.</source>
+ <translation>Vorl.</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="120"/>
<source>A:L</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="133"/>
<source>A:C</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="146"/>
<source>A:R</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="159"/>
<source>A:B</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="192"/>
<source>B</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="205"/>
<source>I</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="218"/>
<source>U</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="238"/>
<source>C</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="285"/>
<source>Standard</source>
<translation>Standard</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="290"/>
<source>Bullet List (Disc)</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="295"/>
<source>Bullet List (Circle)</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="300"/>
<source>Bullet List (Square)</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="305"/>
<source>Ordered List (Decimal)</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="310"/>
<source>Ordered List (Alpha lower)</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="315"/>
<source>Ordered List (Alpha upper)</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="320"/>
<source>Ordered List (Roman lower)</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="325"/>
<source>Ordered List (Roman upper)</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="378"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="398"/>
<source>Ctrl+V</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="390"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="410"/>
<source>Align Left</source>
<translation>Linksbündig</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="393"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="413"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="405"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="425"/>
<source>Align Right</source>
<translation>Rechtsbündig</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="408"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="428"/>
<source>Ctrl+R</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="420"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="440"/>
<source>Align Center</source>
<translation>Zentriert</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="423"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="443"/>
<source>Ctrl+E</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="435"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="455"/>
<source>Align Block</source>
<translation>Blocksatz</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="438"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="458"/>
<source>Ctrl+J</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="450"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="470"/>
<source>Underline</source>
<translation>Unterstreichen</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="453"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="473"/>
<source>Ctrl+U</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="465"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="485"/>
<source>Bold</source>
<translation>Fett</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="468"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="488"/>
<source>Ctrl+B</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="480"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="500"/>
<source>Italic</source>
<translation>Kursiv</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="483"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="503"/>
<source>Ctrl+I</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="515"/>
<source>Plain</source>
<translation>Schlicht</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="518"/>
<source>Reset the text's format before pasting</source>
<translation>Das Textformat wird entfernt bevor der Text eingefügt wird</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="503"/>
- <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="523"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="526"/>
<source>Select All</source>
<translation>Alles auswählen</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="529"/>
<source>Ctrl+A</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="514"/>
- <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="534"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="537"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="522"/>
- <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="542"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="545"/>
<source>Reset Font</source>
<translation>Font zurücksetzen</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="530"/>
- <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="550"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="553"/>
<source>Reset Layout</source>
<translation>Layout zurücksetzen</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="565"/>
<source>Normal</source>
<translation>Normal</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="568"/>
<source>Paste without resetting the text's format</source>
<translation>Einfügen ohne das Format zurückzusetzen</translation>
</message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="577"/>
+ <source>Insert From Template</source>
+ <translation>Aus Vorlage einfügen</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="580"/>
+ <source>Create text from template.</source>
+ <translation>Text aus einer Vorlage erzeugen.</translation>
+ </message>
</context>
<context>
<name>ITextEditWidgetSelMenu</name>
@@ -9257,6 +9586,11 @@ sein</translation>
<source>Setup Toolbar</source>
<translation>Werkzeugleiste einstellen</translation>
</message>
+ <message>
+ <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
+ <source>Toolbar is visible in Fullscreen-mode</source>
+ <translation>Werkzeugleiste ist im Vollbildmodus sichtbar</translation>
+ </message>
</context>
<context>
<name>IToolShell</name>
diff --git a/src/locale/qmapshack_es.ts b/src/locale/qmapshack_es.ts
index 9e77bd2..0039761 100644
--- a/src/locale/qmapshack_es.ts
+++ b/src/locale/qmapshack_es.ts
@@ -6,113 +6,116 @@
<message>
<location filename="../CAbout.cpp" line="38"/>
<source>%1 (API V%2, expected V%3)</source>
- <translation type="unfinished"></translation>
+ <translation>%1 (API V%2, se esperaba V%3)</translation>
</message>
<message>
<location filename="../CAbout.cpp" line="42"/>
<source>%1 (API V%2)</source>
- <translation type="unfinished"></translation>
+ <translation>%1 (API V%2)</translation>
</message>
<message>
<location filename="../CAbout.cpp" line="49"/>
<source>(no DBUS: device detection and handling disabled)</source>
- <translation>detección y manipulación de dispositivos desactivados</translation>
+ <translation>(no DBUS: detección y manipulación de dispositivos desactivados)</translation>
</message>
</context>
<context>
<name>CActivityTrk</name>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="51"/>
<source>Foot</source>
<translation>A pié</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="59"/>
<source>Bicycle</source>
<translation>Bicicleta</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="67"/>
<source>Motor Bike</source>
<translation>Moto</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="75"/>
<source>Car</source>
<translation>Coche</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="83"/>
<source>Cable Car</source>
<translation>Teleférico</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="91"/>
<source>Swim</source>
<translation>Natación</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="99"/>
<source>Ship</source>
<translation>Barco</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="115"/>
<source>Ski/Winter</source>
<translation>Esquí</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
+ <source>No Activity</source>
+ <translation>Sin Actividad</translation>
+ </message>
+ <message>
<location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
+ <source>Total</source>
+ <translation>Total</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
<source>Ascent:</source>
<translation>Ascenso:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="329"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="372"/>
<source>Descent:</source>
<translation>Descenso:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="107"/>
<source>Aeronautics</source>
<translation>Aeronáutica</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="307"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+ <source>Public Transport</source>
+ <translation>Transporte Público</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
<source>Distance:</source>
<translation>Distancia:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="396"/>
<source>Speed Moving:</source>
<translation>Velocidad en movimiento:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="351"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="420"/>
<source>Speed Total:</source>
<translation>Velocidad Total:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="275"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="362"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="444"/>
<source>Time Moving:</source>
<translation>Tiempo en movimiento:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="277"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="468"/>
<source>Time Total:</source>
<translation>Tiempo Total:</translation>
</message>
- <message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="414"/>
- <source>None</source>
- <translation>Ninguno</translation>
- </message>
</context>
<context>
<name>CCanvas</name>
@@ -132,7 +135,7 @@
<message>
<location filename="../widgets/CColorChooser.cpp" line="51"/>
<source>Esc.</source>
- <translation type="unfinished"></translation>
+ <translation>Esc.</translation>
</message>
</context>
<context>
@@ -251,43 +254,43 @@
<message>
<location filename="../gis/db/CDBItem.cpp" line="91"/>
<source>%1 min.</source>
- <translation type="unfinished"></translation>
+ <translation>%1 min.</translation>
</message>
<message>
<location filename="../gis/db/CDBItem.cpp" line="95"/>
<source>%1 h</source>
- <translation type="unfinished"></translation>
+ <translation>%1 h</translation>
</message>
<message>
<location filename="../gis/db/CDBItem.cpp" line="99"/>
<source>%1 days</source>
- <translation type="unfinished">%1 dias</translation>
+ <translation>%1 dias</translation>
</message>
</context>
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
<source>Failed to load...</source>
<translation>Falló al cargar...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <location filename="../gis/db/CDBProject.cpp" line="114"/>
<source>Can't load file "%1" . It will be skipped.</source>
<translation>No se puede cargar el archivo "%1" . Se omitirá.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
<source>Project already in database...</source>
<translation>Proyecto ya en base de datos ...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <location filename="../gis/db/CDBProject.cpp" line="128"/>
<source>The project "%1" has already been imported into the database. It will be skipped.</source>
<translation>El proyecto "%1" Ya se ha importado a la base de datos. Se omitirá.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="278"/>
+ <location filename="../gis/db/CDBProject.cpp" line="279"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -296,61 +299,61 @@ To solve this conflict you can create and save a clone, force your version or dr
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"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Conflict with database...</source>
<translation>Conflicto con la base de datos...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="285"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Clone && Save</source>
<translation>Duplicar y Guardar</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="286"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Force Save</source>
<translation>Forzar guardado</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="287"/>
+ <location filename="../gis/db/CDBProject.cpp" line="288"/>
<source>Take remote</source>
<translation>Toma remota</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="569"/>
+ <location filename="../gis/db/CDBProject.cpp" line="572"/>
<source>Missing folder...</source>
<translation>Falta la carpeta</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="570"/>
+ <location filename="../gis/db/CDBProject.cpp" line="573"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation>Error al guardar el proyecto. La carpeta se ha eliminado de la base de datos.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="577"/>
+ <location filename="../gis/db/CDBProject.cpp" line="580"/>
<source>Save ...</source>
<translation>Guardar...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>There was an unexpected database error:
%1</source>
<translation>Se produjo un error de base de datos inesperado:
-% 1</translation>
+%1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="755"/>
+ <location filename="../gis/db/CDBProject.cpp" line="760"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation>El proyecto '%1' Está a punto de actualizarse desde la base de datos. Sin embargo, hay cambios no guardados.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="756"/>
+ <location filename="../gis/db/CDBProject.cpp" line="761"/>
<source>Save changes?</source>
<translation>¿Guardar cambios?</translation>
</message>
@@ -436,7 +439,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<name>CDetailsPrj</name>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="267"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="774"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>none</source>
<translation>ninguna</translation>
</message>
@@ -446,60 +449,60 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<translation>Creando diario...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="437"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="419"/>
<source><h2>Waypoints</h2></source>
<translation>Waypoints</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="444"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="470"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="591"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="709"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="739"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="426"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="452"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="573"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="691"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="721"/>
<source>Info</source>
<translation>Información</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="471"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="427"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="574"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="692"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="722"/>
<source>Comment</source>
<translation>Comentario</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="463"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
<source><h2>Tracks</h2></source>
<translation>Tracks</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>From Start</source>
<translation>Desde el inicio</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To Next</source>
<translation>Al siguiente</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To End</source>
<translation>Al Final</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="613"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
<source>distance: </source>
<translation>Distancia:</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="623"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
<source>ascent: </source>
<translation>Ascenso:</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="702"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
<source><h2>Areas</h2></source>
<translation>Áreas</translation>
</message>
@@ -519,39 +522,39 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<translation><b>Resumen de todos los tracks del proyecto</b><br/></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="633"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
<source>descent: </source>
<translation>descenso:</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="732"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
<source><h2>Routes</h2></source>
<translation><h2>Rutas</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Edit name...</source>
<translation>Editar nombre...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Enter new project name.</source>
<translation>Introducir nuevo nombre de proyecto.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Edit keywords...</source>
<translation>Editar etiquetas...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Enter keywords.</source>
<translation>Introducir etiquetas.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="915"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="897"/>
<source>Print Diary</source>
<translation>Imprimir Diario</translation>
</message>
@@ -559,45 +562,35 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<context>
<name>CDetailsTrk</name>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
<source>Reduce visible track points</source>
<translation>Reducir puntos visibles del track</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
<source>Change elevation of track points</source>
<translation>Cambiar altitud de puntos del track</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
<source>Change timestamp of track points</source>
<translation>Cambiar fecha/hora de puntos del track</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
<source>Miscellaneous</source>
<translation>Diversos</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
<source>Color</source>
<translation>Color</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>Reset activities...</source>
- <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>Esto eliminará las actividades del track. ¿Proceder?</translation>
- </message>
</context>
<context>
<name>CDetailsWpt</name>
@@ -610,7 +603,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<context>
<name>CDeviceGarmin</name>
<message>
- <location filename="../device/CDeviceGarmin.cpp" line="265"/>
+ <location filename="../device/CDeviceGarmin.cpp" line="272"/>
<source>Picture%1</source>
<translation>foto%1</translation>
</message>
@@ -730,7 +723,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<message>
<location filename="../gis/fit/decoder/CFitDecoder.cpp" line="132"/>
<source>FIT decoding error: unexpected end of file %1.</source>
- <translation>FIT error de descodificación: final inesperado del archivo% 1.</translation>
+ <translation>FIT error de descodificación: final inesperado del archivo %1.</translation>
</message>
</context>
<context>
@@ -738,7 +731,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<message>
<location filename="../gis/fit/decoder/CFitFieldBuilder.cpp" line="77"/>
<source>FIT decoding error: unknown base type %1.</source>
- <translation>Error de descodificación FIT: tipo de base desconocido% 1.</translation>
+ <translation>Error de descodificación FIT: tipo de base desconocido %1.</translation>
</message>
</context>
<context>
@@ -759,7 +752,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<message>
<location filename="../gis/fit/decoder/CFitHeaderState.cpp" line="69"/>
<source>FIT decoding error: protocol %1 version not supported.</source>
- <translation>Error de descodificación FIT: la versión del protocolo% 1 no es compatible.</translation>
+ <translation>Error 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"/>
@@ -772,12 +765,12 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<message>
<location filename="../gis/fit/CFitProject.cpp" line="61"/>
<source>Failed to load file %1...</source>
- <translation>Falló al cargar archivo %1</translation>
+ <translation>Falló al cargar archivo %1...</translation>
</message>
<message>
<location filename="../gis/fit/CFitProject.cpp" line="93"/>
<source>Failed to open FIT file %1.</source>
- <translation>Falló al cargar archivo FIT %1</translation>
+ <translation>Falló al cargar archivo FIT %1.</translation>
</message>
</context>
<context>
@@ -900,7 +893,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<message>
<location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
<source>track</source>
- <translation type="unfinished"></translation>
+ <translation>track</translation>
</message>
<message>
<location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
@@ -930,7 +923,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<message>
<location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
<source>Length: -</source>
- <translation>Longitud:</translation>
+ <translation>Longitud: -</translation>
</message>
<message>
<location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
@@ -941,7 +934,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<message>
<location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
<source>Time: -</source>
- <translation>Tiempo:</translation>
+ <translation>Tiempo: -</translation>
</message>
<message>
<location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
@@ -972,7 +965,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<context>
<name>CGisItemTrk</name>
<message>
- <location filename="../gis/fit/serialization.cpp" line="246"/>
+ <location filename="../gis/fit/serialization.cpp" line="285"/>
<source>FIT file %1 contains no GPS data.</source>
<translation>Archivo FIT %1 no contiene datos GPS.</translation>
</message>
@@ -1013,252 +1006,252 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<translation>Se cambiaron los puntos del track, y descartados todos los datos previos.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="305"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
<source>Length: %1 %2</source>
<translation>Longitud: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="312"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation>, %1%2 %3, %4%5 %6</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="346"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
<source>Start: %1</source>
<translation>Inicio: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="350"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
<source>Start: -</source>
<translation>Inicio: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="356"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
<source>End: %1</source>
<translation>Final: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="360"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
<source>End: -</source>
<translation>Final: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="364"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
<source>Points: %1 (%2)</source>
<translation>Puntos: %1 (%2)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="368"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
<source>Invalid elevations!</source>
<translation>¡Datos de altitud invalidos!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
<source>Invalid timestamps!</source>
<translation>¡Marcas de tiempo no válidas!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="378"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
<source>Invalid positions!</source>
<translation>¡Posiciones invalidas!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="387"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
<source>Activities: %1</source>
<translation>Actividades: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="495"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
<source>Index: %1</source>
<translation>Indice: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="499"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
<source>Index: visible %1, total %2</source>
<translation>Indice: visible %1. total %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="510"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
<source>Ele.: %1 %2</source>
<translation>Altitud: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="513"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
<source> slope: %1%3 (%2%)</source>
<translation> pendiente: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="518"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
<source> speed: %1%2</source>
<translation> velocidad: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="546"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
<source>... and %1 tags not displayed</source>
<translation>Y %1 etiquetas no mostradas</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
<source>Distance: - (-)</source>
<translation>Distancia: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="559"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source>Moving: - (-)</source>
<translation>En movimiento: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
<source>track</source>
- <translation type="unfinished"></translation>
+ <translation>track</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
<source>Hide point %1.</source>
<translation>Ocultar punto %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
<source>Hide points %1..%2.</source>
<translation>Ocultar puntos %1..%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="582"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
<source> Moving: %1%2 (%3%)</source>
<translation> En movimiento: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
<source>, %1%2</source>
- <translation type="unfinished"></translation>
+ <translation>, %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
<source> Time: %1%2</source>
<translation>Tiempo: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
<source>, %1-, %2-</source>
- <translation type="unfinished"></translation>
+ <translation>, %1-, %2-</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="324"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
<source>Time: %1, Speed: %2 %3</source>
<translation>Tiempo: %1, Velocidad: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="328"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
<source>Time: -, Speed: -</source>
<translation>Tiempo: -, Velocidad: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation>En movimiento: %1, Velocidad: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
<source>Moving: -, Speed: -</source>
<translation>En movimiento: -, Velocidad: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="556"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
<source>Ascent: - (-)</source>
<translation>Ascenso: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="557"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
<source>Descent: - (-)</source>
<translation>Descenso: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="564"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
<source>Ascent: %1%2 (%3%)</source>
<translation>Ascenso: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="570"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
<source> Descent: %1%2 (%3%)</source>
<translation> Descenso: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
<source>Distance: %1%2 (%3%)</source>
<translation>Distancia: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Ascent: -</source>
<translation>Ascenso: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Descent: -</source>
<translation>Descenso: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
<source>Ascent: %1%2</source>
<translation>Ascenso: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
<source> Descent: %1%2</source>
<translation>Descenso: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
<source>Distance: %1%2</source>
<translation>Distancia: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
<source>Permanently removed points %1..%2</source>
<translation>Puntos eliminados definitivamente %1..%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
<source>Show points.</source>
<translation>Mostrar puntos.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
<source>Changed name</source>
<translation>Se cambió el nombre</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
<source>Changed comment</source>
<translation>Se cambió el comentario</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
<source>Changed description</source>
<translation>Se cambió la descripción</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
<source>Changed links</source>
<translation>Se cambió el enlace</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
<source>Changed elevation of point %1 to %2 %3</source>
<translation>Se cambió altitud de los puntos %1 a %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2041"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
<source>Changed activity to '%1' for complete track.</source>
<translation>Actividad cambiada a '%1' para todo el track.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation>Actividad cambiada a '%1' para el rango (%2..%3).</translation>
</message>
@@ -1584,7 +1577,7 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="117"/>
<source>Save</source>
<translation>Guardar</translation>
</message>
@@ -1594,110 +1587,120 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<translation>Editar..</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="123"/>
+ <location filename="../gis/CGisListWks.cpp" line="126"/>
<source>Close</source>
<translation>Cerrar</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
+ <location filename="../gis/CGisListWks.cpp" line="135"/>
<source>Update Project on Device</source>
<translation>Actualizar Proyecto en Dsipositivo</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="146"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Edit...</source>
<translation>Editar...</translation>
</message>
<message>
<location filename="../gis/CGisListWks.cpp" line="102"/>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="150"/>
<source>Copy to...</source>
<translation>Copiar a...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <source>Autom. Save</source>
+ <translation>Guardado Automático</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="118"/>
<source>Save as...</source>
<translation>Guardar como...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="159"/>
<source>Copy Track with Waypoints</source>
<translation>Copiar tracks y waypoints</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="167"/>
<source>Show Bubble</source>
<translation>Mostrar burbuja de texto</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="165"/>
+ <location filename="../gis/CGisListWks.cpp" line="169"/>
<source>Move Waypoint</source>
<translation>Mover Waypoint</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <location filename="../gis/CGisListWks.cpp" line="170"/>
<source>Proj. Waypoint...</source>
<translation>Proyectar Waypoint...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Route Instructions</source>
<translation>Instrucciones de ruta</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="180"/>
<source>Calculate Route</source>
<translation>Calcular ruta</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="181"/>
<source>Reset Route</source>
<translation>Recalcular ruta</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="178"/>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Edit Route</source>
<translation>Editar ruta</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="179"/>
+ <location filename="../gis/CGisListWks.cpp" line="183"/>
<source>Convert to Track</source>
<translation>Convertir en track</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="195"/>
+ <location filename="../gis/CGisListWks.cpp" line="199"/>
<source>Create Route</source>
<translation>Crear ruta</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <location filename="../gis/CGisListWks.cpp" line="200"/>
<source>Change Icon (sel. waypt. only)</source>
<translation>Cambiar icono</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="627"/>
+ <location filename="../gis/CGisListWks.cpp" line="158"/>
+ <source>Set Track Activity</source>
+ <translation>Establecer actividad del track</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="634"/>
<source>Drop items...</source>
<translation>Descartar elementos</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="652"/>
- <location filename="../gis/CGisListWks.cpp" line="1646"/>
- <location filename="../gis/CGisListWks.cpp" line="1684"/>
+ <location filename="../gis/CGisListWks.cpp" line="659"/>
+ <location filename="../gis/CGisListWks.cpp" line="1691"/>
+ <location filename="../gis/CGisListWks.cpp" line="1729"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation><b>Actualizar dispositivos</b><p>Actualizar %1<br/>Por favor espere...</p></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Delete project...</source>
<translation>Eliminar Proyecto...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Do you really want to delete %1?</source>
<translation>¿Desea realmente eliminar %1?</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Track Profile</source>
<translation>Perfil del Track</translation>
</message>
@@ -1712,78 +1715,78 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<translation>Ocultar en el mapa</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="110"/>
+ <location filename="../gis/CGisListWks.cpp" line="109"/>
<source>Sort by Time</source>
<translation>Ordenar por fecha</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="111"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Name</source>
<translation>Ordenar por nombre</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation>Guardar como GPX 1.1 w/o ext...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <location filename="../gis/CGisListWks.cpp" line="122"/>
<source>Send to Devices</source>
<translation>Enviar a dispositivo</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Sync. with Database</source>
<translation>Sincronizar con base de datos</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Select Range</source>
<translation>Seleccionar Rango</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Edit Track Points</source>
<translation>Editar Puntos del Track</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="156"/>
<source>Reverse Track</source>
<translation>Invertir Track</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="154"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Combine Tracks</source>
<translation>Combinar Tracks</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="188"/>
+ <location filename="../gis/CGisListWks.cpp" line="192"/>
<source>Edit Area Points</source>
<translation>Editar Puntos del Área</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="134"/>
- <location filename="../gis/CGisListWks.cpp" line="157"/>
+ <location filename="../gis/CGisListWks.cpp" line="137"/>
+ <location filename="../gis/CGisListWks.cpp" line="161"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="778"/>
+ <location filename="../gis/CGisListWks.cpp" line="785"/>
<source>Saving workspace. Please wait.</source>
<translation>Guardando espacio de trabajo. Por favor espere.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="824"/>
+ <location filename="../gis/CGisListWks.cpp" line="831"/>
<source>Loading workspace. Please wait.</source>
<translation>Cargando espacio de trabajo. Por favor espere.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>Close all projects...</source>
<translation>Cerrar todos los proyectos...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>This will remove all projects from the workspace.</source>
<translation>Esto eliminará todos los proyectos del espacio de trabajo.</translation>
</message>
@@ -1801,22 +1804,22 @@ Para resolver este conflicto puedes crear y guardar una copia, forzar o eliminar
<translation>El proyecto "%1" ya está en el area de trabajo.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="554"/>
+ <location filename="../gis/CGisWidget.cpp" line="559"/>
<source>Copy items...</source>
<translation>Copia elementos....</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="573"/>
+ <location filename="../gis/CGisWidget.cpp" line="578"/>
<source>Change waypoint symbols.</source>
- <translation type="unfinished"></translation>
+ <translation>Cambiar símbolos de waypoint</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Cut Track...</source>
<translation>Dividir Track...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Do you want to delete the original track?</source>
<translation>¿Desea borrar el track original?</translation>
</message>
@@ -1901,7 +1904,7 @@ línea %2, columna %3.
<message>
<location filename="../widgets/CHistoryListWidget.cpp" line="65"/>
<source> by %1</source>
- <translation type="unfinished">de %1</translation>
+ <translation>de %1</translation>
</message>
<message>
<location filename="../widgets/CHistoryListWidget.cpp" line="37"/>
@@ -1921,7 +1924,7 @@ línea %2, columna %3.
<message>
<location filename="../widgets/CHistoryListWidget.cpp" line="156"/>
<source>The removal is permanent and cannot be undone. <b>Do you really want to delete history before this step?</b></source>
- <translation>El borrado es permanente y no se puede deshacer. <b>¿Esta seguro de querer borrar el historial anterior a este paso?</translation>
+ <translation>El borrado es permanente y no se puede deshacer. <b>¿Esta seguro de querer borrar el historial anterior a este paso?</b></translation>
</message>
</context>
<context>
@@ -1974,7 +1977,7 @@ línea %2, columna %3.
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
<source>Speed</source>
<translation>Velocidad</translation>
</message>
@@ -1991,46 +1994,51 @@ línea %2, columna %3.
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="116"/>
<source>Temperature</source>
- <translation type="unfinished"></translation>
+ <translation>Temperatura</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="120"/>
<source>Distance</source>
- <translation type="unfinished"></translation>
+ <translation>Distancia</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+ <source>Energy</source>
+ <translation>Energía</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
<source>Sea Level Pressure</source>
- <translation type="unfinished"></translation>
+ <translation>Presión a nivel del mar</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
<source>Speed (vertical)</source>
- <translation type="unfinished"></translation>
+ <translation>Velocidad vertical</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
<source>Slope*</source>
<translation>Pendiente</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
<source>Speed*</source>
<translation>Velocidad</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
<source>Elevation</source>
<translation>Altitud</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
<source>Progress</source>
<translation>Progreso</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
<source>Terrain slope</source>
<translation>Pendiente del terreno</translation>
</message>
@@ -2046,53 +2054,53 @@ línea %2, columna %3.
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="769"/>
+ <location filename="../CMainWindow.cpp" line="813"/>
<source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
<translation>Usar <b>Menu->ver->Añadir vista de mapa</b> para abrir nueva vista, o <b>Menu->archivo->cargar vista de mapa</b> para restaurar una vista guardada. Or click <a href='newview'>here</a>.</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="897"/>
+ <location filename="../CMainWindow.cpp" line="941"/>
<source>Ele: %1%2</source>
<translation>Alt: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="909"/>
+ <location filename="../CMainWindow.cpp" line="953"/>
<source>Slope: %1%2</source>
<translation>Pendiente: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="925"/>
+ <location filename="../CMainWindow.cpp" line="969"/>
<source>[Grid: %1]</source>
<translation>[Malla: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1066"/>
+ <location filename="../CMainWindow.cpp" line="1110"/>
<source>Load GIS Data...</source>
<translation>Cargar Datos GIS...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
<source>Select output file</source>
<translation>Seleccionar archivo de salida</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>QMapShack View (*.view)</source>
<translation>Vista de QMapShack (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>Select file to load</source>
<translation>Seleccionar archivo a cargar</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1369"/>
+ <location filename="../CMainWindow.cpp" line="1481"/>
<source>Fatal...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1370"/>
+ <location filename="../CMainWindow.cpp" line="1482"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation>QMapShack detectó una biblioteca Proj4 mal instalada. Las tablas de traducción para las proyecciones EPSG usualmente almacenadas en / usr / share / proj faltan. Póngase en contacto con el responsable del paquete de su distribución para solucionarlo.</translation>
</message>
@@ -2677,13 +2685,14 @@ Si no es divertido, ¿por qué no proporciona mapas? Bueno para alojar mapas lis
<message>
<location filename="../map/CMapIMG.cpp" line="432"/>
<source>Read external type file...</source>
- <translation type="unfinished"></translation>
+ <translation>Cargar archivo TYP externo...</translation>
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="432"/>
<source>Failed to read type file: %1
Fall back to internal types.</source>
- <translation type="unfinished"></translation>
+ <translation>Fallo al cargar archivo TYP: %1
+Se vuelve al TYP interno.</translation>
</message>
<message>
<location filename="../map/CMapIMG.cpp" line="474"/>
@@ -2797,7 +2806,7 @@ Fall back to internal types.</source>
<message>
<location filename="../map/CMapPathSetup.cpp" line="81"/>
<source>Select root path...</source>
- <translation>Seleccionar carpeta raiz</translation>
+ <translation>Seleccionar carpeta raiz...</translation>
</message>
</context>
<context>
@@ -2805,7 +2814,7 @@ Fall back to internal types.</source>
<message>
<location filename="../map/CMapPropSetup.cpp" line="196"/>
<source>Select type file...</source>
- <translation type="unfinished"></translation>
+ <translation>Seleccionar archivo TYP...</translation>
</message>
</context>
<context>
@@ -2854,19 +2863,18 @@ Fall back to internal types.</source>
<context>
<name>CMapTMS</name>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
- <location filename="../map/CMapTMS.cpp" line="77"/>
- <location filename="../map/CMapTMS.cpp" line="136"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Error...</source>
<translation>Error...</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
<source>Failed to open %1</source>
<translation>Fallo al abrir %1</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="77"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
@@ -2875,27 +2883,17 @@ línea %2, columna %3.
%4</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="115"/>
+ <location filename="../map/CMapTMS.cpp" line="116"/>
<source>Layer %1</source>
<translation>Capa %1</translation>
</message>
- <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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Este mapa requiere soporte de OpenSSL. Sin embargo, debido a restricciones legales en algunos países, OpenSSL no se incluye con QMapShack. Puede consultar la página < a href = < https: //www.openssl.org/community/binaries.html '> OpenSSL Homepage</a> Para binarios. Tienes que copiar libeay32.dll y ssleay32.dll en el directorio del programa QMapShack.</translation>
- </message>
- <message>
- <location filename="../map/CMapTMS.cpp" line="299"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 teselas pendientes<br/></translation>
- </message>
</context>
<context>
<name>CMapVRT</name>
<message>
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation>Error...</translation>
@@ -2907,7 +2905,7 @@ línea %2, columna %3.
<translation>Fallo al leer el archivo: %1</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<source>File must be 8 bit palette or gray indexed.</source>
<translation>El archivo debe ser con paleta de 8 bits o escala de grises indexada.</translation>
</message>
@@ -2925,17 +2923,17 @@ línea %2, columna %3.
<translation>Crear GDAL VRT</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="63"/>
<source>Select files...</source>
<translation>Seleccionar ficheros de origen...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="87"/>
<source>Select target file...</source>
- <translation>Seleccionar fichero de destino...</translation>
+ <translation>Seleccionar fichero VRT de salida...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="150"/>
<source>!!! done !!!
</source>
<translation>¡¡¡ hecho !!!</translation>
@@ -2948,8 +2946,7 @@ línea %2, columna %3.
<location filename="../map/CMapWMTS.cpp" line="53"/>
<location filename="../map/CMapWMTS.cpp" line="63"/>
<location filename="../map/CMapWMTS.cpp" line="72"/>
- <location filename="../map/CMapWMTS.cpp" line="157"/>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>Error...</source>
<translation>Error...</translation>
</message>
@@ -2977,23 +2974,13 @@ Estructura desconocida.</translation>
<message>
<location filename="../map/CMapWMTS.cpp" line="72"/>
<source>Unexpected service. '* WMTS 1.0.0' is expected. '%1 %2' is read.</source>
- <translation>Servicio inesperado. '* WMTS 1.0.0' es el esperado. '%1 %2' 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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Este mapa requiere soporte de OpenSSL. Sin embargo, debido a restricciones legales en algunos países, OpenSSL no se incluye con QMapShack. Puede consultar la página < a href = < https: //www.openssl.org/community/binaries.html '> OpenSSL Homepage</a> Para binarios. Tienes que copiar libeay32.dll y ssleay32.dll en el directorio del programa QMapShack.</translation>
+ <translation>Servicio inesperado. '* WMTS 1.0.0' es el esperado. pero se ha leido '%1 %2'.</translation>
</message>
<message>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>No georeference information found.</source>
<translation>No se encontró información de georreferenciación.</translation>
</message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="413"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 teselas pendientes<br/></translation>
- </message>
</context>
<context>
<name>CMouseEditArea</name>
@@ -3006,10 +2993,10 @@ Estructura desconocida.</translation>
<message>
<location filename="../mouse/CMouseEditArea.cpp" line="37"/>
<source><b>Edit Area</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
- <translation><b>Editar área</b><br/>Seleccione una función y un modo de 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.<br/></translation>
+ <translation><b>Editar área</b><br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <location filename="../mouse/CMouseEditArea.cpp" line="94"/>
<source>area</source>
<translation>área</translation>
</message>
@@ -3025,10 +3012,10 @@ Estructura desconocida.</translation>
<message>
<location filename="../mouse/CMouseEditRte.cpp" line="39"/>
<source><b>Edit Route Points</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
- <translation></b>Editar puntos de ruta<br/>Seleccione una función y un modo de 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.<br/></translation>
+ <translation></b>Editar puntos de ruta<br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <location filename="../mouse/CMouseEditRte.cpp" line="105"/>
<source>route</source>
<translation>Ruta</translation>
</message>
@@ -3044,7 +3031,7 @@ Estructura desconocida.</translation>
<message>
<location filename="../mouse/CMouseEditTrk.cpp" line="38"/>
<source><b>Edit Track Points</b><br/>Select a function and a routing mode via the tool buttons. Next select a point of the line. Only points marked with a large square can be changed. The ones with a black dot are subpoints introduced by routing.<br/></source>
- <translation><b>Editar puntos del track</b><br/>Seleccione una función y un modo de 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.<br/></translation>
+ <translation><b>Editar puntos del track</b><br/>Seleccione una función y un modo de dibujo a través de los botones de herramientas. A continuación, seleccione un punto del trazado. Sólo se pueden cambiar los puntos marcados con un cuadrado grande. Los puntitos negros son puntos secundarios introducidos automáticamente por el enrutamiento automático o el ajuste vectorial.<br/></translation>
</message>
<message>
<location filename="../mouse/CMouseEditTrk.cpp" line="80"/>
@@ -3057,9 +3044,9 @@ Estructura desconocida.</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"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="110"/>
<source>track</source>
- <translation type="unfinished"></translation>
+ <translation>track</translation>
</message>
</context>
<context>
@@ -3110,7 +3097,7 @@ Estructura desconocida.</translation>
<message>
<location filename="../mouse/CMousePrint.cpp" line="31"/>
<source><b>Save(Print) Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
- <translation><b>Guardar/imprimir mapa</b><br/>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>
+ <translation><b>Guardar/imprimir mapa</b><br/>Seleccione un area rectangular en el mapa pulsando el boton izquierdo del ratón y moviendolo hacia la esquina opuesta. Cancele con el boton derecho. Ajuste la seleccion haciendo clic y moviendo las esquinas.</translation>
</message>
</context>
<context>
@@ -3118,7 +3105,7 @@ Estructura desconocida.</translation>
<message>
<location filename="../mouse/CMouseRangeTrk.cpp" line="224"/>
<source><b>Select Range</b><br/>Select first track point with left mouse button. And then a second one. Leave range selection with a click of the right mouse button.<br/></source>
- <translation><b>Seleccionar rango</b><br/>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<br/></translation>
+ <translation><b>Seleccionar rango</b><br/>Seleccione el punto inicial con el botón izquierdo del raton. Fije el punto final con una segunda pulsacion. El rango seleccionado se marca en verde. Un clic con el botón derecho del ratón abandona la selección del rango<br/></translation>
</message>
</context>
<context>
@@ -3126,30 +3113,30 @@ Estructura desconocida.</translation>
<message>
<location filename="../mouse/CMouseSelect.cpp" line="32"/>
<source><b>Select Items On Map</b><br/>Select a rectangular area on the map. Use the left mouse button and move the mouse. Abort with a right click. Adjust the selection by point-click-move on the corners.</source>
- <translation><b>Seleccionar elementos en el mapa</b><br/>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>
+ <translation><b>Seleccionar elementos en el mapa</b><br/>Seleccione un area rectangular con el boton izquierdo del ratón. Cancelar con clic derecho. Ajuste la seleccion haciendo clic y desplazando en las esquinas.</translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="99"/>
<source><b>Selected:</b><br/></source>
<translation><b>Seleccionado:</b><br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="106"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="107"/>
<source>%1 waypoints<br/></source>
- <translation type="unfinished"></translation>
+ <translation>%1 waypoints<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="101"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="102"/>
<source>%1 tracks<br/></source>
- <translation type="unfinished"></translation>
+ <translation>%1 tracks<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="111"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="112"/>
<source>%1 routes<br/></source>
<translation>%1 rutas<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="116"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="117"/>
<source>%1 areas<br/></source>
<translation>%1 áreas<br/></translation>
</message>
@@ -3237,12 +3224,12 @@ y: %4 m/px</translation>
<context>
<name>CProgressDialog</name>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="40"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="46"/>
<source>Elapsed time: %1</source>
<translation>Tiempo transcurrido: %1</translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="87"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="132"/>
<source>Elapsed time: %1 seconds.</source>
<translation>Tiempo transcurrido: %1 segundos.</translation>
</message>
@@ -3477,7 +3464,7 @@ no es una definición de sistema de coordenadas válido:
<message>
<location filename="../gis/rte/router/CRouterBRouter.cpp" line="49"/>
<source>original</source>
- <translation type="unfinished"></translation>
+ <translation>original</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterBRouter.cpp" line="50"/>
@@ -3497,12 +3484,12 @@ no es una definición de sistema de coordenadas válido:
<message>
<location filename="../gis/rte/router/CRouterBRouter.cpp" line="147"/>
<source>BRouter (offline)</source>
- <translation type="unfinished"></translation>
+ <translation>BRouter (offline)</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterBRouter.cpp" line="152"/>
<source>BRouter (online)</source>
- <translation type="unfinished"></translation>
+ <translation>BRouter (online)</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterBRouter.cpp" line="180"/>
@@ -3584,7 +3571,7 @@ no es una definición de sistema de coordenadas válido:
<message>
<location filename="../gis/rte/router/CRouterBRouter.cpp" line="590"/>
<source>online</source>
- <translation type="unfinished"></translation>
+ <translation>online</translation>
</message>
</context>
<context>
@@ -4272,7 +4259,7 @@ no es una definición de sistema de coordenadas válido:
<message>
<location filename="../gis/rte/router/routino/CRouterRoutinoPathSetup.cpp" line="40"/>
<source>Add or remove paths containing Routino data. There can be multiple databases in a path but no sub-path is parsed.</source>
- <translation>Agregar o quitar carpetas que contienen datos de Routino. Puede haber varias bases de datos en una carpeta, pero no se analiza ninguna subcarpeta</translation>
+ <translation>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"/>
@@ -4285,17 +4272,17 @@ no es una definición de sistema de coordenadas válido:
<message>
<location filename="../gis/rte/router/CRouterSetup.cpp" line="38"/>
<source>Routino (offline)</source>
- <translation type="unfinished"></translation>
+ <translation>Routino (offline)</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterSetup.cpp" line="39"/>
<source>MapQuest (online)</source>
- <translation type="unfinished"></translation>
+ <translation>MapQuest (online)</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterSetup.cpp" line="40"/>
<source>BRouter (online)</source>
- <translation type="unfinished"></translation>
+ <translation>BRouter (online)</translation>
</message>
</context>
<context>
@@ -4313,7 +4300,7 @@ no es una definición de sistema de coordenadas válido:
<message>
<location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="81"/>
<source>Select target path...</source>
- <translation>Seleccionar carpeta de destino</translation>
+ <translation>Seleccionar carpeta de destino...</translation>
</message>
<message>
<location filename="../tool/CRoutinoDatabaseBuilder.cpp" line="142"/>
@@ -4335,7 +4322,7 @@ no es una definición de sistema de coordenadas válido:
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="93"/>
<source><b>Exact Mode</b><br/>All selected items have to be completely inside the selected area.<br/></source>
- <translation type="unfinished"></translation>
+ <translation><b>Modo exacto</b><br/>Todos los elementos seleccionados estan completamente dentro del área.<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="97"/>
@@ -4375,7 +4362,7 @@ no es una definición de sistema de coordenadas válido:
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="132"/>
<source><b>Ignore Routes</b><br/>Ignore routes in list of selected items<br/></source>
- <translation type="unfinished"></translation>
+ <translation><b>Ignorar rutas</b><br/>Ignorar rutas en la lista de elementos seleccionados<br/></translation>
</message>
<message>
<location filename="../mouse/CScrOptSelect.cpp" line="136"/>
@@ -4455,7 +4442,7 @@ no es una definición de sistema de coordenadas válido:
<message>
<location filename="../gis/slf/CSlfProject.cpp" line="42"/>
<source>Failed to load file %1...</source>
- <translation>Fallo al cargar el archivo %1</translation>
+ <translation>Fallo al cargar el archivo %1...</translation>
</message>
</context>
<context>
@@ -4622,14 +4609,47 @@ línea %2, columna %3.
</message>
</context>
<context>
+ <name>CTemplateWidget</name>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
+ <source>choose one...</source>
+ <translation>elige una...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
+ <source>Hiking Tour Summary (built-in)</source>
+ <translation>Datos de la actividad (genérico)</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
+ <source>Template path...</source>
+ <translation>Ruta de las Plantillas...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
+ <source>Failed to read template file %1.</source>
+ <translation>Fallo al leer la plantilla %1.</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
+ <source>Preview...</source>
+ <translation>Previsualizar...</translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="71"/>
<source>&Color...</source>
<translation>&Color...</translation>
</message>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="117"/>
<source>Reset format</source>
<translation>Restablecer formato</translation>
</message>
@@ -4692,7 +4712,195 @@ línea %2, columna %3.
<message>
<location filename="../helpers/CWptIconDialog.cpp" line="161"/>
<source>Path to user icons...</source>
- <translation>Carpeta de iconos de usuario</translation>
+ <translation>Carpeta de iconos de usuario...</translation>
+ </message>
+</context>
+<context>
+ <name>Form</name>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
+ <source>Form</source>
+ <translation>Ficha</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
+ <source>Participants</source>
+ <translation>Participantes</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
+ <source>Weather</source>
+ <translation>Meteo</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
+ <source>rain</source>
+ <translation>lluvia</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
+ <source>sunny</source>
+ <translation>sol</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
+ <source>snow</source>
+ <translation>nieve</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
+ <source>clouds</source>
+ <translation>nubes</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
+ <source>windy</source>
+ <translation>viento</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
+ <source>hot</source>
+ <translation>caluroso</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
+ <source>warm</source>
+ <translation>templado</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
+ <source>cold</source>
+ <translation>frío</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
+ <source>freezing</source>
+ <translation>bajo cero</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
+ <source>foggy</source>
+ <translation>niebla</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
+ <source>humid</source>
+ <translation>humedad</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
+ <source>Character</source>
+ <translation>Carácter</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
+ <source>easy hiking</source>
+ <translation>Excursión fácil</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
+ <source>climbing</source>
+ <translation>escalada</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
+ <source>alpine</source>
+ <translation>Actividad alpina</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
+ <source>large ascend</source>
+ <translation>gran desnivel</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
+ <source>long distance</source>
+ <translation>larga distancia</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
+ <source>via ferrata</source>
+ <translation>ferrata</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
+ <source>hail/soft hail</source>
+ <translation>granizo</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
+ <source>Rating</source>
+ <translation>Calificación</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
+ <source>Rating 5 stars</source>
+ <translation>***** Excepcional</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
+ <source>Rating 4 stars</source>
+ <translation>**** Muy buena</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
+ <source>Rating 3 stars</source>
+ <translation>*** Buena</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
+ <source>Rating 2 stars</source>
+ <translation>** Regular</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
+ <source>Rating 1 star</source>
+ <translation>* Mala</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
+ <source>aborted</source>
+ <translation>Intento frustrado</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
+ <source>Equipment</source>
+ <translation>Material</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
+ <source>ferrata gear</source>
+ <translation>ferrata</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
+ <source>night gear</source>
+ <translation>iluminación</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
+ <source>snow shoes</source>
+ <translation>raquetas</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
+ <source>climbing gear</source>
+ <translation>escalada</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
+ <source>ski</source>
+ <translation>ski</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
+ <source>camping gear</source>
+ <translation>acampada / vivac</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
+ <source>Details</source>
+ <translation>Detalles</translation>
</message>
</context>
<context>
@@ -4734,7 +4942,7 @@ línea %2, columna %3.
<message>
<location filename="../IAbout.ui" line="148"/>
<source>Routino</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="179"/>
@@ -4749,7 +4957,7 @@ línea %2, columna %3.
<message>
<location filename="../IAbout.ui" line="212"/>
<source>Oliver Eichler</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="225"/>
@@ -4764,7 +4972,7 @@ línea %2, columna %3.
<message>
<location filename="../IAbout.ui" line="258"/>
<source>Rainer Unseld </source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="295"/>
@@ -4774,17 +4982,17 @@ línea %2, columna %3.
<message>
<location filename="../IAbout.ui" line="302"/>
<source>Wolfgang Thämelt</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="428"/>
<source>© 2017 Oliver Eichler (oliver.eichler at gmx.de)</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="189"/>
<source>Pavel Fric</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="288"/>
@@ -4794,7 +5002,7 @@ línea %2, columna %3.
<message>
<location filename="../IAbout.ui" line="235"/>
<source>Harrie Klomp</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="278"/>
@@ -4804,12 +5012,12 @@ línea %2, columna %3.
<message>
<location filename="../IAbout.ui" line="326"/>
<source>Win64:</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="342"/>
<source>OS X:</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="366"/>
@@ -4824,17 +5032,17 @@ línea %2, columna %3.
<message>
<location filename="../IAbout.ui" line="265"/>
<source>Jose Luis Domingo Lopez</source>
- <translation type="unfinished">Jose Luis Domingo, Javi Segovia</translation>
+ <translation>Jose Luis Domingo, Javi Segovia</translation>
</message>
<message>
<location filename="../IAbout.ui" line="359"/>
<source>Ivo Kronenberg</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="352"/>
<source>Helmut Schmidt</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="375"/>
@@ -4846,7 +5054,7 @@ línea %2, columna %3.
<source>Christian Eichler (qms at christian-eichler.de)
Ivo Kronenberg
Norbert Truchsess (norbert.truchsess at t-online.de)</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../IAbout.ui" line="421"/>
@@ -4864,7 +5072,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="22"/>
<source>Projection & Datum</source>
- <translation>Proyección & Datum</translation>
+ <translation>Proyección y Datum</translation>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="32"/>
@@ -4879,12 +5087,12 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="59"/>
<source>Logarithmic</source>
- <translation>Logarítmico</translation>
+ <translation>Logarítmica</translation>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="66"/>
- <source>Square (optimized for TMS and WTMS tiles)</source>
- <translation>Cuadrado (optimizado para teselas TMS y WTMS)</translation>
+ <source>Square (optimized for TMS and WMTS tiles)</source>
+ <translation>Cuadrada (optimizada para teselas TMS y WMTS)</translation>
</message>
</context>
<context>
@@ -4926,7 +5134,7 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
<message>
<location filename="../units/ICoordFormatSetup.ui" line="14"/>
<source>Coordinate Format...</source>
- <translation>Formato de coordenadas</translation>
+ <translation>Formato de coordenadas...</translation>
</message>
<message>
<location filename="../units/ICoordFormatSetup.ui" line="36"/>
@@ -5009,11 +5217,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../gis/db/IDB.cpp" line="60"/>
<source>The internal database format of '%1' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
- <translation>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>
+ <translation>El formato interno de base de datos de '%1' ha cambiado. QMapShack hará la conversión de tu base de datos ahora.Después de esta conversión la nueva base de datos no puede utilizarse en versiones más antiguas de QMapShack. Se recomienda hacer una copia de seguridad antes de comenzar.</translation>
</message>
<message>
<location filename="../gis/db/IDB.cpp" line="64"/>
@@ -5077,12 +5281,12 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../gis/db/IDBMysql.cpp" line="60"/>
<source>Password for database '%1':</source>
- <translation>Contraseña de la base de datos</translation>
+ <translation>Contraseña de la base de datos '%1':</translation>
</message>
<message>
<location filename="../gis/db/IDBMysql.cpp" line="222"/>
<source>Update to database version 5. Migrate all GIS items.</source>
- <translation>Actualizar base de datos a versión 5. Migrar todos los elementos GIS</translation>
+ <translation>Actualizar a versión 5 de base de datos. Migrar todos los elementos GIS.</translation>
</message>
</context>
<context>
@@ -5127,7 +5331,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../dem/IDemPropSetup.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation>ficha</translation>
</message>
<message>
<location filename="../dem/IDemPropSetup.ui" line="35"/>
@@ -5181,7 +5385,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<location filename="../dem/IDemPropSetup.ui" line="497"/>
<location filename="../dem/IDemPropSetup.ui" line="581"/>
<source>> </source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../dem/IDemPropSetup.ui" line="251"/>
@@ -5198,7 +5402,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../dem/IDemList.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../dem/IDemList.ui" line="118"/>
@@ -5374,7 +5578,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../gis/prj/IDetailsPrj.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../gis/prj/IDetailsPrj.ui" line="50"/>
@@ -5435,7 +5639,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../gis/rte/IDetailsRte.ui" line="205"/>
<source>-</source>
- <translation type="unfinished">-</translation>
+ <translation>-</translation>
</message>
<message>
<location filename="../gis/rte/IDetailsRte.ui" line="170"/>
@@ -5493,14 +5697,14 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<location filename="../gis/trk/IDetailsTrk.ui" line="875"/>
<location filename="../gis/trk/IDetailsTrk.ui" line="961"/>
<source>max.</source>
- <translation type="unfinished"></translation>
+ <translation>max.</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="994"/>
<location filename="../gis/trk/IDetailsTrk.ui" line="1001"/>
<location filename="../gis/trk/IDetailsTrk.ui" line="1015"/>
<source>min.</source>
- <translation type="unfinished"></translation>
+ <translation>min.</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1029"/>
@@ -5532,7 +5736,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<translation>Límites definidos por el usuario para todos los track</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1495"/>
<source>Speed</source>
<translation>Velocidad</translation>
</message>
@@ -5585,7 +5789,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="648"/>
<source>x </source>
- <translation type="unfinished"></translation>
+ <translation>x </translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="56"/>
@@ -5597,7 +5801,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="265"/>
<source>The track was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </source>
- <translation>El track que se ha importado a QMapShack ha cambiado. No muestra los datos originales. Consulte historial de cambios</translation>
+ <translation>El track se ha importado a QMapShack y se ha editado. No muestra los datos originales. Consulte el historial de cambios.</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="436"/>
@@ -5630,47 +5834,42 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<translation>Establecer actividad del track</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
- <source>Remove Track Activity</source>
- <translation>Eliminar actividad del track</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1400"/>
<source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
<translation>Para diferenciar las estadísticas seleccione una actividad de la lista para todo el track,o bien, seleccione una parte para asignar una actividad.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1427"/>
<source>Points</source>
<translation>Puntos</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Time</source>
<translation>Tiempo</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ele.</source>
<translation>Altitud.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Delta</source>
<translation>Delta</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Dist.</source>
<translation>Distancia</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1500"/>
<source>Slope</source>
<translation>Pendiente</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1515"/>
<source>Position</source>
<translation>Posición</translation>
</message>
@@ -5685,22 +5884,22 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<translation>-</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1505"/>
<source>Ascent</source>
<translation>Ascenso</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1510"/>
<source>Descent</source>
<translation>Descenso</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1524"/>
<source>Filter</source>
<translation>Filtro</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1561"/>
<source>Hist.</source>
<translation>Historial</translation>
</message>
@@ -5710,7 +5909,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="14"/>
<source>Dialog</source>
- <translation type="unfinished">Diálogo</translation>
+ <translation>Diálogo</translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="268"/>
@@ -5784,7 +5983,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../device/IDevice.cpp" line="292"/>
<source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
- <translation>Hay otro proyecto con el mismo nombre. Si pulsa 'ok'será eliminado y reemplazado</translation>
+ <translation>Hay otro proyecto con el mismo nombre. Si pulsa 'ok'será eliminado y reemplazado.</translation>
</message>
</context>
<context>
@@ -5906,7 +6105,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../gis/trk/filter/IFilterDeleteExtension.ui" line="103"/>
<source>...</source>
- <translation type="unfinished">...</translation>
+ <translation>...</translation>
</message>
</context>
<context>
@@ -5990,7 +6189,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="56"/>
<source>Hide points with invalid data.</source>
- <translation>Ocultar puntos con datos inválidos</translation>
+ <translation>Ocultar puntos con datos no válidos.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInvalid.ui" line="63"/>
@@ -6209,7 +6408,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="63"/>
<source>Creates a new track for every segment within this track.</source>
- <translation>Crea un nuevo track por cada segmento de este track</translation>
+ <translation>Crea un nuevo track por cada segmento de este track.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterSplitSegment.ui" line="70"/>
@@ -6255,7 +6454,7 @@ Si desea mantener sólo una mitad puede simplemente eliminar los puntos, o marca
<message>
<location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="63"/>
<source>Calculate slope of the terrain based on loaded DEM files.</source>
- <translation>Calcular pendiente del terreno en base a los DEM cargados</translation>
+ <translation>Calcular pendiente del terreno en base a los DEM cargados.</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterTerrainSlope.ui" line="70"/>
@@ -6368,70 +6567,70 @@ Es un elemento nuevo o ha sido eliminado en la base de datos por otra persona</t
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source>Save project?</source>
<translation>¿Guardar proyecto?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation><h3>%1</h3>Ha habido cambios en el proyecto. ¿Guardar antes de cerrar?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="329"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="356"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation>%1: Correlacionar tracks y waypoints</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="366"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation><h3>%1</h3>¿Desea omitir la correlación de pistas y waypoints para este proyecto en el futuro?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="340"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="367"/>
<source>Canceled correlation...</source>
<translation>Correlación cancelada</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="385"/>
- <location filename="../gis/prj/IGisProject.cpp" line="442"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="412"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="469"/>
<source>Save "%1" to...</source>
<translation>Guardar "%1" como...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="527"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="554"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Nombre de archivo %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="532"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="559"/>
<source>Waypoints: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Waypoints: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="536"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="563"/>
<source>Tracks: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Tracks: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="540"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="567"/>
<source>Routes: %1</source>
<translation>Rutas: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="544"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="571"/>
<source>Areas: %1</source>
<translation>Áreas: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="664"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="691"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>¿Desea realmente eliminar '%1' del proyecto '%2'?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="665"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="692"/>
<source>Delete...</source>
<translation>Borrar...</translation>
</message>
@@ -6441,7 +6640,7 @@ Nombre de archivo %1</translation>
<message>
<location filename="../gis/IGisWidget.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../gis/IGisWidget.ui" line="43"/>
@@ -6456,7 +6655,7 @@ Nombre de archivo %1</translation>
<message>
<location filename="../gis/IGisWidget.ui" line="66"/>
<source>Filter</source>
- <translation type="unfinished">Filtro</translation>
+ <translation>Filtro</translation>
</message>
<message>
<location filename="../gis/IGisWidget.ui" line="116"/>
@@ -6477,12 +6676,12 @@ Nombre de archivo %1</translation>
<message>
<location filename="../gis/IGisWidget.ui" line="205"/>
<source>Clear Filter</source>
- <translation type="unfinished"></translation>
+ <translation>Borrar filtro</translation>
</message>
<message>
<location filename="../gis/IGisWidget.ui" line="214"/>
<source>Setup Filter</source>
- <translation type="unfinished"></translation>
+ <translation>Configurar filtro</translation>
</message>
</context>
<context>
@@ -6536,7 +6735,7 @@ Nombre de archivo %1</translation>
<message>
<location filename="../tool/IImportDatabase.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../tool/IImportDatabase.ui" line="45"/>
@@ -6639,360 +6838,371 @@ Nombre de archivo %1</translation>
<translation>Ventana</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="112"/>
+ <location filename="../IMainWindow.ui" line="113"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="120"/>
+ <location filename="../IMainWindow.ui" line="121"/>
<source>Project</source>
<translation>Proyecto</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="131"/>
+ <location filename="../IMainWindow.ui" line="132"/>
<source>Tool</source>
<translation>Herramientas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="156"/>
+ <location filename="../IMainWindow.ui" line="157"/>
<source>Maps</source>
<translation>Mapas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="199"/>
+ <location filename="../IMainWindow.ui" line="200"/>
<source>Dig. Elev. Model (DEM)</source>
- <translation>Modelo Digital del Terreno (DEM)</translation>
+ <translatorcomment>la traducción literal "Modelo Digital del Terreno " es demasiado larga para el titulo de las pestaña, y hace que se oculten otras pestañas. Por ello se ha sustituido por su abreviatura "MDT" de uso frecuente, y también empleada por el IGN</translatorcomment>
+ <translation>MDT (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="238"/>
+ <location filename="../IMainWindow.ui" line="239"/>
<source>Data</source>
<translation>Datos</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="256"/>
+ <location filename="../IMainWindow.ui" line="257"/>
<source>Route</source>
<translation>Ruta</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
+ <location filename="../IMainWindow.ui" line="287"/>
<source>Toolbar</source>
<translation>Barra de herramientas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="301"/>
- <location filename="../IMainWindow.ui" line="304"/>
+ <location filename="../IMainWindow.ui" line="302"/>
+ <location filename="../IMainWindow.ui" line="305"/>
<source>Add Map View</source>
<translation>Añadir Vista de Mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="308"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="322"/>
+ <location filename="../IMainWindow.ui" line="323"/>
<source>Show Scale</source>
<translation>Mostrar Escala</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="335"/>
<source>Setup Map Font</source>
<translation>Configurar Fuente del Mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="350"/>
<source>Show Grid</source>
<translation>Mostrar Malla</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="353"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="364"/>
+ <location filename="../IMainWindow.ui" line="365"/>
<source>Setup Grid</source>
<translation>Configurar Malla</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="368"/>
<source>Ctrl+Alt+G</source>
<translation>Ctrl+Alt+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="383"/>
<source>Flip Mouse Wheel</source>
<translation>Invertir la Rueda del Ratón</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="394"/>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="395"/>
+ <location filename="../IMainWindow.ui" line="398"/>
<source>Setup Map Paths</source>
<translation>Configurar Rutas de Mapas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="413"/>
<source>POI Text</source>
<translation>Texto del POI</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="428"/>
<source>Night / Day</source>
<translation>Noche / Día</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="443"/>
<source>Map Tool Tip</source>
<translation>Mostrar descripción emergente en los Mapas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="445"/>
+ <location filename="../IMainWindow.ui" line="446"/>
<source>Ctrl+I</source>
- <translation type="unfinished">Ctrl+I</translation>
+ <translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="457"/>
+ <location filename="../IMainWindow.ui" line="458"/>
<source>Setup DEM Paths</source>
<translation>Configurar Rutas a los DEM</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="470"/>
<source>About</source>
<translation>Acerca de</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
+ <location filename="../IMainWindow.ui" line="482"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="485"/>
<source>F1</source>
- <translation type="unfinished"></translation>
+ <translation>F1</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="497"/>
+ <location filename="../IMainWindow.ui" line="500"/>
<source>Setup Map View</source>
<translation>Configurar Vista de Mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="644"/>
<source>VRT Builder</source>
<translation>Asistente VRT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="647"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>GUI front end para gdalbuildvrt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="659"/>
<source>Store Map View</source>
<translation>Guardar vista de mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="662"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation>Guardar en un archivo el mapa activo actual y la lista de DEM's incluyendo sus propiedades</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="673"/>
+ <location filename="../IMainWindow.ui" line="674"/>
<source>Load Map View</source>
<translation>Cargar vista de mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="677"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation>Restaurar vista de mapa activo y lista de DEM's incluyendo sus propiedades desde un archivo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="691"/>
+ <location filename="../IMainWindow.ui" line="692"/>
<source>Ext. Profile</source>
<translation>Perfil en ventana externa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="695"/>
<source>Ctrl+E</source>
- <translation type="unfinished">Ctrl+E</translation>
+ <translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="707"/>
<source>Close</source>
<translation>Cerrar</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="710"/>
<source>Ctrl+Q</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="722"/>
<source>Clone Map View</source>
<translation>Duplicar vista de mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="724"/>
+ <location filename="../IMainWindow.ui" line="725"/>
<source>Ctrl+Shift+T</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Shift+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="737"/>
<source>Create Routino Database</source>
<translation>Crear base de datos de Routino</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="748"/>
+ <location filename="../IMainWindow.ui" line="749"/>
<source>Save(Print) Map Screenshot</source>
<translation>Guardar/Imprimir captura de pantalla de mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="752"/>
<source>Print a selected area of the map</source>
<translation>Imprimir area seleccionada del mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="755"/>
<source>Ctrl+P</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+P</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="767"/>
<source>Setup Coord. Format</source>
<translation>Configurar formato de coordenadas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="769"/>
+ <location filename="../IMainWindow.ui" line="770"/>
<source>Change the format coordinates are displayed</source>
<translation>Cambiar el formato de coordenadas que se muestran</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="782"/>
<source>Setup Map Background</source>
<translation>Configuración del Mapa de Fondo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="794"/>
<source>Setup Waypoint Icons</source>
<translation>Configurar iconos de Waypoint</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="796"/>
+ <location filename="../IMainWindow.ui" line="797"/>
<source>Setup path to custom icons</source>
<translation>Configurar ruta de iconos personalizados</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="805"/>
+ <location filename="../IMainWindow.ui" line="806"/>
<source>Close Tab</source>
<translation>Cerrar pestaña</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="808"/>
+ <location filename="../IMainWindow.ui" line="809"/>
<source>Ctrl+W</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+W</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="817"/>
+ <location filename="../IMainWindow.ui" line="818"/>
<source>Quickstart Help</source>
<translation>Guia de inicio rápido</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="826"/>
+ <location filename="../IMainWindow.ui" line="827"/>
<source>Setup Toolbar</source>
<translation>Configurar barra de herramientas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="838"/>
+ <location filename="../IMainWindow.ui" line="839"/>
<source>Toggle Docks</source>
<translation>Panel de herramientas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="841"/>
+ <location filename="../IMainWindow.ui" line="842"/>
<source>Toggle visibility of dockable windows</source>
<translation>Ver panel de herramientas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="844"/>
+ <location filename="../IMainWindow.ui" line="845"/>
<source>Ctrl+D</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+D</translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="854"/>
+ <source>Full Screen</source>
+ <translation>Pantalla Completa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="511"/>
+ <location filename="../IMainWindow.ui" line="857"/>
+ <source>F11</source>
+ <translation>F11</translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="512"/>
<source>Load GIS Data</source>
<translation>Cargar Datos GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="515"/>
<source>Load projects from file</source>
<translation>Cargar proyectos desde archivo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="518"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="529"/>
+ <location filename="../IMainWindow.ui" line="530"/>
<source>Save All GIS Data</source>
<translation>Guardar todos los Datos GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="533"/>
<source>Save all projects in the workspace</source>
<translation>Guardar todos los proyectos del espacio de trabajo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="535"/>
+ <location filename="../IMainWindow.ui" line="536"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="547"/>
+ <location filename="../IMainWindow.ui" line="548"/>
<source>Setup Time Zone</source>
<translation>Configurar Zona Horaria</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="560"/>
<source>Add empty project</source>
<translation>Añadir proyecto vacío</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="575"/>
<source>Search Google</source>
<translation>Buscar en Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="587"/>
<source>Close all projects</source>
<translation>Cerrar todos los proyectos</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="589"/>
+ <location filename="../IMainWindow.ui" line="590"/>
<source>F8</source>
- <translation type="unfinished"></translation>
+ <translation>F8</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="602"/>
<source>Setup Units</source>
<translation>Configurar Unidades</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="614"/>
<source>Setup Workspace</source>
<translation>Configurar Espacio de trabajo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="617"/>
<source>Setup save on exit.</source>
- <translation>Guardar configuración al salir</translation>
+ <translation>Guardar configuración al salir.</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="629"/>
<source>Import Database from QLandkarte</source>
<translation>Importar base de datos de Qlandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="632"/>
<source>Import QLandkarte GT database</source>
<translation>Importar base de datos de QLandKarteGT</translation>
</message>
@@ -7002,7 +7212,7 @@ Nombre de archivo %1</translation>
<message>
<location filename="../map/IMapList.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../map/IMapList.ui" line="103"/>
@@ -7053,6 +7263,24 @@ No quiero leer la documentación!</translation>
</message>
</context>
<context>
+ <name>IMapOnline</name>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="41"/>
+ <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
+ <translation>Este mapa requiere soporte de OpenSSL. Sin embargo, debido a restricciones legales en algunos países, OpenSSL no se incluye con QMapShack. Puede consultar la página < a href = < https: //www.openssl.org/community/binaries.html '> OpenSSL Homepage</a> Para binarios. Tienes que copiar libeay32.dll y ssleay32.dll en el directorio del programa QMapShack.</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="47"/>
+ <source>Error...</source>
+ <translation>Error...</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="98"/>
+ <source><b>%1</b>: %2 tiles pending<br/></source>
+ <translation><b>%1</b>: %2 teselas pendientes<br/></translation>
+ </message>
+</context>
+<context>
<name>IMapPathSetup</name>
<message>
<location filename="../map/IMapPathSetup.ui" line="14"/>
@@ -7075,8 +7303,8 @@ No quiero leer la documentación!</translation>
<location filename="../map/IMapPathSetup.ui" line="185"/>
<source>Help! I want maps!
I don't want to read the documentation!</source>
- <translation>Quiero mapas
-No quiero ver la documentación</translation>
+ <translation>¡Quiero mapas!
+¡No quiero ver la documentación!</translation>
</message>
<message>
<location filename="../map/IMapPathSetup.ui" line="29"/>
@@ -7090,7 +7318,7 @@ No quiero ver la documentación</translation>
<message>
<location filename="../map/IMapPropSetup.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../map/IMapPropSetup.ui" line="35"/>
@@ -7153,17 +7381,17 @@ No quiero ver la documentación</translation>
<message>
<location filename="../map/IMapPropSetup.ui" line="353"/>
<source>Type File:</source>
- <translation type="unfinished"></translation>
+ <translation>Archivo TYP:</translation>
</message>
<message>
<location filename="../map/IMapPropSetup.ui" line="367"/>
<source>Forget external type file and use internal types.</source>
- <translation type="unfinished"></translation>
+ <translation>Olvidar TYP externo y utilizar el interno.</translation>
</message>
<message>
<location filename="../map/IMapPropSetup.ui" line="381"/>
<source>Load an external type file.</source>
- <translation type="unfinished"></translation>
+ <translation>Cargar un archivo TYP externo.</translation>
</message>
<message>
<location filename="../map/IMapPropSetup.ui" line="227"/>
@@ -7181,31 +7409,75 @@ No quiero ver la documentación</translation>
<message>
<location filename="../tool/IMapVrtBuilder.ui" line="14"/>
<source>Form</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
+ <source>Advanced Options</source>
+ <translation>Opciones Avanzadas</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <source>Source No Data (-srcnodata)</source>
+ <translation>No Data origen (-srcnodata)</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="46"/>
+ <source>Target No Data (-vrtnodata)</source>
+ <translation>No Data salida (-vrtnodata)</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="22"/>
<location filename="../tool/IMapVrtBuilder.ui" line="56"/>
+ <source>Target Projection (-a_srs)</source>
+ <translation>Proyección/Datum (-a_srs)</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="63"/>
+ <source>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</source>
+ <translation>Estas opciones son para casos particulares y normalmente se dejan en blanco. Consulta la <a href='http://www.gdal.org/gdalbuildvrt.html'>ayuda</a> de GDAL para más información.</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
+ <source>1. Select one or multiple source files.
+2. Select a file name for the target VRT file.
+3. Press "Start" button.
+
+Tip:
+* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
+* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
+* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
+ <translation>1. Selecciona uno o varios ficheros de origen
+2. Selecciona el nombre y la ubicación para el fichero VRT de salida
+3. Pulsa en "Comenzar"
+
+Notas:
+* Es posible mantener los ficheros de origen en una subcarpeta y generar el fichero VRT de salida en otra carpeta diferente, como tu carpeta raíz de mapas.
+* Usa las opciones avanzadas para asignar un valor "no data" si los ficheros de origen carecen del mismo y no forman un área rectangular. Las áreas no cubiertas por el mapa se harán transparentes.
+* La opción avanzada "-a_srs" sirve para asignar una Proyección/Datum cuando el fichero de origen carece de ella, ...pero NO reproyecta los datos.</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="139"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="156"/>
<source>Select source files:</source>
<translation>Seleccionar ficheros de origen:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="79"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="121"/>
<source>Target Filename:</source>
- <translation>Fichero de destino:</translation>
+ <translation>Fichero VRT de salida:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="86"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="128"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="95"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="20"/>
<source>Start</source>
<translation>Comenzar</translation>
</message>
@@ -7215,7 +7487,7 @@ No quiero ver la documentación</translation>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="249"/>
<source><b>New Line</b><br/>Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.<br/></source>
- <translation><b>Nueva linea</b><br/>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.<br/></translation>
+ <translation><b>Nuevo trazado</b><br/>Mueva el ratón y pulse el botón izquierdo para crear puntos. Puede alternar el modo de dibujo con los botones de herraminetas (O,A,V) sin interrumpir el trazado. Para terminar pulse botón derecho del ratón.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="289"/>
@@ -7225,32 +7497,32 @@ No quiero ver la documentación</translation>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="297"/>
<source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
- <translation><b>Seleccionar Rango de Puntos</b><br/>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.<br/></translation>
+ <translation><b>Seleccionar Rango de Puntos</b><br/>Seleccione el punto inicial con el botón izquierdo del raton. Fije el punto final con una segunda pulsacion y elija entre las opciones. El rango seleccionado se marca en verde. Utilice el botón derecho del ratón para cancelar.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="305"/>
<source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
- <translation><b>Mover punto</b><br/>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.<br/></translation>
+ <translation><b>Mover punto</b><br/>Seleccione el punto con el botón izquierdo del raton y arrastrelo hasta la nueva posición. Suelte el punto con una segunda pulsacion. Utilice el botón derecho del ratón para cancelar.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="313"/>
<source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
- <translation><b>Añadir punto</b><br/>Mueva el ratón cerca de una línea y presione el botón izquierdo para agregar un punto. El punto se pegará al cursor y se puede mover. Suelte el punto con un clic izquierdo. Utilice el botón derecho del ratón para cancelar.<br/></translation>
+ <translation><b>Añadir punto</b><br/>Mueva el ratón cerca de una línea y presione el botón izquierdo para agregar un punto. El punto se pegará al cursor y se puede mover.Suelte el punto en la posición deseada con una segunda pulsacion. Utilice el botón derecho del ratón para cancelar..<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="321"/>
<source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
- <translation><b>Sin enrutamiento</b><br/>Todos los puntos se conectarán con una línea recta.<br/></translation>
+ <translation><b>Sin enrutamiento ni ajuste vectorial</b><br/>Todos los puntos se conectarán con una línea recta.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="327"/>
<source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
- <translation><b>Enrutamiento automático</b><br/>La configuración actual del enrutador se utiliza para calcular una ruta entre los puntos. <b>Nota:</b> El enrutador seleccionado debe ser capaz de trabajar al vuelo,por lo general, solo son capaces de hacerlo los instalados localmente.<br/></translation>
+ <translation><b>Enrutamiento automático</b><br/>El trazado entre los puntos se calcula automáticamente atendiendo a la configuración actual del enrutador. <b>Nota:</b> El enrutador seleccionado debe ser capaz de trabajar al vuelo,por lo general, solo son capaces de hacerlo los instalados localmente.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
<source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
- <translation><b>Enrutamiento vectorial</b><br/>Conecte puntos con una línea de un mapa vectorial.<br/></translation>
+ <translation><b>Ajuste vectorial</b><br/> El trazado se dibuja ajustandose automáticamente a las lineas de un mapa vectorial.<br/></translation>
</message>
<message>
<location filename="../mouse/line/IMouseEditLine.cpp" line="504"/>
@@ -7275,7 +7547,7 @@ No quiero ver la documentación</translation>
<message>
<location filename="../mouse/line/IMouseEditLine.h" line="135"/>
<source><br/><b>Move the map</b><br/>If you keep the left mouse button pressed and move the mouse, you will move the map.<br/><br/></source>
- <translation><br/><b>Mover el mapa</b><br/>Si mantiene pulsado el botón izquierdo del ratón y mueve, moverá el mapa.<br/><br/></translation>
+ <translation><br/><b>Mover el mapa</b><br/>Mantega pulsado el botón izquierdo mientras mueve el ratón, y moverá el mapa.<br/><br/></translation>
</message>
</context>
<context>
@@ -7371,7 +7643,7 @@ o
<message>
<location filename="../print/IPrintDialog.ui" line="79"/>
<source>When printing online maps make sure that the map has been loaded into the cache for the extent to be printed.</source>
- <translation>Al imprimir mapas en línea asegúrese de que el mapa se ha cargado en la memoria caché en la medida en que desea imprimir</translation>
+ <translation>Al imprimir mapas en línea asegúrese de que se haya cargado previamente en la memoria caché el mapa correspondiente a la extensión que desea imprimir.</translation>
</message>
<message>
<location filename="../print/IPrintDialog.ui" line="60"/>
@@ -7538,7 +7810,7 @@ o
<message>
<location filename="../gis/rte/router/IRouterBRouter.ui" line="111"/>
<source>BRouter: </source>
- <translation type="unfinished"></translation>
+ <translation>BRouter: </translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterBRouter.ui" line="118"/>
@@ -7548,7 +7820,7 @@ o
<message>
<location filename="../gis/rte/router/IRouterBRouter.ui" line="125"/>
<source>start/stop BRouter</source>
- <translation type="unfinished"></translation>
+ <translation>iniciar/parar Brouter</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterBRouter.ui" line="139"/>
@@ -7594,7 +7866,7 @@ o
<message>
<location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="54"/>
<source>BRouter-Web (online)</source>
- <translation type="unfinished"></translation>
+ <translation>BRouter-Web (online)</translation>
</message>
<message>
<location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="61"/>
@@ -7609,7 +7881,7 @@ o
<message>
<location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="91"/>
<source>local BRouter Installation directory:</source>
- <translation>Carpeta de instalación de BRouter local</translation>
+ <translation>Carpeta de instalación de BRouter local:</translation>
</message>
<message>
<location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="103"/>
@@ -7699,22 +7971,22 @@ o
<message>
<location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="451"/>
<source>BRouter-Web URL:</source>
- <translation type="unfinished"></translation>
+ <translation>BRouter-Web URL:</translation>
</message>
<message>
<location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="501"/>
<source>Service-URL</source>
- <translation type="unfinished"></translation>
+ <translation>Servicio-URL</translation>
</message>
<message>
<location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="511"/>
<source>Profile-URL</source>
- <translation type="unfinished"></translation>
+ <translation>Perfil-URL</translation>
</message>
<message>
<location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="561"/>
<source>Hostname</source>
- <translation type="unfinished"></translation>
+ <translation>Nombre de Host</translation>
</message>
<message>
<location filename="../gis/rte/router/brouter/IRouterBRouterSetupWizard.ui" line="571"/>
@@ -7840,7 +8112,7 @@ o
<message>
<location filename="../gis/rte/router/IRouterRoutino.ui" line="52"/>
<source>Add paths with Routino database.</source>
- <translation>Añadir carpeta con base de datos de Routino</translation>
+ <translation>Añadir carpeta con base de datos de Routino.</translation>
</message>
<message>
<location filename="../gis/rte/router/IRouterRoutino.ui" line="55"/>
@@ -7863,7 +8135,7 @@ o
<message>
<location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="14"/>
<source>Setup Routino database...</source>
- <translation>Configurar base de datos de Routino</translation>
+ <translation>Configurar base de datos de Routino...</translation>
</message>
<message>
<location filename="../gis/rte/router/routino/IRouterRoutinoPathSetup.ui" line="27"/>
@@ -7911,7 +8183,7 @@ o
<message>
<location filename="../tool/IRoutinoDatabaseBuilder.ui" line="86"/>
<source>Target Path:</source>
- <translation>Carpeta de destino</translation>
+ <translation>Carpeta de destino:</translation>
</message>
<message>
<location filename="../tool/IRoutinoDatabaseBuilder.ui" line="93"/>
@@ -7954,7 +8226,7 @@ o
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="99"/>
<source>Ctrl+M</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+M</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="115"/>
@@ -7964,7 +8236,7 @@ o
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="125"/>
<source>Ctrl++</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl++</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="138"/>
@@ -7974,42 +8246,32 @@ o
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="148"/>
<source>Ctrl+R</source>
- <translation type="unfinished">Ctrl+R</translation>
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
- <source>Delete a point. (Ctrl+D)</source>
- <translation>Borrar un punto. (Ctrl+D)</translation>
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
- <source>Ctrl+D</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+R</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="215"/>
<source>No auto-routing or line snapping (Ctrl+O)</source>
- <translation>Sin enrutamiento automático ni ajuste de línea (Ctrl + O)</translation>
+ <translation>Dibuja libremente. Sin enrutamiento automático ni ajuste vectorial (Ctrl + O)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="225"/>
<source>Ctrl+O</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+O</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="238"/>
<source>Use auto-routing to between points. (Ctrl+A)</source>
- <translation>Utilice el enrutamiento automático entre los puntos. (Ctrl+A)</translation>
+ <translation>Dibuja usando el enrutamiento automático entre puntos. (Ctrl+A)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="248"/>
<source>Ctrl+A</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+A</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="261"/>
<source>Snap line along lines of a vector map. (Ctrl+V)</source>
- <translation>Seguir linea de mapa vectorial. (Ctrl+V)</translation>
+ <translation>Dibuja ajustandose a las lineas de un mapa vectorial. (Ctrl+V)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="92"/>
@@ -8022,19 +8284,29 @@ o
<translation>...</translation>
</message>
<message>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
+ <source>Delete a point. (Ctrl+-)</source>
+ <translation>Borrar un punto. (Ctrl+-)</translation>
+ </message>
+ <message>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
+ <source>Ctrl+-</source>
+ <translation>Ctrl+-</translation>
+ </message>
+ <message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
<source>0</source>
- <translation type="unfinished"></translation>
+ <translation>0</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="241"/>
<source>A</source>
- <translation type="unfinished"></translation>
+ <translation>A</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="264"/>
<source>V</source>
- <translation type="unfinished"></translation>
+ <translation>V</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="271"/>
@@ -8103,7 +8375,7 @@ o
<message>
<location filename="../mouse/IScrOptPrint.ui" line="35"/>
<source>Save selected area as image.</source>
- <translation>Guardar el área seleccionada como imagen</translation>
+ <translation>Guardar el área seleccionada como imagen.</translation>
</message>
<message>
<location filename="../mouse/IScrOptPrint.ui" line="38"/>
@@ -8114,7 +8386,7 @@ o
<message>
<location filename="../mouse/IScrOptPrint.ui" line="55"/>
<source>Print selected area.</source>
- <translation type="unfinished">Imprimir área seleccionada</translation>
+ <translation>Imprimir área seleccionada.</translation>
</message>
</context>
<context>
@@ -8168,8 +8440,8 @@ o
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
- <source>Select an activity for the selected range.</source>
- <translation>Seleccionar una actividad para el rango seleccionado</translation>
+ <source>Set an activity for the selected range.</source>
+ <translation>Asigna una Actividad para el rango seleccionado.</translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
@@ -8209,27 +8481,27 @@ o
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="40"/>
<source>View details and edit.</source>
- <translation>Ver detalles y editar</translation>
+ <translation>Ver detalles y editar.</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="68"/>
<source>Delete route from project.</source>
- <translation>Borrar ruta del proyecto</translation>
+ <translation>Borrar ruta del proyecto.</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="103"/>
<source>Calculate route.</source>
- <translation>Calcular ruta</translation>
+ <translation>Calcular ruta.</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="117"/>
<source>Reset route calculation.</source>
- <translation>Reiniciar cálculo de ruta</translation>
+ <translation>Reiniciar cálculo de ruta.</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="131"/>
<source>Move route points.</source>
- <translation>Mover puntos de ruta</translation>
+ <translation>Mover puntos de ruta.</translation>
</message>
<message>
<location filename="../gis/rte/IScrOptRte.ui" line="145"/>
@@ -8260,62 +8532,68 @@ o
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
<location filename="../mouse/IScrOptSelect.ui" line="142"/>
- <location filename="../mouse/IScrOptSelect.ui" line="196"/>
- <location filename="../mouse/IScrOptSelect.ui" line="225"/>
- <location filename="../mouse/IScrOptSelect.ui" line="285"/>
- <location filename="../mouse/IScrOptSelect.ui" line="312"/>
- <location filename="../mouse/IScrOptSelect.ui" line="339"/>
- <location filename="../mouse/IScrOptSelect.ui" line="366"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="156"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="210"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="239"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="299"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="326"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="353"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="380"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="79"/>
<source>Create a route from selected waypoints.</source>
- <translation>Crear ruta con los waypoints seleccionados</translation>
+ <translation>Crear ruta con los waypoints seleccionados.</translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="99"/>
<source>Change the icon of all selected waypoints.</source>
- <translation>Cambiar el icono a los waypoints seleccionados</translation>
+ <translation>Cambiar el icono a los waypoints seleccionados.</translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="119"/>
<source>Combine all selected tracks to a new one.</source>
- <translation>Combinar todos los tracks seleccionadas en uno nuevo</translation>
+ <translation>Combinar todos los tracks seleccionadas en uno nuevo.</translation>
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="139"/>
+ <source>Set an activity for all selected tracks.</source>
+ <translation>Asigna una Actividad para todos los tracks seleccionados.</translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="153"/>
<source>Delete all selected items.</source>
- <translation>Borrar los elementos seleccionados</translation>
+ <translation>Borrar los elementos seleccionados.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="193"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="207"/>
<source>Select all items that intersect the selected area.</source>
<translation>Seleccione los elementos que interseccionan el área seleccionada.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="222"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="236"/>
<source>Select all items that are completely inside the selected area.</source>
<translation>Seleccione los elementos que estan dentro del area seleccionada. </translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="282"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="296"/>
<source>Add tracks to selection.</source>
- <translation>Añadir tracks a la selección</translation>
+ <translation>Añadir tracks a la selección.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="309"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="323"/>
<source>Add waypoints to selection.</source>
<translation>Añadir waypoints a la selección.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="336"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="350"/>
<source>Add routes to selection.</source>
<translation>Añadir rutas a selección.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="363"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="377"/>
<source>Add areas to selection.</source>
<translation>Añadir áreas a la selección.</translation>
</message>
@@ -8353,6 +8631,7 @@ o
<location filename="../gis/trk/IScrOptTrk.ui" line="151"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="170"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="184"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="198"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -8364,7 +8643,7 @@ o
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="68"/>
<source>Delete track from project.</source>
- <translation>Eliminar track del proyecto</translation>
+ <translation>Eliminar track del proyecto.</translation>
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="106"/>
@@ -8389,20 +8668,25 @@ o
* use the track parts to plan a new tour
* cut a long track into stages
</source>
- <translation>Divida el track por el punto seleccionado. Puede usar esto para:
+ <translation>Dividir el track por el punto seleccionado. Puede usar esto para:
-*Eliminar puntos erróneos del principio o del final.
-*Utilizar partes del track para planificar otro nuevo.
-*Dividir un track muy largo en varias etapas.
+* Eliminar puntos erróneos del principio o del final
+* Utilizar partes del track al planificar un nuevo recorrido
+* Dividir un track muy largo en varias etapas
</translation>
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
+ <source>Set an activity for the complete track.</source>
+ <translation>Asigna una Actividad al track completo.</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
<source>Copy track together with all attached waypoints into another project.</source>
<translation>Copiar track junto con todos los waypoints conectados en otro proyecto.</translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="210"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="224"/>
<source>TextLabel</source>
<translation>Denominación</translation>
</message>
@@ -8432,7 +8716,7 @@ o
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="63"/>
<source>Copy waypoint into another project.</source>
- <translation><html><head/><body><p>Copiar waypoint en otro proyecto.</p></body></html></translation>
+ <translation>Copiar waypoint en otro proyecto.</translation>
</message>
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="77"/>
@@ -8442,7 +8726,7 @@ o
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="98"/>
<source>Show content as static bubble.</source>
- <translation>Mostrar contenido en burbuja de texto</translation>
+ <translation>Mostrar contenido en globo de texto.</translation>
</message>
<message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="115"/>
@@ -8495,7 +8779,7 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
<message>
<location filename="../gis/ISelDevices.ui" line="14"/>
<source>Select devices...</source>
- <translation>Seleccionar dispositivos</translation>
+ <translation>Seleccionar dispositivos...</translation>
</message>
</context>
<context>
@@ -8562,7 +8846,7 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
<message>
<location filename="../gis/db/ISelectDBFolder.ui" line="14"/>
<source>Select Parent Folder...</source>
- <translation type="unfinished">Seleccione la carpeta principal.</translation>
+ <translation type="unfinished">Seleccione la carpeta principal...</translation>
</message>
<message>
<location filename="../gis/db/ISelectDBFolder.ui" line="26"/>
@@ -8725,7 +9009,7 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="252"/>
<source><p align="justify"><span style=" font-weight:600;">Caution!</span> It is recommended to leave the password blank, as QMapShack will store it as plain text. If you don't give a password you will be asked for it on each startup.</p></source>
- <translation type="unfinished"><p align="justify"><span style=" font-weight:600;">Precación</span> Se recomienda dejar la contraseña en blanco, ya que QMapShack lo almacenará como texto sin formato. Si no introduce una contraseña, se le pedirá que en cada inicio.</p></translation>
+ <translation><p align="justify"><span style=" font-weight:600;">Precaución</span> Se recomienda dejar la contraseña en blanco, ya que QMapShack lo almacenará como texto sin formato. Si no introduce una contraseña, se le pedirá en cada inicio.</p></translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="239"/>
@@ -8735,12 +9019,12 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="153"/>
<source>SQLite</source>
- <translation type="unfinished"></translation>
+ <translation>SQLite</translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="115"/>
<source>MySQL</source>
- <translation type="unfinished"></translation>
+ <translation>MySQL</translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="181"/>
@@ -8755,7 +9039,7 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="206"/>
<source>00000</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">00000</translation>
</message>
<message>
<location filename="../gis/db/ISetupDatabase.ui" line="215"/>
@@ -8804,17 +9088,17 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
<message>
<location filename="../gis/ISetupFilter.ui" line="38"/>
<source>Apply filter to</source>
- <translation type="unfinished"></translation>
+ <translation>Aplicar filtro a</translation>
</message>
<message>
<location filename="../gis/ISetupFilter.ui" line="45"/>
<source>name only</source>
- <translation type="unfinished"></translation>
+ <translation>Solo nombre</translation>
</message>
<message>
<location filename="../gis/ISetupFilter.ui" line="52"/>
<source>complete text</source>
- <translation type="unfinished"></translation>
+ <translation>Texto completo</translation>
</message>
</context>
<context>
@@ -8855,7 +9139,7 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
<message>
<location filename="../gis/wpt/ISetupNewWpt.ui" line="22"/>
<source>Symbol</source>
- <translation>Símbolo.</translation>
+ <translation>Símbolo</translation>
</message>
<message>
<location filename="../gis/wpt/ISetupNewWpt.ui" line="29"/>
@@ -8870,7 +9154,7 @@ Si introduce la 'palabra' entre apóstrofes se busca una coincidencia
<message>
<location filename="../gis/wpt/ISetupNewWpt.ui" line="49"/>
<source>Name</source>
- <translation type="unfinished">Nombre</translation>
+ <translation>Nombre</translation>
</message>
<message>
<location filename="../gis/wpt/ISetupNewWpt.ui" line="59"/>
@@ -8909,7 +9193,35 @@ o
<message>
<location filename="../gis/db/ISetupWorkspace.ui" line="63"/>
<source>00000</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">00000</translation>
+ </message>
+</context>
+<context>
+ <name>ITemplateWidget</name>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="14"/>
+ <source>Insert Template...</source>
+ <translation>Insertar plantilla...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="32"/>
+ <source>Templates</source>
+ <translation>Plantillas</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="42"/>
+ <source>Select a path with your own templates.</source>
+ <translation>Selecciona una ruta con tus propias plantillas</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="45"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="77"/>
+ <source>Preview</source>
+ <translation>Vista previa</translation>
</message>
</context>
<context>
@@ -8920,264 +9232,279 @@ o
<translation>Editar texto...</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="25"/>
- <location filename="../widgets/ITextEditWidget.ui" line="331"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="45"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="351"/>
<source>Undo</source>
<translation>Deshacer</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="354"/>
<source>Ctrl+Z</source>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="38"/>
- <location filename="../widgets/ITextEditWidget.ui" line="343"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="58"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="363"/>
<source>Redo</source>
<translation>Rehacer</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="346"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="366"/>
<source>Ctrl+Shift+Z</source>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="51"/>
- <location filename="../widgets/ITextEditWidget.ui" line="355"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="71"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="375"/>
<source>Cut</source>
<translation>Cortar</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="358"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="378"/>
<source>Ctrl+X</source>
<translation>Ctrl+X</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="64"/>
- <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="84"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="387"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="370"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="390"/>
<source>Ctrl+C</source>
<translation>Ctrl+C</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="77"/>
- <location filename="../widgets/ITextEditWidget.ui" line="375"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="97"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="395"/>
<source>Paste</source>
<translation>Pegar</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="25"/>
+ <source>Templ.</source>
+ <translation>Plantilla.</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="120"/>
<source>A:L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="133"/>
<source>A:C</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="146"/>
<source>A:R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="159"/>
<source>A:B</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="192"/>
<source>B</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="205"/>
<source>I</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="218"/>
<source>U</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="238"/>
<source>C</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="285"/>
<source>Standard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="290"/>
<source>Bullet List (Disc)</source>
<translation>Lista de viñetas (Disco)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="295"/>
<source>Bullet List (Circle)</source>
<translation>Lista de viñetas (círculos)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="300"/>
<source>Bullet List (Square)</source>
<translation>Lista de viñetas(cuadrados)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="305"/>
<source>Ordered List (Decimal)</source>
<translation>Lista ordenada(decimal)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="310"/>
<source>Ordered List (Alpha lower)</source>
<translation>Lista ordenada (alfabético descendente)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="315"/>
<source>Ordered List (Alpha upper)</source>
<translation>Lista ordenada (alfabético ascendente)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="320"/>
<source>Ordered List (Roman lower)</source>
<translation>Lista ordenada (números romanos descendente)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="325"/>
<source>Ordered List (Roman upper)</source>
<translation>Lista ordenada (números romanos ascendente)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="378"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="398"/>
<source>Ctrl+V</source>
<translation>Ctrl+V</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="390"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="410"/>
<source>Align Left</source>
<translation>Alinear a la Izquierda</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="393"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="413"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="405"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="425"/>
<source>Align Right</source>
<translation>Alinear a la Derecha</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="408"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="428"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="420"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="440"/>
<source>Align Center</source>
<translation>Alinear al Centro</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="423"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="443"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="435"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="455"/>
<source>Align Block</source>
<translation>Alinear Bloque</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="438"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="458"/>
<source>Ctrl+J</source>
<translation>Ctrl+J</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="450"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="470"/>
<source>Underline</source>
<translation>Subrayar</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="453"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="473"/>
<source>Ctrl+U</source>
<translation>Ctrl+U</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="465"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="485"/>
<source>Bold</source>
<translation>Negrita</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="468"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="488"/>
<source>Ctrl+B</source>
<translation>Ctrl+B</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="480"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="500"/>
<source>Italic</source>
<translation>Cursiva</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="483"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="503"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="515"/>
<source>Plain</source>
<translation>Plano</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="518"/>
<source>Reset the text's format before pasting</source>
<translation>Restablecer el formato del texto antes del pegado</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="503"/>
- <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="523"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="526"/>
<source>Select All</source>
<translation>Seleccionar todo</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="529"/>
<source>Ctrl+A</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+A</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="514"/>
- <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="534"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="537"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="522"/>
- <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="542"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="545"/>
<source>Reset Font</source>
<translation>Restablecer fuente</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="530"/>
- <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="550"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="553"/>
<source>Reset Layout</source>
<translation>Restablecer diseño</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="565"/>
<source>Normal</source>
- <translation type="unfinished"></translation>
+ <translation>Normal</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="568"/>
<source>Paste without resetting the text's format</source>
<translation>Pegar sin restablecer el formato del texto</translation>
</message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="577"/>
+ <source>Insert From Template</source>
+ <translation>Insertar desde plantilla</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="580"/>
+ <source>Create text from template.</source>
+ <translation>Crear texto desde plantilla.</translation>
+ </message>
</context>
<context>
<name>ITextEditWidgetSelMenu</name>
@@ -9257,6 +9584,11 @@ o
<source>Setup Toolbar</source>
<translation>Configuración de barra de herramientas</translation>
</message>
+ <message>
+ <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
+ <source>Toolbar is visible in Fullscreen-mode</source>
+ <translation>Barra de herramientas visible en modo Pantalla Completa</translation>
+ </message>
</context>
<context>
<name>IToolShell</name>
@@ -9309,7 +9641,7 @@ o
<message>
<location filename="../units/IUnit.cpp" line="728"/>
<source>Bad position format. Must be: "[N|S] ddd mm.sss [W|E] ddd mm.sss" or "[N|S] ddd.ddd [W|E] ddd.ddd"</source>
- <translation type="unfinished">Formato de coordenadas incorrecto. Debe ser: "[N|S] ggg mm.sss [W|E] ggg mm.sss" o "[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
+ <translation>Formato de coordenadas incorrecto. Debe ser: "[N|S] ggg mm.sss [W|E] ggg mm.sss" o "[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
</message>
<message>
<location filename="../units/IUnit.cpp" line="734"/>
diff --git a/src/locale/qmapshack_fr.ts b/src/locale/qmapshack_fr.ts
index a667658..824f3fc 100644
--- a/src/locale/qmapshack_fr.ts
+++ b/src/locale/qmapshack_fr.ts
@@ -22,97 +22,100 @@
<context>
<name>CActivityTrk</name>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="51"/>
<source>Foot</source>
<translation>A pieds</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="59"/>
<source>Bicycle</source>
<translation>Vélo</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="67"/>
<source>Motor Bike</source>
<translation>Moto</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="75"/>
<source>Car</source>
<translation>Voiture</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="83"/>
<source>Cable Car</source>
<translation>Téléphérique</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="91"/>
<source>Swim</source>
<translation>Natation</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="99"/>
<source>Ship</source>
<translation>Bateau</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="115"/>
<source>Ski/Winter</source>
<translation>Ski</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
+ <source>No Activity</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
+ <source>Total</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
<source>Ascent:</source>
<translation>Montée:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="329"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="372"/>
<source>Descent:</source>
<translation>Descente:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="107"/>
<source>Aeronautics</source>
<translation>Aérien</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="307"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+ <source>Public Transport</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
<source>Distance:</source>
<translation>Distance:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="396"/>
<source>Speed Moving:</source>
<translation>Vitesse moyenne en déplacement:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="351"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="420"/>
<source>Speed Total:</source>
<translation>Vitesse moyenne totale:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="275"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="362"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="444"/>
<source>Time Moving:</source>
<translation>Temps en déplacement:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="277"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="468"/>
<source>Time Total:</source>
<translation>Temps total:</translation>
</message>
- <message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="414"/>
- <source>None</source>
- <translation>Aucune</translation>
- </message>
</context>
<context>
<name>CCanvas</name>
@@ -267,27 +270,27 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
<source>Failed to load...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <location filename="../gis/db/CDBProject.cpp" line="114"/>
<source>Can't load file "%1" . It will be skipped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
<source>Project already in database...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <location filename="../gis/db/CDBProject.cpp" line="128"/>
<source>The project "%1" has already been imported into the database. It will be skipped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="278"/>
+ <location filename="../gis/db/CDBProject.cpp" line="279"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -295,47 +298,47 @@ To solve this conflict you can create and save a clone, force your version or dr
Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer votre version ou abandonner votre version en prenant celle de la base de données</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="284"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Conflict with database...</source>
<translation>Confilt avec la base de données...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="285"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Clone && Save</source>
<translation>Cloner && Sauvegarder</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="286"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Force Save</source>
<translation>Forcer la sauvegarde</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="287"/>
+ <location filename="../gis/db/CDBProject.cpp" line="288"/>
<source>Take remote</source>
<translation>Prendre la version de la base de données</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="569"/>
+ <location filename="../gis/db/CDBProject.cpp" line="572"/>
<source>Missing folder...</source>
<translation>Répertoire manquant...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="570"/>
+ <location filename="../gis/db/CDBProject.cpp" line="573"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation>Echec de la sauvegarde du projet. Le répertoire a été supprimé de la base de données.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="577"/>
+ <location filename="../gis/db/CDBProject.cpp" line="580"/>
<source>Save ...</source>
<translation>Enregistrer...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>There was an unexpected database error:
%1</source>
@@ -344,12 +347,12 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
%1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="755"/>
+ <location filename="../gis/db/CDBProject.cpp" line="760"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation>Le projet '%1' est sur le point de se mettre à jour depuis la base de données.Néanmoins il y a des modifications non sauvegardées.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="756"/>
+ <location filename="../gis/db/CDBProject.cpp" line="761"/>
<source>Save changes?</source>
<translation>Enregistrer les modifications ?</translation>
</message>
@@ -436,7 +439,7 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<name>CDetailsPrj</name>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="267"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="774"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>none</source>
<translation>aucun</translation>
</message>
@@ -446,65 +449,65 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<translation>Créer le journal...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="437"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="419"/>
<source><h2>Waypoints</h2></source>
<translation><h2>Waypoints</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="444"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="470"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="591"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="709"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="739"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="426"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="452"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="573"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="691"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="721"/>
<source>Info</source>
<translation>Information</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="471"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="427"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="574"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="692"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="722"/>
<source>Comment</source>
<translation>Commentaire</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="463"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
<source><h2>Tracks</h2></source>
<translation><h2>Traces</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>From Start</source>
<translation>Depuis le début</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To Next</source>
<translation>Jusqu'au suivant</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To End</source>
<translation>Jusqu'à la fin</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="613"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
<source>distance: </source>
<translation>Distance:</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="623"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
<source>ascent: </source>
<translation>montée:</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="633"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
<source>descent: </source>
<translation>descente:</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="702"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
<source><h2>Areas</h2></source>
<translation><h2>Surfaces</h2></translation>
</message>
@@ -524,34 +527,34 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<translation>Résumé de toutes les traces du projet</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="732"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
<source><h2>Routes</h2></source>
<translation><h2>Routes</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Edit name...</source>
<translation>Éditer le nom...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Enter new project name.</source>
<translation>Entrez le nom du nouveau projet.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Edit keywords...</source>
<translation>Éditer les mots-clés...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Enter keywords.</source>
<translation>Saisir les mots-clés.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="915"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="897"/>
<source>Print Diary</source>
<translation>Imprimer le journal</translation>
</message>
@@ -559,45 +562,35 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<context>
<name>CDetailsTrk</name>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
<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="172"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
<source>Change elevation of track points</source>
<translation>Modifier l'altitude des points de la trace</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
<source>Change timestamp of track points</source>
<translation>Modifier l'horodatage des points de la trace</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
<source>Miscellaneous</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
<source>Color</source>
<translation>Couleur</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
<source>Activity</source>
<translation>Activité</translation>
</message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>Reset activities...</source>
- <translation>Réinitialiser les activités...</translation>
- </message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>This will remove all activities from the track. Proceed?</source>
- <translation>Toutes les activités seront supprimées de la trace. Etes-vous sûr ?</translation>
- </message>
</context>
<context>
<name>CDetailsWpt</name>
@@ -610,7 +603,7 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<context>
<name>CDeviceGarmin</name>
<message>
- <location filename="../device/CDeviceGarmin.cpp" line="265"/>
+ <location filename="../device/CDeviceGarmin.cpp" line="272"/>
<source>Picture%1</source>
<translation>Image%1</translation>
</message>
@@ -972,7 +965,7 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<context>
<name>CGisItemTrk</name>
<message>
- <location filename="../gis/fit/serialization.cpp" line="246"/>
+ <location filename="../gis/fit/serialization.cpp" line="285"/>
<source>FIT file %1 contains no GPS data.</source>
<translation>Le fichier FIT %1 ne contient pas de donnée GPS.</translation>
</message>
@@ -1013,252 +1006,252 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<translation>Points de la trace modifiés, les données antérieures sont perdues.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="305"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
<source>Length: %1 %2</source>
<translation>Longueur: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="312"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation>, %1%2 %3, %4%5 %6</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="346"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
<source>Start: %1</source>
<translation>Début: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="350"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
<source>Start: -</source>
<translation>Début: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="356"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
<source>End: %1</source>
<translation>Fin: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="360"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
<source>End: -</source>
<translation>Fin: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="364"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
<source>Points: %1 (%2)</source>
<translation>Points: %1 (%2)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="368"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
<source>Invalid elevations!</source>
<translation>Altitudes invalides !</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
<source>Invalid timestamps!</source>
<translation>Temps invalides !</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="378"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
<source>Invalid positions!</source>
<translation>Positions invalides !</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="387"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
<source>Activities: %1</source>
<translation>Activités: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="495"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
<source>Index: %1</source>
<translation>Index: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="499"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
<source>Index: visible %1, total %2</source>
<translation>Index: visibles %1, total %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="510"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
<source>Ele.: %1 %2</source>
<translation>Altitude: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="513"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
<source> slope: %1%3 (%2%)</source>
<translation> pente: %1%3(%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="518"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
<source> speed: %1%2</source>
<translation> vitesse: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="546"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
<source>... and %1 tags not displayed</source>
<translation>... and %1 tags non affichés</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
<source>Distance: - (-)</source>
<translation>Distance: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="559"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source>Moving: - (-)</source>
<translation>En déplacement: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
<source>track</source>
<translation>trace</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
<source>Hide point %1.</source>
<translation>Cacher les points %1.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
<source>Hide points %1..%2.</source>
<translation>Cacher les points %1..%2.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="582"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
<source> Moving: %1%2 (%3%)</source>
<translation> En mouvement: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
<source>, %1%2</source>
<translation>,%1,%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
<source> Time: %1%2</source>
<translation> Temps : %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
<source>, %1-, %2-</source>
<translation>, %1-, %2-</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="324"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
<source>Time: %1, Speed: %2 %3</source>
<translation>Temps: %1, Vitesse: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="328"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
<source>Time: -, Speed: -</source>
<translation>Time: -, Speed: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation>En déplacement: %1, Vitesse: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
<source>Moving: -, Speed: -</source>
<translation>En déplacement: -, Vitesse: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="556"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
<source>Ascent: - (-)</source>
<translation>Montée: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="557"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
<source>Descent: - (-)</source>
<translation>Descente: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="564"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
<source>Ascent: %1%2 (%3%)</source>
<translation>Montée: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="570"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
<source> Descent: %1%2 (%3%)</source>
<translation> Descente: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
<source>Distance: %1%2 (%3%)</source>
<translation>Distance: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Ascent: -</source>
<translation>Ascent: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Descent: -</source>
<translation>Descente: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
<source>Ascent: %1%2</source>
<translation>Montée: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
<source> Descent: %1%2</source>
<translation> Descente: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
<source>Distance: %1%2</source>
<translation>Distance: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
<source>Permanently removed points %1..%2</source>
<translation>Points supprimés de manière permanente %1..%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
<source>Show points.</source>
<translation>Afficher les points.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
<source>Changed name</source>
<translation>Nom modifié</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
<source>Changed comment</source>
<translation>Commentaire modifié</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
<source>Changed description</source>
<translation>Description modifiée</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
<source>Changed links</source>
<translation>Liens modifiés</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
<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="2041"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
<source>Changed activity to '%1' for complete track.</source>
<translation>Acirvité modifiée pour '%1' pour la trace complète.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation>Activité modifiée pur '%1' for la plage (%2..%3).</translation>
</message>
@@ -1599,191 +1592,201 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<translation>Masquer</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="110"/>
+ <location filename="../gis/CGisListWks.cpp" line="109"/>
<source>Sort by Time</source>
<translation>Trier par date</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="111"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Name</source>
<translation>Trier par nom</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="117"/>
<source>Save</source>
<translation>Enregistrer</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <location filename="../gis/CGisListWks.cpp" line="122"/>
<source>Send to Devices</source>
<translation>Envoyer vers les appareils</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Sync. with Database</source>
<translation>Synchroniser avec la base de données</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="123"/>
+ <location filename="../gis/CGisListWks.cpp" line="126"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
+ <location filename="../gis/CGisListWks.cpp" line="135"/>
<source>Update Project on Device</source>
<translation>Mettre à jour le projet sur l'appareil</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="134"/>
- <location filename="../gis/CGisListWks.cpp" line="157"/>
+ <location filename="../gis/CGisListWks.cpp" line="137"/>
+ <location filename="../gis/CGisListWks.cpp" line="161"/>
<source>Delete</source>
<translation>Supprimer</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="146"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Edit...</source>
<translation>Éditer...</translation>
</message>
<message>
<location filename="../gis/CGisListWks.cpp" line="102"/>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="150"/>
<source>Copy to...</source>
<translation>Copier vers...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <source>Autom. Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="118"/>
<source>Save as...</source>
<translation>Sauvegarder sous...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Track Profile</source>
<translation>Profile de la trace</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Select Range</source>
<translation>Sélectionner des points</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Edit Track Points</source>
<translation>Éditer les points de la trace</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="156"/>
<source>Reverse Track</source>
<translation>Inverser la trace</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="154"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Combine Tracks</source>
<translation>Joindre des traces</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="159"/>
<source>Copy Track with Waypoints</source>
<translation>Copier la trace avec ses waypoints</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="167"/>
<source>Show Bubble</source>
<translation>Afficher la bulle</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="165"/>
+ <location filename="../gis/CGisListWks.cpp" line="169"/>
<source>Move Waypoint</source>
<translation>Déplacer le waypoint</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <location filename="../gis/CGisListWks.cpp" line="170"/>
<source>Proj. Waypoint...</source>
<translation>Projection du waypoint...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Route Instructions</source>
<translation>Instructions de guidage</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="180"/>
<source>Calculate Route</source>
<translation>Calculer l'itinéraire</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="181"/>
<source>Reset Route</source>
<translation>Réinitialiser la route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="178"/>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Edit Route</source>
<translation>Éditer la route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="179"/>
+ <location filename="../gis/CGisListWks.cpp" line="183"/>
<source>Convert to Track</source>
<translation>Convertir en trace</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="188"/>
+ <location filename="../gis/CGisListWks.cpp" line="192"/>
<source>Edit Area Points</source>
<translation>Éditer les points de la surface</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="195"/>
+ <location filename="../gis/CGisListWks.cpp" line="199"/>
<source>Create Route</source>
<translation>Créer une route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <location filename="../gis/CGisListWks.cpp" line="200"/>
<source>Change Icon (sel. waypt. only)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="627"/>
+ <location filename="../gis/CGisListWks.cpp" line="158"/>
+ <source>Set Track Activity</source>
+ <translation type="unfinished">Choisir l'activité de la trace</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="634"/>
<source>Drop items...</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="778"/>
+ <location filename="../gis/CGisListWks.cpp" line="785"/>
<source>Saving workspace. Please wait.</source>
<translation>Sauvegarde de l'espace de travail. Patientez.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="824"/>
+ <location filename="../gis/CGisListWks.cpp" line="831"/>
<source>Loading workspace. Please wait.</source>
<translation>Chargement de l'espace de travail. Patientez.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>Close all projects...</source>
<translation>Fermer tous les projets...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>This will remove all projects from the workspace.</source>
<translation>Ceci enlevera tous les projets de l'espace de travail.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Delete project...</source>
<translation>Supprimer le projet...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Do you really want to delete %1?</source>
<translation>Êtes-vous sûr de vouloir supprimer %1?</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="652"/>
- <location filename="../gis/CGisListWks.cpp" line="1646"/>
- <location filename="../gis/CGisListWks.cpp" line="1684"/>
+ <location filename="../gis/CGisListWks.cpp" line="659"/>
+ <location filename="../gis/CGisListWks.cpp" line="1691"/>
+ <location filename="../gis/CGisListWks.cpp" line="1729"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation><b>Mise à jour des appareils</b><p>Mise à jour de %1<br/>Patientez...</p></translation>
</message>
@@ -1801,22 +1804,22 @@ Pour résoudre ce conflit vous pouvez créer et sauvegarder un clone, forcer vot
<translation>Le projet "%1" est déjà présent dans l'espace de travail.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="554"/>
+ <location filename="../gis/CGisWidget.cpp" line="559"/>
<source>Copy items...</source>
<translation>Copier les éléments...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="573"/>
+ <location filename="../gis/CGisWidget.cpp" line="578"/>
<source>Change waypoint symbols.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Cut Track...</source>
<translation>Couper la trace...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Do you want to delete the original track?</source>
<translation>Voulez-vous supprimer la trace originale?</translation>
</message>
@@ -1974,7 +1977,7 @@ ligne %2, colonne %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
<source>Speed</source>
<translation>Vitesse</translation>
</message>
@@ -2000,37 +2003,42 @@ ligne %2, colonne %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+ <source>Energy</source>
+ <translation>Energie</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
<source>Sea Level Pressure</source>
<translation>Pression au niveau de la mer</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
<source>Speed (vertical)</source>
<translation>Vitesse (verticale)</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
<source>Slope*</source>
<translation>Pente*</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
<source>Speed*</source>
<translation>Vitesse*</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
<source>Elevation</source>
<translation>Altitude</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
<source>Progress</source>
<translation>Progression</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
<source>Terrain slope</source>
<translation>Pente du terrain</translation>
</message>
@@ -2046,53 +2054,53 @@ ligne %2, colonne %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="769"/>
+ <location filename="../CMainWindow.cpp" line="813"/>
<source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
<translation>Utilisez <b>Menu->Vue->Add Map View</b> pour ouvrir une nouvelle vue. Ou <b>Menu->Fichier->Charger une vue cartographique</b> pour charger une vue sauvegardée. Ou cliquez <a href='newview'>ici</a>.</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="897"/>
+ <location filename="../CMainWindow.cpp" line="941"/>
<source>Ele: %1%2</source>
<translation>Altitude: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="909"/>
+ <location filename="../CMainWindow.cpp" line="953"/>
<source>Slope: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="925"/>
+ <location filename="../CMainWindow.cpp" line="969"/>
<source>[Grid: %1]</source>
<translation>[Grille: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1066"/>
+ <location filename="../CMainWindow.cpp" line="1110"/>
<source>Load GIS Data...</source>
<translation>Charger des données SIG...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
<source>Select output file</source>
<translation>Sélectionner le fichier de sortie</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>QMapShack View (*.view)</source>
<translation>Vue QMapShack (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>Select file to load</source>
<translation>Sélectionner le fichier à charger</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1369"/>
+ <location filename="../CMainWindow.cpp" line="1481"/>
<source>Fatal...</source>
<translation>Fatal...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1370"/>
+ <location filename="../CMainWindow.cpp" line="1482"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation type="unfinished"></translation>
</message>
@@ -2852,19 +2860,18 @@ Fall back to internal types.</source>
<context>
<name>CMapTMS</name>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
- <location filename="../map/CMapTMS.cpp" line="77"/>
- <location filename="../map/CMapTMS.cpp" line="136"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Error...</source>
<translation>Erreur...</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
<source>Failed to open %1</source>
<translation>Impossible d'ouvrir: %1 </translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="77"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
@@ -2873,27 +2880,17 @@ ligne %2, colonne %3:
%4</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="115"/>
+ <location filename="../map/CMapTMS.cpp" line="116"/>
<source>Layer %1</source>
<translation>Calque %1</translation>
</message>
- <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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>L'affichage de cette carte nécessite l'utilisation d'OpenSSL. Par défaut OpenSSL n'est pas inclus dans QMapShack à cause de restriction légales dans certains pays. Vous pouvez consulter <a href='https://www.openssl.org/community/binaries.html'>la page d'accueil OpenSSL</a> pour trouver des fichiers binaires. Vous devez copier libeay32.dll et ssleay32.dll dans le répertoire programme de QMapShack.</translation>
- </message>
- <message>
- <location filename="../map/CMapTMS.cpp" line="299"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 tuiles à charger<br/></translation>
- </message>
</context>
<context>
<name>CMapVRT</name>
<message>
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation>Erreur...</translation>
@@ -2905,7 +2902,7 @@ ligne %2, colonne %3:
<translation>Impossible de charger le fichier: %1</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<source>File must be 8 bit palette or gray indexed.</source>
<translation>Le fichier doit avoir une palette à 8 bits ou être en niveaux de gris.</translation>
</message>
@@ -2923,17 +2920,17 @@ ligne %2, colonne %3:
<translation>Générer le VRT GDAL</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="63"/>
<source>Select files...</source>
<translation>Sélectionnez les fichiers...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="87"/>
<source>Select target file...</source>
<translation>Sélectionnez le fichier à créer...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="150"/>
<source>!!! done !!!
</source>
<translation>!!! fait !!!</translation>
@@ -2946,8 +2943,7 @@ ligne %2, colonne %3:
<location filename="../map/CMapWMTS.cpp" line="53"/>
<location filename="../map/CMapWMTS.cpp" line="63"/>
<location filename="../map/CMapWMTS.cpp" line="72"/>
- <location filename="../map/CMapWMTS.cpp" line="157"/>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>Error...</source>
<translation>Erreur...</translation>
</message>
@@ -2978,20 +2974,10 @@ Structure inconnue.</translation>
<translation>Service inattendu. '* WMTS 1.0.0' est attendu mais '%1 %2' est lu.</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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>L'affichage de cette carte nécessite l'utilisation d'OpenSSL. Par défaut OpenSSL n'est pas inclus dans QMapShack à cause de restriction légales dans certains pays. Vous pouvez consulter <a href='https://www.openssl.org/community/binaries.html'>la page d'accueil OpenSSL</a> pour trouver des fichiers binaires. Vous devez copier libeay32.dll et ssleay32.dll dans le répertoire programme de QMapShack.</translation>
- </message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>No georeference information found.</source>
<translation>Aucune information de géoréférencement trouvé</translation>
</message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="413"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 tuiles à charger<br/></translation>
- </message>
</context>
<context>
<name>CMouseEditArea</name>
@@ -3007,7 +2993,7 @@ Structure inconnue.</translation>
<translation><b>Éditer la surface</b><br/>Choisissez und fonction et un mode de calcul d'itinéraire à l'aide des boutons d'outils. Ensuite, sélectionnez un point de la ligne. Seulement les points marqués d'un carré large peuvet être modifiés. Les points noirs sont des sous-points introduits par le calcul d'itinéraire.<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <location filename="../mouse/CMouseEditArea.cpp" line="94"/>
<source>area</source>
<translation>surface</translation>
</message>
@@ -3026,7 +3012,7 @@ Structure inconnue.</translation>
<translation><b>Éditer les points de la route</b><br/>Choisissez une fonction et un mode de calcul d'itinéraire à l'aide des boutons d'outils. Ensuite, sélectionnez un point de la ligne. Seul les points marqués d'un carré large peuvent être modifiés. Les points noirs sont des sous-points introduits par le calcul d'itinéraire.<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <location filename="../mouse/CMouseEditRte.cpp" line="105"/>
<source>route</source>
<translation>route</translation>
</message>
@@ -3055,7 +3041,7 @@ Structure inconnue.</translation>
<translation>La trace obtenue ne contiendra que des données de position. Toutes les autres données (altitude, temps, etc...) seront perdues.</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="110"/>
<source>track</source>
<translation>trace</translation>
</message>
@@ -3127,27 +3113,27 @@ Structure inconnue.</translation>
<translation><b>Sélectionner des objets sur la carte</b><br/>Sélectionnez une surface rectangulaire sur la carte. Utilisez le bouton gauche de la souris et déplacez la souris. Clic droit pour annuler. Ajustez la sélection en déplaçant les coins.</translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="99"/>
<source><b>Selected:</b><br/></source>
<translation><b>Sélectionné::</b><br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="106"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="107"/>
<source>%1 waypoints<br/></source>
<translation>%1 points<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="101"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="102"/>
<source>%1 tracks<br/></source>
<translation>%1 traces<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="111"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="112"/>
<source>%1 routes<br/></source>
<translation>%1 routes<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="116"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="117"/>
<source>%1 areas<br/></source>
<translation>%1 surfaces<br/></translation>
</message>
@@ -3235,12 +3221,12 @@ y: %4 m/px</translation>
<context>
<name>CProgressDialog</name>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="40"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="46"/>
<source>Elapsed time: %1</source>
<translation>Temps écoulé : %1</translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="87"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="132"/>
<source>Elapsed time: %1 seconds.</source>
<translation>Temps écoulé : %1 secondes</translation>
</message>
@@ -4620,14 +4606,47 @@ ligne %2, colonne %3:
</message>
</context>
<context>
+ <name>CTemplateWidget</name>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
+ <source>choose one...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
+ <source>Hiking Tour Summary (built-in)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
+ <source>-</source>
+ <translation type="unfinished">-</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
+ <source>Template path...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
+ <source>Failed to read template file %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
+ <source>Preview...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="71"/>
<source>&Color...</source>
<translation>&Couleur...</translation>
</message>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="117"/>
<source>Reset format</source>
<translation>Retour au format par défaut</translation>
</message>
@@ -4694,6 +4713,194 @@ ligne %2, colonne %3:
</message>
</context>
<context>
+ <name>Form</name>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
+ <source>Form</source>
+ <translation type="unfinished">Formulaire</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
+ <source>Participants</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
+ <source>Weather</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
+ <source>rain</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
+ <source>sunny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
+ <source>snow</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
+ <source>clouds</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
+ <source>windy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
+ <source>hot</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
+ <source>warm</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
+ <source>cold</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
+ <source>freezing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
+ <source>foggy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
+ <source>humid</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
+ <source>Character</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
+ <source>easy hiking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
+ <source>climbing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
+ <source>alpine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
+ <source>large ascend</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
+ <source>long distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
+ <source>via ferrata</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
+ <source>hail/soft hail</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
+ <source>Rating</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
+ <source>Rating 5 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
+ <source>Rating 4 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
+ <source>Rating 3 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
+ <source>Rating 2 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
+ <source>Rating 1 star</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
+ <source>aborted</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
+ <source>Equipment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
+ <source>ferrata gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
+ <source>night gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
+ <source>snow shoes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
+ <source>climbing gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
+ <source>ski</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
+ <source>camping gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IAbout</name>
<message>
<location filename="../IAbout.ui" line="14"/>
@@ -4881,8 +5088,8 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="66"/>
- <source>Square (optimized for TMS and WTMS tiles)</source>
- <translation>Carrée (optimisée pour tuiles TMS et WTMS)</translation>
+ <source>Square (optimized for TMS and WMTS tiles)</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -5493,7 +5700,7 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1495"/>
<source>Speed</source>
<translation>Vitesse</translation>
</message>
@@ -5635,67 +5842,62 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
<translation>Choisir l'activité de la trace</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
- <source>Remove Track Activity</source>
- <translation>Enleverr l'activité de la trace</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1400"/>
<source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
<translation>Pour différencier les statistiques de la trace, selectionnez une activité dans la liste pour la trace complète. Ou bien sélectionnez une partie de la trace pour lui assigner une activité.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1427"/>
<source>Points</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Time</source>
<translation>Durée</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ele.</source>
<translation>Alt.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Delta</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Dist.</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1500"/>
<source>Slope</source>
<translation>Pente</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1505"/>
<source>Ascent</source>
<translation>Montée</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1510"/>
<source>Descent</source>
<translation>Descente</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1515"/>
<source>Position</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1524"/>
<source>Filter</source>
<translation>Filtre</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1561"/>
<source>Hist.</source>
<translation></translation>
</message>
@@ -6362,70 +6564,70 @@ It is either a new item or it has been deleted in the database by someone else.<
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source>Save project?</source>
<translation>Enregistrer le projet ?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation><h3>%1</h3>Le projet a été modifié. Sauvegarder avant de quitter ?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="329"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="356"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation>%1: Corréler les traces et les waypoints.</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="366"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation><h3>%1</h3>Etait-ce trop long ? Voulez-vous ne pas faire la corrélation des traces et waypoints la prochaine fois pour ce projet ?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="340"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="367"/>
<source>Canceled correlation...</source>
<translation>Corrélation annulée...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="385"/>
- <location filename="../gis/prj/IGisProject.cpp" line="442"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="412"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="469"/>
<source>Save "%1" to...</source>
<translation>Sauvegarder"%1" dans ...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="527"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="554"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Nom de fichier: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="532"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="559"/>
<source>Waypoints: %1</source>
<translation>Waypoints: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="536"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="563"/>
<source>Tracks: %1</source>
<translation>Traces: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="540"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="567"/>
<source>Routes: %1</source>
<translation>Routes: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="544"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="571"/>
<source>Areas: %1</source>
<translation>Surfaces: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="664"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="691"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Êtes-vous sûr de vouloir supprimer %1 du projet '%2'?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="665"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="692"/>
<source>Delete...</source>
<translation>Supprimer...</translation>
</message>
@@ -6633,363 +6835,373 @@ Nom de fichier: %1</translation>
<translation>Fenêtre</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="112"/>
+ <location filename="../IMainWindow.ui" line="113"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="120"/>
+ <location filename="../IMainWindow.ui" line="121"/>
<source>Project</source>
<translation>Projet</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="131"/>
+ <location filename="../IMainWindow.ui" line="132"/>
<source>Tool</source>
<translation>Outils</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="156"/>
+ <location filename="../IMainWindow.ui" line="157"/>
<source>Maps</source>
<translation>Cartes</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="199"/>
+ <location filename="../IMainWindow.ui" line="200"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Modèle numérique de terrain (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="238"/>
+ <location filename="../IMainWindow.ui" line="239"/>
<source>Data</source>
<translation>Données</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="256"/>
+ <location filename="../IMainWindow.ui" line="257"/>
<source>Route</source>
<translation>Calcul d'itinéraire</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
+ <location filename="../IMainWindow.ui" line="287"/>
<source>Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="301"/>
- <location filename="../IMainWindow.ui" line="304"/>
+ <location filename="../IMainWindow.ui" line="302"/>
+ <location filename="../IMainWindow.ui" line="305"/>
<source>Add Map View</source>
<translation>Ajouter une vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="308"/>
<source>Ctrl+T</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="322"/>
+ <location filename="../IMainWindow.ui" line="323"/>
<source>Show Scale</source>
<translation>Afficher l'échelle</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="335"/>
<source>Setup Map Font</source>
<translation>Configurer la police de la carte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="350"/>
<source>Show Grid</source>
<translation>Afficher la grille</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="353"/>
<source>Ctrl+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="364"/>
+ <location filename="../IMainWindow.ui" line="365"/>
<source>Setup Grid</source>
<translation>Configurer la grille</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="368"/>
<source>Ctrl+Alt+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="383"/>
<source>Flip Mouse Wheel</source>
<translation>Inverser le sens de la molette de souris</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="394"/>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="395"/>
+ <location filename="../IMainWindow.ui" line="398"/>
<source>Setup Map Paths</source>
<translation>Configurer les répertoires des cartes</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="413"/>
<source>POI Text</source>
<translation>Libellés des points d'interêt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="428"/>
<source>Night / Day</source>
<translation>Jour / Nuit</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="443"/>
<source>Map Tool Tip</source>
<translation>Infobulles sur la carte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="445"/>
+ <location filename="../IMainWindow.ui" line="446"/>
<source>Ctrl+I</source>
<translation>CTRL + I</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="457"/>
+ <location filename="../IMainWindow.ui" line="458"/>
<source>Setup DEM Paths</source>
<translation>Configurer les répertoires DEM</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="470"/>
<source>About</source>
<translation>À propos</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
+ <location filename="../IMainWindow.ui" line="482"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="485"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="497"/>
+ <location filename="../IMainWindow.ui" line="500"/>
<source>Setup Map View</source>
<translation>Configurer la vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="511"/>
+ <location filename="../IMainWindow.ui" line="512"/>
<source>Load GIS Data</source>
<translation>Charger des données SIG...</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="515"/>
<source>Load projects from file</source>
<translation>Charger un fichier projet</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="518"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="529"/>
+ <location filename="../IMainWindow.ui" line="530"/>
<source>Save All GIS Data</source>
<translation>Enregistrer toutes les données SIG</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="533"/>
<source>Save all projects in the workspace</source>
<translation>Enregistrer tous les projets de l'espace de travail</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="535"/>
+ <location filename="../IMainWindow.ui" line="536"/>
<source>Ctrl+S</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="547"/>
+ <location filename="../IMainWindow.ui" line="548"/>
<source>Setup Time Zone</source>
<translation>Configurer le fuseau horaire</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="560"/>
<source>Add empty project</source>
<translation>Ajouter un projet vide</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="575"/>
<source>Search Google</source>
<translation>Recherche Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="587"/>
<source>Close all projects</source>
<translation>Fermer tous les projets</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="589"/>
+ <location filename="../IMainWindow.ui" line="590"/>
<source>F8</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="602"/>
<source>Setup Units</source>
<translation>Configurer les unités</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="614"/>
<source>Setup Workspace</source>
<translation>Configurer l'espace de travail</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="617"/>
<source>Setup save on exit.</source>
<translation>Sauvegarde de la configuration en quittant</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="629"/>
<source>Import Database from QLandkarte</source>
<translation>Importer une base de données QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="632"/>
<source>Import QLandkarte GT database</source>
<translation>Importer une base de données QLandkarte GT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="644"/>
<source>VRT Builder</source>
<translation>Générateur de VRT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="647"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>Interface utilisateur pour gdalbuildvrt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="659"/>
<source>Store Map View</source>
<translation>Enregistrer une vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="662"/>
<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="673"/>
+ <location filename="../IMainWindow.ui" line="674"/>
<source>Load Map View</source>
<translation>Charger une vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="677"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation>Rétablir une vue avec les cartes et calques DEM et leurs paramètres à partir d'un fichier</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="691"/>
+ <location filename="../IMainWindow.ui" line="692"/>
<source>Ext. Profile</source>
<translation>Profile externe</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="695"/>
<source>Ctrl+E</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="707"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="710"/>
<source>Ctrl+Q</source>
<translation>CTRL + Q</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="722"/>
<source>Clone Map View</source>
<translation>Dupliquer une vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="724"/>
+ <location filename="../IMainWindow.ui" line="725"/>
<source>Ctrl+Shift+T</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="737"/>
<source>Create Routino Database</source>
<translation>Créer une base de données Routino</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="748"/>
+ <location filename="../IMainWindow.ui" line="749"/>
<source>Save(Print) Map Screenshot</source>
<translation>Sauvegarder (Imprimer) une capture d'écran de la carte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="752"/>
<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="754"/>
+ <location filename="../IMainWindow.ui" line="755"/>
<source>Ctrl+P</source>
<translation>CTRL + P</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="767"/>
<source>Setup Coord. Format</source>
<translation>Choisir le format de coordonnées</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="769"/>
+ <location filename="../IMainWindow.ui" line="770"/>
<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="781"/>
+ <location filename="../IMainWindow.ui" line="782"/>
<source>Setup Map Background</source>
<translation>Modifier l'arrière-plan de la carte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="794"/>
<source>Setup Waypoint Icons</source>
<translation>Modifer les icônes des waypoints</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="796"/>
+ <location filename="../IMainWindow.ui" line="797"/>
<source>Setup path to custom icons</source>
<translation>Modifier le chemin des icônes personnalisés</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="805"/>
+ <location filename="../IMainWindow.ui" line="806"/>
<source>Close Tab</source>
<translation>Fermer l'onglet</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="808"/>
+ <location filename="../IMainWindow.ui" line="809"/>
<source>Ctrl+W</source>
<translation>CTRL + W</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="817"/>
+ <location filename="../IMainWindow.ui" line="818"/>
<source>Quickstart Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="826"/>
+ <location filename="../IMainWindow.ui" line="827"/>
<source>Setup Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="838"/>
+ <location filename="../IMainWindow.ui" line="839"/>
<source>Toggle Docks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="841"/>
+ <location filename="../IMainWindow.ui" line="842"/>
<source>Toggle visibility of dockable windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="844"/>
+ <location filename="../IMainWindow.ui" line="845"/>
<source>Ctrl+D</source>
<translation type="unfinished">CTRL + D</translation>
</message>
+ <message>
+ <location filename="../IMainWindow.ui" line="854"/>
+ <source>Full Screen</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="857"/>
+ <source>F11</source>
+ <translation type="unfinished">F11</translation>
+ </message>
</context>
<context>
<name>IMapList</name>
@@ -7047,6 +7259,24 @@ Je n'ai pas envie de lire la documentation !</translation>
</message>
</context>
<context>
+ <name>IMapOnline</name>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="41"/>
+ <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
+ <translation type="unfinished">L'affichage de cette carte nécessite l'utilisation d'OpenSSL. Par défaut OpenSSL n'est pas inclus dans QMapShack à cause de restriction légales dans certains pays. Vous pouvez consulter <a href='https://www.openssl.org/community/binaries.html'>la page d'accueil OpenSSL</a> pour trouver des fichiers binaires. Vous devez copier libeay32.dll et ssleay32.dll dans le répertoire programme de QMapShack.</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="47"/>
+ <source>Error...</source>
+ <translation type="unfinished">Erreur...</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="98"/>
+ <source><b>%1</b>: %2 tiles pending<br/></source>
+ <translation type="unfinished"><b>%1</b>: %2 tuiles à charger<br/></translation>
+ </message>
+</context>
+<context>
<name>IMapPathSetup</name>
<message>
<location filename="../map/IMapPathSetup.ui" line="14"/>
@@ -7178,28 +7408,65 @@ Je n'ai pas envie de lire la documentation !</translation>
<translation></translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="22"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
+ <source>Advanced Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <source>Source No Data (-srcnodata)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="46"/>
+ <source>Target No Data (-vrtnodata)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../tool/IMapVrtBuilder.ui" line="56"/>
+ <source>Target Projection (-a_srs)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="63"/>
+ <source>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
+ <source>1. Select one or multiple source files.
+2. Select a file name for the target VRT file.
+3. Press "Start" button.
+
+Tip:
+* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
+* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
+* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="139"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="156"/>
<source>Select source files:</source>
<translation>Sélectionnez les fichiers source:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="79"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="121"/>
<source>Target Filename:</source>
<translation>Fichier cible:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="86"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="128"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="95"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="20"/>
<source>Start</source>
<translation>Démarrer</translation>
</message>
@@ -7969,16 +8236,6 @@ or
<translation>CTRL + R</translation>
</message>
<message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
- <source>Delete a point. (Ctrl+D)</source>
- <translation>Supprimer une point (CTRL + D)</translation>
- </message>
- <message>
- <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
- <source>Ctrl+D</source>
- <translation>CTRL + D</translation>
- </message>
- <message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="215"/>
<source>No auto-routing or line snapping (Ctrl+O)</source>
<translation>Pas d'autoroutge ou de suivi le ligne automatique (CTRL + O)</translation>
@@ -8014,6 +8271,16 @@ or
<translation>...</translation>
</message>
<message>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
+ <source>Delete a point. (Ctrl+-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
+ <source>Ctrl+-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="218"/>
<source>0</source>
<translation></translation>
@@ -8160,8 +8427,8 @@ or
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
- <source>Select an activity for the selected range.</source>
- <translation>Selectionner une activité pour la plage selectionnée.</translation>
+ <source>Set an activity for the selected range.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
@@ -8252,12 +8519,13 @@ or
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
<location filename="../mouse/IScrOptSelect.ui" line="142"/>
- <location filename="../mouse/IScrOptSelect.ui" line="196"/>
- <location filename="../mouse/IScrOptSelect.ui" line="225"/>
- <location filename="../mouse/IScrOptSelect.ui" line="285"/>
- <location filename="../mouse/IScrOptSelect.ui" line="312"/>
- <location filename="../mouse/IScrOptSelect.ui" line="339"/>
- <location filename="../mouse/IScrOptSelect.ui" line="366"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="156"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="210"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="239"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="299"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="326"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="353"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="380"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -8278,36 +8546,41 @@ or
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="139"/>
+ <source>Set an activity for all selected tracks.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="153"/>
<source>Delete all selected items.</source>
<translation>Supprimer tous les objets sélectionnés</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="193"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="207"/>
<source>Select all items that intersect the selected area.</source>
<translation>Sélectionner tous les objets dont au moins une partie est présente dans la zone sélectionnée</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="222"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="236"/>
<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"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="296"/>
<source>Add tracks to selection.</source>
<translation>Ajouter des traces à la sélection</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="309"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="323"/>
<source>Add waypoints to selection.</source>
<translation>Ajouter des waypoints à la sélection</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="336"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="350"/>
<source>Add routes to selection.</source>
<translation>Ajouter des routes à la sélection</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="363"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="377"/>
<source>Add areas to selection.</source>
<translation>Ajouter des surfaces à la sélection</translation>
</message>
@@ -8330,6 +8603,7 @@ or
<location filename="../gis/trk/IScrOptTrk.ui" line="151"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="170"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="184"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="198"/>
<source>...</source>
<translation></translation>
</message>
@@ -8390,11 +8664,16 @@ or
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
+ <source>Set an activity for the complete track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
<source>Copy track together with all attached waypoints into another project.</source>
<translation>Copier la trace et ses waypoints attachés dans une autre projet.</translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="210"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="224"/>
<source>TextLabel</source>
<translation>Libellé</translation>
</message>
@@ -8903,6 +9182,34 @@ or
</message>
</context>
<context>
+ <name>ITemplateWidget</name>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="14"/>
+ <source>Insert Template...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="32"/>
+ <source>Templates</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="42"/>
+ <source>Select a path with your own templates.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="45"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="77"/>
+ <source>Preview</source>
+ <translation type="unfinished">Aperçu</translation>
+ </message>
+</context>
+<context>
<name>ITextEditWidget</name>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="14"/>
@@ -8910,264 +9217,279 @@ or
<translation>Éditer le texte...</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="25"/>
- <location filename="../widgets/ITextEditWidget.ui" line="331"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="45"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="351"/>
<source>Undo</source>
<translation>Annuler</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="354"/>
<source>Ctrl+Z</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="38"/>
- <location filename="../widgets/ITextEditWidget.ui" line="343"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="58"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="363"/>
<source>Redo</source>
<translation>Répéter</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="346"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="366"/>
<source>Ctrl+Shift+Z</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="51"/>
- <location filename="../widgets/ITextEditWidget.ui" line="355"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="71"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="375"/>
<source>Cut</source>
<translation>Couper</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="358"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="378"/>
<source>Ctrl+X</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="64"/>
- <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="84"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="387"/>
<source>Copy</source>
<translation>Copier</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="370"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="390"/>
<source>Ctrl+C</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="77"/>
- <location filename="../widgets/ITextEditWidget.ui" line="375"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="97"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="395"/>
<source>Paste</source>
<translation>Coller</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="25"/>
+ <source>Templ.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="120"/>
<source>A:L</source>
<translation>A:G</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="133"/>
<source>A:C</source>
<translation>A:C</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="146"/>
<source>A:R</source>
<translation>A:D</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="159"/>
<source>A:B</source>
<translation>A:J</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="192"/>
<source>B</source>
<translation>G</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="205"/>
<source>I</source>
<translation>I</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="218"/>
<source>U</source>
<translation>S</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="238"/>
<source>C</source>
<translation>C</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="285"/>
<source>Standard</source>
<translation>Standard</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="290"/>
<source>Bullet List (Disc)</source>
<translation>Puce de liste (disque)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="295"/>
<source>Bullet List (Circle)</source>
<translation>Puce de liste (Cercle)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="300"/>
<source>Bullet List (Square)</source>
<translation>Puce de liste (Carré)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="305"/>
<source>Ordered List (Decimal)</source>
<translation>Liste numérotée (chiffres)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="310"/>
<source>Ordered List (Alpha lower)</source>
<translation>Liste numérotée (lettres minuscules)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="315"/>
<source>Ordered List (Alpha upper)</source>
<translation>Liste numérotée (lettres majuscules)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="320"/>
<source>Ordered List (Roman lower)</source>
<translation>Liste numérotée (chiffres romains minuscules)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="325"/>
<source>Ordered List (Roman upper)</source>
<translation>Liste numérotée (chiffres romains majuscules)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="378"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="398"/>
<source>Ctrl+V</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="390"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="410"/>
<source>Align Left</source>
<translation>Aligné à gauche</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="393"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="413"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="405"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="425"/>
<source>Align Right</source>
<translation>Aligné à droite</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="408"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="428"/>
<source>Ctrl+R</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="420"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="440"/>
<source>Align Center</source>
<translation>Centré</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="423"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="443"/>
<source>Ctrl+E</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="435"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="455"/>
<source>Align Block</source>
<translation>Justifié</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="438"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="458"/>
<source>Ctrl+J</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="450"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="470"/>
<source>Underline</source>
<translation>Soulignage</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="453"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="473"/>
<source>Ctrl+U</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="465"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="485"/>
<source>Bold</source>
<translation>Gras</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="468"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="488"/>
<source>Ctrl+B</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="480"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="500"/>
<source>Italic</source>
<translation>Italique</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="483"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="503"/>
<source>Ctrl+I</source>
<translation></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="515"/>
<source>Plain</source>
<translation>Texte brut</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="518"/>
<source>Reset the text's format before pasting</source>
<translation>Réinitialiser la mise en forme du texte avant de coller</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="503"/>
- <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="523"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="526"/>
<source>Select All</source>
<translation>Tout sélectionner</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="529"/>
<source>Ctrl+A</source>
<translation>CTRL + A</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="514"/>
- <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="534"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="537"/>
<source>Delete</source>
<translation>Supprimer</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="522"/>
- <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="542"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="545"/>
<source>Reset Font</source>
<translation>Réinitialiser la police</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="530"/>
- <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="550"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="553"/>
<source>Reset Layout</source>
<translation>Réinitialiser la mise en forme</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="565"/>
<source>Normal</source>
<translation>Normal</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="568"/>
<source>Paste without resetting the text's format</source>
<translation>Coller sans réinitialiser la mise en forme du texte</translation>
</message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="577"/>
+ <source>Insert From Template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="580"/>
+ <source>Create text from template.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ITextEditWidgetSelMenu</name>
@@ -9247,6 +9569,11 @@ or
<source>Setup Toolbar</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
+ <source>Toolbar is visible in Fullscreen-mode</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IToolShell</name>
diff --git a/src/locale/qmapshack_nl.ts b/src/locale/qmapshack_nl.ts
index 6c21836..addff4f 100644
--- a/src/locale/qmapshack_nl.ts
+++ b/src/locale/qmapshack_nl.ts
@@ -22,97 +22,100 @@
<context>
<name>CActivityTrk</name>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="51"/>
<source>Foot</source>
<translation>Wandelen</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="59"/>
<source>Bicycle</source>
<translation>Fiets</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="67"/>
<source>Motor Bike</source>
<translation>Motorfiets</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="75"/>
<source>Car</source>
<translation>Auto</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="83"/>
<source>Cable Car</source>
<translation>Kabelbaan</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="91"/>
<source>Swim</source>
<translation>Zwemmen</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="99"/>
<source>Ship</source>
<translation>Boot</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
+ <source>No Activity</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
+ <source>Total</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
<source>Ascent:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="329"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="372"/>
<source>Descent:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="115"/>
<source>Ski/Winter</source>
<translation>Ski/Winter</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="107"/>
<source>Aeronautics</source>
<translation>Vliegtuig</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="307"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+ <source>Public Transport</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
<source>Distance:</source>
<translation>Afstand:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="396"/>
<source>Speed Moving:</source>
<translation>Bewogen snelheid:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="351"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="420"/>
<source>Speed Total:</source>
<translation>Totale snelheid:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="275"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="362"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="444"/>
<source>Time Moving:</source>
<translation>Bewogen tijd:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="277"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="468"/>
<source>Time Total:</source>
<translation>Totale tijd:</translation>
</message>
- <message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="414"/>
- <source>None</source>
- <translation type="unfinished">Geen</translation>
- </message>
</context>
<context>
<name>CCanvas</name>
@@ -267,27 +270,27 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
<source>Failed to load...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <location filename="../gis/db/CDBProject.cpp" line="114"/>
<source>Can't load file "%1" . It will be skipped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
<source>Project already in database...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <location filename="../gis/db/CDBProject.cpp" line="128"/>
<source>The project "%1" has already been imported into the database. It will be skipped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="278"/>
+ <location filename="../gis/db/CDBProject.cpp" line="279"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -296,47 +299,47 @@ To solve this conflict you can create and save a clone, force your version or dr
Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer huidige versie of verwijder deze versie en kies een ander uit de database</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="284"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Conflict with database...</source>
<translation>Conflict met database...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="285"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Clone && Save</source>
<translation>Kloon && Opslaan</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="286"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Force Save</source>
<translation>Forceer opslaan</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="287"/>
+ <location filename="../gis/db/CDBProject.cpp" line="288"/>
<source>Take remote</source>
<translation>Neem huidige</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="569"/>
+ <location filename="../gis/db/CDBProject.cpp" line="572"/>
<source>Missing folder...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="570"/>
+ <location filename="../gis/db/CDBProject.cpp" line="573"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="577"/>
+ <location filename="../gis/db/CDBProject.cpp" line="580"/>
<source>Save ...</source>
<translation>Opslaan...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>There was an unexpected database error:
%1</source>
@@ -345,12 +348,12 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
%1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="755"/>
+ <location filename="../gis/db/CDBProject.cpp" line="760"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation>Het project '%1' zal geupdated worden met de database.Er zijn nog veranderingen niet opgeslagen.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="756"/>
+ <location filename="../gis/db/CDBProject.cpp" line="761"/>
<source>Save changes?</source>
<translation>Veranderingen opslaan?</translation>
</message>
@@ -446,7 +449,7 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="267"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="774"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>none</source>
<translation>geen</translation>
</message>
@@ -461,97 +464,97 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation><b>Overzicht van alle tracks in project</b><br/></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="437"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="419"/>
<source><h2>Waypoints</h2></source>
<translation><h2>Waypoints</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="444"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="470"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="591"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="709"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="739"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="426"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="452"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="573"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="691"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="721"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="471"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="427"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="574"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="692"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="722"/>
<source>Comment</source>
<translation>Notitie</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="463"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
<source><h2>Tracks</h2></source>
<translation><h2>Tracks</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>From Start</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To Next</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To End</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="613"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
<source>distance: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="623"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
<source>ascent: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="633"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
<source>descent: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="702"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
<source><h2>Areas</h2></source>
<translation><h2>Gebieden</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="732"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
<source><h2>Routes</h2></source>
<translation><h2>Routes</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Edit name...</source>
<translation>Bewerk naam...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Enter new project name.</source>
<translation>Geef project een nieuwe naam.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Edit keywords...</source>
<translation>Bewerkt sleutelwoorden...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Enter keywords.</source>
<translation>Geef sleutelwoorden.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="915"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="897"/>
<source>Print Diary</source>
<translation>Dagboek afdrukken</translation>
</message>
@@ -559,45 +562,35 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<context>
<name>CDetailsTrk</name>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
<source>Reduce visible track points</source>
<translation>Reduceer zichtbare trackpunten</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
<source>Change elevation of track points</source>
<translation>Verander hoogte van trackpunten</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
<source>Change timestamp of track points</source>
<translation>Verander tijdstempels van trackpunten</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
<source>Miscellaneous</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
<source>Color</source>
<translation>Kleur</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
<source>Activity</source>
<translation>Activiteit</translation>
</message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>Reset activities...</source>
- <translation>Herstel activiteiten...</translation>
- </message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>This will remove all activities from the track. Proceed?</source>
- <translation>Dit zal alle activiteiten uit de track verwijderen. Doorgaan?</translation>
- </message>
</context>
<context>
<name>CDetailsWpt</name>
@@ -610,7 +603,7 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<context>
<name>CDeviceGarmin</name>
<message>
- <location filename="../device/CDeviceGarmin.cpp" line="265"/>
+ <location filename="../device/CDeviceGarmin.cpp" line="272"/>
<source>Picture%1</source>
<translation>Afbeelding%1</translation>
</message>
@@ -972,7 +965,7 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<context>
<name>CGisItemTrk</name>
<message>
- <location filename="../gis/fit/serialization.cpp" line="246"/>
+ <location filename="../gis/fit/serialization.cpp" line="285"/>
<source>FIT file %1 contains no GPS data.</source>
<translation type="unfinished"></translation>
</message>
@@ -1013,252 +1006,252 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation>Trackpunten aangepast, vorige gegevens overschreven.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="305"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
<source>Length: %1 %2</source>
<translation>Lengte: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="312"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation>, %1%2 %3, %4%5 %6</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="346"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
<source>Start: %1</source>
<translation>Start: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="350"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
<source>Start: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="356"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
<source>End: %1</source>
<translation>Einde: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="360"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
<source>End: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="364"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
<source>Points: %1 (%2)</source>
<translation>Punten: %1 (%2)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="368"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
<source>Invalid elevations!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
<source>Invalid timestamps!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="378"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
<source>Invalid positions!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="387"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
<source>Activities: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="495"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
<source>Index: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="499"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
<source>Index: visible %1, total %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="510"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
<source>Ele.: %1 %2</source>
<translation>Hoogte.: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="513"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
<source> slope: %1%3 (%2%)</source>
<translation> helling: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="518"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
<source> speed: %1%2</source>
<translation> snelheid: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="546"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
<source>... and %1 tags not displayed</source>
<translation>... en %1 tags niet getoont</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
<source>Distance: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="559"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source>Moving: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
<source>track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
<source>Hide point %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
<source>Hide points %1..%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="582"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
<source> Moving: %1%2 (%3%)</source>
<translation> Beweging: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
<source>, %1%2</source>
<translation>, %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
<source> Time: %1%2</source>
<translation> Tijd: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
<source>, %1-, %2-</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="324"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
<source>Time: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="328"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
<source>Time: -, Speed: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
<source>Moving: -, Speed: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="556"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
<source>Ascent: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="557"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
<source>Descent: - (-)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="564"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
<source>Ascent: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="570"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
<source> Descent: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
<source>Distance: %1%2 (%3%)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Ascent: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Descent: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
<source>Ascent: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
<source> Descent: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
<source>Distance: %1%2</source>
<translation type="unfinished">Afstand: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
<source>Permanently removed points %1..%2</source>
<translation>Permanent verwijderde punten %1..%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
<source>Show points.</source>
<translation>Toon punten.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
<source>Changed name</source>
<translation>Naam aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
<source>Changed comment</source>
<translation>Notitie aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
<source>Changed description</source>
<translation>Beschrijving aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
<source>Changed links</source>
<translation>Link aangepast</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
<source>Changed elevation of point %1 to %2 %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2041"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
<source>Changed activity to '%1' for complete track.</source>
<translation>Activiteit aangepast naar '%1' voor gehele track.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation>Activiteit aangepast naar '%1' voor bereik(%2..%3).</translation>
</message>
@@ -1599,191 +1592,201 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation>Toon niet op kaart</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="110"/>
+ <location filename="../gis/CGisListWks.cpp" line="109"/>
<source>Sort by Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="111"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="117"/>
<source>Save</source>
<translation>Opslaan</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <location filename="../gis/CGisListWks.cpp" line="122"/>
<source>Send to Devices</source>
<translation>Verzend naar GPS</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Sync. with Database</source>
<translation>Syngroniseren met database</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="123"/>
+ <location filename="../gis/CGisListWks.cpp" line="126"/>
<source>Close</source>
<translation>Sluiten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
+ <location filename="../gis/CGisListWks.cpp" line="135"/>
<source>Update Project on Device</source>
<translation>Update project op GPS</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="134"/>
- <location filename="../gis/CGisListWks.cpp" line="157"/>
+ <location filename="../gis/CGisListWks.cpp" line="137"/>
+ <location filename="../gis/CGisListWks.cpp" line="161"/>
<source>Delete</source>
<translation>Verwijder</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="146"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Edit...</source>
<translation>Bewerken...</translation>
</message>
<message>
<location filename="../gis/CGisListWks.cpp" line="102"/>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="150"/>
<source>Copy to...</source>
<translation>Kopieer naar...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <source>Autom. Save</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="118"/>
<source>Save as...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Track Profile</source>
<translation>Track profiel</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Select Range</source>
<translation>Selecteer afstand</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Edit Track Points</source>
<translation>Trackpunten bewerken</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="156"/>
<source>Reverse Track</source>
<translation>Track omdraaien</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="154"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Combine Tracks</source>
<translation>Combineer tracks</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="159"/>
<source>Copy Track with Waypoints</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="167"/>
<source>Show Bubble</source>
<translation>Toon ballon</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="165"/>
+ <location filename="../gis/CGisListWks.cpp" line="169"/>
<source>Move Waypoint</source>
<translation>Verplaats waypoint</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <location filename="../gis/CGisListWks.cpp" line="170"/>
<source>Proj. Waypoint...</source>
<translation>Projecteer waypoint...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Route Instructions</source>
<translation>Route instructies</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="180"/>
<source>Calculate Route</source>
<translation>Route berekenen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="181"/>
<source>Reset Route</source>
<translation>Route omkeren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="178"/>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Edit Route</source>
<translation>Bewerk route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="179"/>
+ <location filename="../gis/CGisListWks.cpp" line="183"/>
<source>Convert to Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="188"/>
+ <location filename="../gis/CGisListWks.cpp" line="192"/>
<source>Edit Area Points</source>
<translation>Bewerk gebied punten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="195"/>
+ <location filename="../gis/CGisListWks.cpp" line="199"/>
<source>Create Route</source>
<translation>Maak route</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <location filename="../gis/CGisListWks.cpp" line="200"/>
<source>Change Icon (sel. waypt. only)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="627"/>
+ <location filename="../gis/CGisListWks.cpp" line="158"/>
+ <source>Set Track Activity</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="634"/>
<source>Drop items...</source>
<translation>Elementen wissen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="652"/>
- <location filename="../gis/CGisListWks.cpp" line="1646"/>
- <location filename="../gis/CGisListWks.cpp" line="1684"/>
+ <location filename="../gis/CGisListWks.cpp" line="659"/>
+ <location filename="../gis/CGisListWks.cpp" line="1691"/>
+ <location filename="../gis/CGisListWks.cpp" line="1729"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation><b>Updaten GPS</b><p>Updaten %1<br/>Moment geduld...</p></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="778"/>
+ <location filename="../gis/CGisListWks.cpp" line="785"/>
<source>Saving workspace. Please wait.</source>
<translation>Werkruimte opslaan. Moment geduld.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="824"/>
+ <location filename="../gis/CGisListWks.cpp" line="831"/>
<source>Loading workspace. Please wait.</source>
<translation>Laden werkruimte. Moment geduld.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>Close all projects...</source>
<translation>Sluit alle projecten...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>This will remove all projects from the workspace.</source>
<translation>Dit zal alle projecten uit de werkruimte verwijderen.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Delete project...</source>
<translation>Project verwijderen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Do you really want to delete %1?</source>
<translation>Moet %1 werkelijk verwijderd worden?</translation>
</message>
@@ -1801,22 +1804,22 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
<translation>Het project "%1" is al geopend.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="554"/>
+ <location filename="../gis/CGisWidget.cpp" line="559"/>
<source>Copy items...</source>
<translation type="unfinished">Kopieer elementen...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="573"/>
+ <location filename="../gis/CGisWidget.cpp" line="578"/>
<source>Change waypoint symbols.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Cut Track...</source>
<translation>Track knippen...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Do you want to delete the original track?</source>
<translation>Moet de orginele track verwijderd worden?</translation>
</message>
@@ -1974,7 +1977,7 @@ lijn %2, kolom %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
<source>Speed</source>
<translation>Snelheid</translation>
</message>
@@ -2000,37 +2003,42 @@ lijn %2, kolom %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+ <source>Energy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
<source>Sea Level Pressure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
<source>Speed (vertical)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
<source>Slope*</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
<source>Speed*</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
<source>Elevation</source>
<translation>Hoogte</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
<source>Progress</source>
<translation>Voortgang</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
<source>Terrain slope</source>
<translation type="unfinished"></translation>
</message>
@@ -2046,53 +2054,53 @@ lijn %2, kolom %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="769"/>
+ <location filename="../CMainWindow.cpp" line="813"/>
<source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="897"/>
+ <location filename="../CMainWindow.cpp" line="941"/>
<source>Ele: %1%2</source>
<translation>Hoogte: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="909"/>
+ <location filename="../CMainWindow.cpp" line="953"/>
<source>Slope: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="925"/>
+ <location filename="../CMainWindow.cpp" line="969"/>
<source>[Grid: %1]</source>
<translation>[Raster: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1066"/>
+ <location filename="../CMainWindow.cpp" line="1110"/>
<source>Load GIS Data...</source>
<translation>GIS gegevens laden...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
<source>Select output file</source>
<translation>Selecteer bestand</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>QMapShack View (*.view)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>Select file to load</source>
<translation>Selecteer bestand</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1369"/>
+ <location filename="../CMainWindow.cpp" line="1481"/>
<source>Fatal...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1370"/>
+ <location filename="../CMainWindow.cpp" line="1482"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation type="unfinished"></translation>
</message>
@@ -2852,19 +2860,18 @@ Fall back to internal types.</source>
<context>
<name>CMapTMS</name>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
- <location filename="../map/CMapTMS.cpp" line="77"/>
- <location filename="../map/CMapTMS.cpp" line="136"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Error...</source>
<translation>Fout...</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
<source>Failed to open %1</source>
<translation>Openen mislukt-%1</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="77"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
@@ -2873,27 +2880,17 @@ lijn %2, kolom %3:
%4</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="115"/>
+ <location filename="../map/CMapTMS.cpp" line="116"/>
<source>Layer %1</source>
<translation>Laag-%1</translation>
</message>
- <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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Deze kaart heeft OpenSSL onderteuning nodig. Door restricte beperkingen in bepaalde landen kan QMapShack geen OpenSSL pakket aanbieden. Neem een kijkje op <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> voor binaries. Er kan wel libeay32.dll en ssleay32.dll in de QMapShack map gekopieerd worden.</translation>
- </message>
- <message>
- <location filename="../map/CMapTMS.cpp" line="299"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 delen ontvangen<br/></translation>
- </message>
</context>
<context>
<name>CMapVRT</name>
<message>
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation>Fout...</translation>
@@ -2905,7 +2902,7 @@ lijn %2, kolom %3:
<translation>Bestand laden mislukt: %1</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<source>File must be 8 bit palette or gray indexed.</source>
<translation>Bestand moet 8 bit kleur of grijs geindexeerd zijn.</translation>
</message>
@@ -2923,17 +2920,17 @@ lijn %2, kolom %3:
<translation>GDAL VRT maken</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="63"/>
<source>Select files...</source>
<translation>Selecteer bestanden...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="87"/>
<source>Select target file...</source>
<translation>Selecteer doel bestand...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="150"/>
<source>!!! done !!!
</source>
<translation>!!! klaar !!!
@@ -2947,8 +2944,7 @@ lijn %2, kolom %3:
<location filename="../map/CMapWMTS.cpp" line="53"/>
<location filename="../map/CMapWMTS.cpp" line="63"/>
<location filename="../map/CMapWMTS.cpp" line="72"/>
- <location filename="../map/CMapWMTS.cpp" line="157"/>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>Error...</source>
<translation>Fout...</translation>
</message>
@@ -2979,20 +2975,10 @@ Onbekende structuur.</translation>
<translation>Onverwachte service. '*WMTS 1.0.0' is verwacht. '%1 %2' is gelezen.</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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Deze kaart heeft OpenSSL onderteuning nodig. Door restricte beperkingen in bepaalde landen kan QMapShack geen OpenSSL pakket aanbieden. Neem een kijkje op <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> voor binaries. Er kan wel libeay32.dll en ssleay32.dll in de QMapShack map gekopieerd worden.</translation>
- </message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>No georeference information found.</source>
<translation>Geen geografische gegevens gevonden.</translation>
</message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="413"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 delen ontvangen<br/></translation>
- </message>
</context>
<context>
<name>CMouseEditArea</name>
@@ -3008,7 +2994,7 @@ Onbekende structuur.</translation>
<translation><b>Bewerk gebied</b><br/>Selecteer een functie en een routeoptie via de gereedschapknoppen. Selecteer dan een punt op de lijn. Alleen zwarte vierkante punten kunnen gewijzigd worden. De ronde zwarte subpunten niet.<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <location filename="../mouse/CMouseEditArea.cpp" line="94"/>
<source>area</source>
<translation type="unfinished"></translation>
</message>
@@ -3027,7 +3013,7 @@ Onbekende structuur.</translation>
<translation><b>Bewerk route punten</b><br/>Selecteer een functie en een routeoptie via de gereedschapknoppen. Selecteer dan een punt op de lijn. Alleen zwarte vierkante punten kunnen gewijzigd worden. De ronde zwarte subpunten niet.<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <location filename="../mouse/CMouseEditRte.cpp" line="105"/>
<source>route</source>
<translation type="unfinished"></translation>
</message>
@@ -3056,7 +3042,7 @@ Onbekende structuur.</translation>
<translation>Dit zal alle gegevens overschrijven van het origineel door een simpele lijn met coördinaten. Alle andere gegevens zullen verloren gaan.</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="110"/>
<source>track</source>
<translation type="unfinished"></translation>
</message>
@@ -3128,27 +3114,27 @@ Onbekende structuur.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="99"/>
<source><b>Selected:</b><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="106"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="107"/>
<source>%1 waypoints<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="101"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="102"/>
<source>%1 tracks<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="111"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="112"/>
<source>%1 routes<br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="116"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="117"/>
<source>%1 areas<br/></source>
<translation type="unfinished"></translation>
</message>
@@ -3236,12 +3222,12 @@ y: %4 m/px</translation>
<context>
<name>CProgressDialog</name>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="40"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="46"/>
<source>Elapsed time: %1</source>
<translation>Verstreken tijd: %1</translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="87"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="132"/>
<source>Elapsed time: %1 seconds.</source>
<translation>Verstreken tijd: %1 seconden.</translation>
</message>
@@ -4624,14 +4610,47 @@ lijn %2, kolom %3:
</message>
</context>
<context>
+ <name>CTemplateWidget</name>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
+ <source>choose one...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
+ <source>Hiking Tour Summary (built-in)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
+ <source>-</source>
+ <translation type="unfinished">-</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
+ <source>Template path...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
+ <source>Failed to read template file %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
+ <source>Preview...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="71"/>
<source>&Color...</source>
<translation>&Kleur...</translation>
</message>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="117"/>
<source>Reset format</source>
<translation type="unfinished"></translation>
</message>
@@ -4698,6 +4717,194 @@ lijn %2, kolom %3:
</message>
</context>
<context>
+ <name>Form</name>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
+ <source>Form</source>
+ <translation type="unfinished">Formulier</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
+ <source>Participants</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
+ <source>Weather</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
+ <source>rain</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
+ <source>sunny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
+ <source>snow</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
+ <source>clouds</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
+ <source>windy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
+ <source>hot</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
+ <source>warm</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
+ <source>cold</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
+ <source>freezing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
+ <source>foggy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
+ <source>humid</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
+ <source>Character</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
+ <source>easy hiking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
+ <source>climbing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
+ <source>alpine</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
+ <source>large ascend</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
+ <source>long distance</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
+ <source>via ferrata</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
+ <source>hail/soft hail</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
+ <source>Rating</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
+ <source>Rating 5 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
+ <source>Rating 4 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
+ <source>Rating 3 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
+ <source>Rating 2 stars</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
+ <source>Rating 1 star</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
+ <source>aborted</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
+ <source>Equipment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
+ <source>ferrata gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
+ <source>night gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
+ <source>snow shoes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
+ <source>climbing gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
+ <source>ski</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
+ <source>camping gear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
+ <source>Details</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>IAbout</name>
<message>
<location filename="../IAbout.ui" line="14"/>
@@ -4885,8 +5092,8 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</source>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="66"/>
- <source>Square (optimized for TMS and WTMS tiles)</source>
- <translation>Vierkant (optimaal voor TMS en WTMS delen)</translation>
+ <source>Square (optimized for TMS and WMTS tiles)</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -5472,7 +5679,7 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<translation>Profiel</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1495"/>
<source>Speed</source>
<translation>Snelheid</translation>
</message>
@@ -5638,67 +5845,62 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
- <source>Remove Track Activity</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1400"/>
<source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
<translation>Om de track statistieken te onderscheiden selecteer een activiteit uit de lijst voor de volledige track. Of selecteer een deel van de track om een activieteit toe te kennen.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1427"/>
<source>Points</source>
<translation>Punten</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Time</source>
<translation>Tijd</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ele.</source>
<translation>Hoogte</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Delta</source>
<translation>Delta</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Dist.</source>
<translation>Afstand.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1500"/>
<source>Slope</source>
<translation>Helling</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1505"/>
<source>Ascent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1510"/>
<source>Descent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1515"/>
<source>Position</source>
<translation>Positie</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1524"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1561"/>
<source>Hist.</source>
<translation>Hist.</translation>
</message>
@@ -6365,70 +6567,70 @@ It is either a new item or it has been deleted in the database by someone else.<
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source>Save project?</source>
<translation>Project opslaan?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation><h3>%1</h3>Het project is veranderd. Voor het sluiten opslaan?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="329"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="356"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation>%1: Correlatie van tracks en waypointen.</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="366"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation><h3>%1</h3>Duurde dit te lang? Moet de correlatie van tracks en waypointen in dit project in de toekomst overgeslagen worden?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="340"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="367"/>
<source>Canceled correlation...</source>
<translation>Correlatie geanuleerd...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="385"/>
- <location filename="../gis/prj/IGisProject.cpp" line="442"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="412"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="469"/>
<source>Save "%1" to...</source>
<translation>Opslaan "%1" als...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="527"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="554"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Bestandsnaam: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="532"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="559"/>
<source>Waypoints: %1</source>
<translation>Waypoints: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="536"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="563"/>
<source>Tracks: %1</source>
<translation>Tracks: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="540"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="567"/>
<source>Routes: %1</source>
<translation>Routes: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="544"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="571"/>
<source>Areas: %1</source>
<translation>Gebieden: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="664"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="691"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Moet '%1' werkelijk verwijderd worden uit project '%2'?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="665"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="692"/>
<source>Delete...</source>
<translation>Verwijderen...</translation>
</message>
@@ -6636,363 +6838,373 @@ Bestandsnaam: %1</translation>
<translation>Venster</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="112"/>
+ <location filename="../IMainWindow.ui" line="113"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="120"/>
+ <location filename="../IMainWindow.ui" line="121"/>
<source>Project</source>
<translation>Project</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="131"/>
+ <location filename="../IMainWindow.ui" line="132"/>
<source>Tool</source>
<translation>Extra</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="156"/>
+ <location filename="../IMainWindow.ui" line="157"/>
<source>Maps</source>
<translation>Kaarten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="199"/>
+ <location filename="../IMainWindow.ui" line="200"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Dig. Elev. Model (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="238"/>
+ <location filename="../IMainWindow.ui" line="239"/>
<source>Data</source>
<translation>Gegevens</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="256"/>
+ <location filename="../IMainWindow.ui" line="257"/>
<source>Route</source>
<translation>Route</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
+ <location filename="../IMainWindow.ui" line="287"/>
<source>Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="301"/>
- <location filename="../IMainWindow.ui" line="304"/>
+ <location filename="../IMainWindow.ui" line="302"/>
+ <location filename="../IMainWindow.ui" line="305"/>
<source>Add Map View</source>
<translation>Nieuw venster</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="308"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="322"/>
+ <location filename="../IMainWindow.ui" line="323"/>
<source>Show Scale</source>
<translation>Toon schaal</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="335"/>
<source>Setup Map Font</source>
<translation>Lettertype kaart instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="350"/>
<source>Show Grid</source>
<translation>Toon raster</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="353"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="364"/>
+ <location filename="../IMainWindow.ui" line="365"/>
<source>Setup Grid</source>
<translation>Raster instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="368"/>
<source>Ctrl+Alt+G</source>
<translation>Ctrl+Alt+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="383"/>
<source>Flip Mouse Wheel</source>
<translation>Draai muiswiel om</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="394"/>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="395"/>
+ <location filename="../IMainWindow.ui" line="398"/>
<source>Setup Map Paths</source>
<translation>Map met kaarten instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="413"/>
<source>POI Text</source>
<translation>POI tekst</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="428"/>
<source>Night / Day</source>
<translation>Dag/Nacht</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="443"/>
<source>Map Tool Tip</source>
<translation>Map Tool Tip</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="445"/>
+ <location filename="../IMainWindow.ui" line="446"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="457"/>
+ <location filename="../IMainWindow.ui" line="458"/>
<source>Setup DEM Paths</source>
<translation>Map DEM instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="470"/>
<source>About</source>
<translation>Over</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
+ <location filename="../IMainWindow.ui" line="482"/>
<source>Help</source>
<translation>Help</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="485"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="497"/>
+ <location filename="../IMainWindow.ui" line="500"/>
<source>Setup Map View</source>
<translation>Kaartinstellingen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="511"/>
+ <location filename="../IMainWindow.ui" line="512"/>
<source>Load GIS Data</source>
<translation>GIS gegevens laden</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="515"/>
<source>Load projects from file</source>
<translation>Project laden uit bestand</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="518"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="529"/>
+ <location filename="../IMainWindow.ui" line="530"/>
<source>Save All GIS Data</source>
<translation>GIS gegevens opslaan</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="533"/>
<source>Save all projects in the workspace</source>
<translation>Sla alle projecten op in werkruimte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="535"/>
+ <location filename="../IMainWindow.ui" line="536"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="547"/>
+ <location filename="../IMainWindow.ui" line="548"/>
<source>Setup Time Zone</source>
<translation>Tijdzone instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="560"/>
<source>Add empty project</source>
<translation>Nieuw leeg project</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="575"/>
<source>Search Google</source>
<translation>Zoeken Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="587"/>
<source>Close all projects</source>
<translation>Sluit alle projecten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="589"/>
+ <location filename="../IMainWindow.ui" line="590"/>
<source>F8</source>
<translation>F8</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="602"/>
<source>Setup Units</source>
<translation>Eenheden instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="614"/>
<source>Setup Workspace</source>
<translation>Werkruimte instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="617"/>
<source>Setup save on exit.</source>
<translation>Oplaan bij afsluiten instellen.</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="629"/>
<source>Import Database from QLandkarte</source>
<translation>Database van QLandkarte importeren</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="632"/>
<source>Import QLandkarte GT database</source>
<translation>QLandkarte database importeren</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="644"/>
<source>VRT Builder</source>
<translation>VRT maken</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="647"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>GUI front end naar gdalbuildvrt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="659"/>
<source>Store Map View</source>
<translation>Kaart opslaan</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="662"/>
<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="673"/>
+ <location filename="../IMainWindow.ui" line="674"/>
<source>Load Map View</source>
<translation>Kaart laden</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="677"/>
<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="691"/>
+ <location filename="../IMainWindow.ui" line="692"/>
<source>Ext. Profile</source>
<translation>Ext. profiel</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="695"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="707"/>
<source>Close</source>
<translation>Sluiten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="710"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="722"/>
<source>Clone Map View</source>
<translation>Kloon venster</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="724"/>
+ <location filename="../IMainWindow.ui" line="725"/>
<source>Ctrl+Shift+T</source>
<translation>Ctrl+Shift+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="737"/>
<source>Create Routino Database</source>
<translation>Maak Routino database</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="748"/>
+ <location filename="../IMainWindow.ui" line="749"/>
<source>Save(Print) Map Screenshot</source>
<translation>Kaartdeel opslaan/afdrukken</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="752"/>
<source>Print a selected area of the map</source>
<translation>Geselecteerde deel van kaart afdrukken</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="755"/>
<source>Ctrl+P</source>
<translation>Ctrl+P</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="767"/>
<source>Setup Coord. Format</source>
<translation>Coördinaat formaat instellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="769"/>
+ <location filename="../IMainWindow.ui" line="770"/>
<source>Change the format coordinates are displayed</source>
<translation>Getoonde coördinaat formaat aanpassen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="782"/>
<source>Setup Map Background</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="794"/>
<source>Setup Waypoint Icons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="796"/>
+ <location filename="../IMainWindow.ui" line="797"/>
<source>Setup path to custom icons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="805"/>
+ <location filename="../IMainWindow.ui" line="806"/>
<source>Close Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="808"/>
+ <location filename="../IMainWindow.ui" line="809"/>
<source>Ctrl+W</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="817"/>
+ <location filename="../IMainWindow.ui" line="818"/>
<source>Quickstart Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="826"/>
+ <location filename="../IMainWindow.ui" line="827"/>
<source>Setup Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="838"/>
+ <location filename="../IMainWindow.ui" line="839"/>
<source>Toggle Docks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="841"/>
+ <location filename="../IMainWindow.ui" line="842"/>
<source>Toggle visibility of dockable windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="844"/>
+ <location filename="../IMainWindow.ui" line="845"/>
<source>Ctrl+D</source>
<translation type="unfinished">Ctrl+D</translation>
</message>
+ <message>
+ <location filename="../IMainWindow.ui" line="854"/>
+ <source>Full Screen</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="857"/>
+ <source>F11</source>
+ <translation type="unfinished">F11</translation>
+ </message>
</context>
<context>
<name>IMapList</name>
@@ -7050,6 +7262,24 @@ Ik wil de documentatie niet lezen!</translation>
</message>
</context>
<context>
+ <name>IMapOnline</name>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="41"/>
+ <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
+ <translation type="unfinished">Deze kaart heeft OpenSSL onderteuning nodig. Door restricte beperkingen in bepaalde landen kan QMapShack geen OpenSSL pakket aanbieden. Neem een kijkje op <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> voor binaries. Er kan wel libeay32.dll en ssleay32.dll in de QMapShack map gekopieerd worden.</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="47"/>
+ <source>Error...</source>
+ <translation type="unfinished">Fout...</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="98"/>
+ <source><b>%1</b>: %2 tiles pending<br/></source>
+ <translation type="unfinished"><b>%1</b>: %2 delen ontvangen<br/></translation>
+ </message>
+</context>
+<context>
<name>IMapPathSetup</name>
<message>
<location filename="../map/IMapPathSetup.ui" line="14"/>
@@ -7181,28 +7411,65 @@ Ik wil de documentatie niet lezen!</translation>
<translation>Formulier</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="22"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
+ <source>Advanced Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <source>Source No Data (-srcnodata)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="46"/>
+ <source>Target No Data (-vrtnodata)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../tool/IMapVrtBuilder.ui" line="56"/>
+ <source>Target Projection (-a_srs)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="63"/>
+ <source>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
+ <source>1. Select one or multiple source files.
+2. Select a file name for the target VRT file.
+3. Press "Start" button.
+
+Tip:
+* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
+* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
+* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="139"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="156"/>
<source>Select source files:</source>
<translation>Selecteer bronbestand:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="79"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="121"/>
<source>Target Filename:</source>
<translation>Doel bestandsnaam:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="86"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="128"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="95"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="20"/>
<source>Start</source>
<translation>Start</translation>
</message>
@@ -7984,13 +8251,13 @@ of
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
- <source>Delete a point. (Ctrl+D)</source>
- <translation>Verwijder een punt. (Ctrl+D)</translation>
+ <source>Delete a point. (Ctrl+-)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
- <source>Ctrl+D</source>
- <translation>Ctrl+D</translation>
+ <source>Ctrl+-</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="215"/>
@@ -8164,8 +8431,8 @@ of
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
- <source>Select an activity for the selected range.</source>
- <translation>Selecteer een activiteit voor geselecteerde lengte.</translation>
+ <source>Set an activity for the selected range.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
@@ -8256,12 +8523,13 @@ of
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
<location filename="../mouse/IScrOptSelect.ui" line="142"/>
- <location filename="../mouse/IScrOptSelect.ui" line="196"/>
- <location filename="../mouse/IScrOptSelect.ui" line="225"/>
- <location filename="../mouse/IScrOptSelect.ui" line="285"/>
- <location filename="../mouse/IScrOptSelect.ui" line="312"/>
- <location filename="../mouse/IScrOptSelect.ui" line="339"/>
- <location filename="../mouse/IScrOptSelect.ui" line="366"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="156"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="210"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="239"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="299"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="326"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="353"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="380"/>
<source>...</source>
<translation type="unfinished">...</translation>
</message>
@@ -8282,36 +8550,41 @@ of
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="139"/>
+ <source>Set an activity for all selected tracks.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="153"/>
<source>Delete all selected items.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="193"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="207"/>
<source>Select all items that intersect the selected area.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="222"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="236"/>
<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"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="296"/>
<source>Add tracks to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="309"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="323"/>
<source>Add waypoints to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="336"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="350"/>
<source>Add routes to selection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="363"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="377"/>
<source>Add areas to selection.</source>
<translation type="unfinished"></translation>
</message>
@@ -8339,6 +8612,7 @@ of
<location filename="../gis/trk/IScrOptTrk.ui" line="151"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="170"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="184"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="198"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -8394,11 +8668,16 @@ of
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
+ <source>Set an activity for the complete track.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
<source>Copy track together with all attached waypoints into another project.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="210"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="224"/>
<source>TextLabel</source>
<translation>Benaming</translation>
</message>
@@ -8908,6 +9187,34 @@ of
</message>
</context>
<context>
+ <name>ITemplateWidget</name>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="14"/>
+ <source>Insert Template...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="32"/>
+ <source>Templates</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="42"/>
+ <source>Select a path with your own templates.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="45"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="77"/>
+ <source>Preview</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ITextEditWidget</name>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="14"/>
@@ -8915,264 +9222,279 @@ of
<translation>Bewerk tekst...</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="25"/>
- <location filename="../widgets/ITextEditWidget.ui" line="331"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="45"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="351"/>
<source>Undo</source>
<translation>Ongedaan maken</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="354"/>
<source>Ctrl+Z</source>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="38"/>
- <location filename="../widgets/ITextEditWidget.ui" line="343"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="58"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="363"/>
<source>Redo</source>
<translation>Opnieuw</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="346"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="366"/>
<source>Ctrl+Shift+Z</source>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="51"/>
- <location filename="../widgets/ITextEditWidget.ui" line="355"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="71"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="375"/>
<source>Cut</source>
<translation>Knippen</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="358"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="378"/>
<source>Ctrl+X</source>
<translation>Ctrl+X</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="64"/>
- <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="84"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="387"/>
<source>Copy</source>
<translation>Kopiëren</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="370"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="390"/>
<source>Ctrl+C</source>
<translation>Ctrl+C</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="77"/>
- <location filename="../widgets/ITextEditWidget.ui" line="375"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="97"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="395"/>
<source>Paste</source>
<translation>Plakken</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="25"/>
+ <source>Templ.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="120"/>
<source>A:L</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="133"/>
<source>A:C</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="146"/>
<source>A:R</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="159"/>
<source>A:B</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="192"/>
<source>B</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="205"/>
<source>I</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="218"/>
<source>U</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="238"/>
<source>C</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="285"/>
<source>Standard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="290"/>
<source>Bullet List (Disc)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="295"/>
<source>Bullet List (Circle)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="300"/>
<source>Bullet List (Square)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="305"/>
<source>Ordered List (Decimal)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="310"/>
<source>Ordered List (Alpha lower)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="315"/>
<source>Ordered List (Alpha upper)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="320"/>
<source>Ordered List (Roman lower)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="325"/>
<source>Ordered List (Roman upper)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="378"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="398"/>
<source>Ctrl+V</source>
<translation>Ctrl+V</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="390"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="410"/>
<source>Align Left</source>
<translation>Links uitlijnen</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="393"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="413"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="405"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="425"/>
<source>Align Right</source>
<translation>Rechts uitlijnen</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="408"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="428"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="420"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="440"/>
<source>Align Center</source>
<translation>Gecentreerd</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="423"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="443"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="435"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="455"/>
<source>Align Block</source>
<translation>Uitgevuld</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="438"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="458"/>
<source>Ctrl+J</source>
<translation>Ctrl+J</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="450"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="470"/>
<source>Underline</source>
<translation>Onderstrepen</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="453"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="473"/>
<source>Ctrl+U</source>
<translation>Ctrl+U</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="465"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="485"/>
<source>Bold</source>
<translation>Vet</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="468"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="488"/>
<source>Ctrl+B</source>
<translation>Ctrl+B</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="480"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="500"/>
<source>Italic</source>
<translation>Cursief</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="483"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="503"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="515"/>
<source>Plain</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="518"/>
<source>Reset the text's format before pasting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="503"/>
- <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="523"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="526"/>
<source>Select All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="529"/>
<source>Ctrl+A</source>
<translation type="unfinished">Ctrl+A</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="514"/>
- <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="534"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="537"/>
<source>Delete</source>
<translation type="unfinished">Verwijder</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="522"/>
- <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="542"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="545"/>
<source>Reset Font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="530"/>
- <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="550"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="553"/>
<source>Reset Layout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="565"/>
<source>Normal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="568"/>
<source>Paste without resetting the text's format</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="577"/>
+ <source>Insert From Template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="580"/>
+ <source>Create text from template.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ITextEditWidgetSelMenu</name>
@@ -9252,6 +9574,11 @@ of
<source>Setup Toolbar</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
+ <source>Toolbar is visible in Fullscreen-mode</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>IToolShell</name>
diff --git a/src/locale/qmapshack_ru.ts b/src/locale/qmapshack_ru.ts
index 4d4783b..0ba893f 100644
--- a/src/locale/qmapshack_ru.ts
+++ b/src/locale/qmapshack_ru.ts
@@ -22,97 +22,100 @@
<context>
<name>CActivityTrk</name>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="51"/>
<source>Foot</source>
<translation>Пешком</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="59"/>
<source>Bicycle</source>
<translation>Велосипед</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="67"/>
<source>Motor Bike</source>
<translation>Мотоцикл</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="75"/>
<source>Car</source>
<translation>Автомобиль</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="83"/>
<source>Cable Car</source>
<translation>Фуникулер</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="91"/>
<source>Swim</source>
<translation>Плавание</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="99"/>
<source>Ship</source>
<translation>Корабль</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="115"/>
<source>Ski/Winter</source>
<translation>Лыжи/зима</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="161"/>
+ <source>No Activity</source>
+ <translation>Нет мероприятия</translation>
+ </message>
+ <message>
<location filename="../gis/trk/CActivityTrk.cpp" line="318"/>
+ <source>Total</source>
+ <translation>Всего</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
<source>Ascent:</source>
<translation>Подъем:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="329"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="372"/>
<source>Descent:</source>
<translation>Спуск:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="107"/>
<source>Aeronautics</source>
<translation>Аэронавтика</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="307"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+ <source>Public Transport</source>
+ <translation>Общественный транспорт</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="324"/>
<source>Distance:</source>
<translation>Расстояние:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="396"/>
<source>Speed Moving:</source>
<translation>Скорость движения:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="351"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="420"/>
<source>Speed Total:</source>
<translation>Общая скорость:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="275"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="362"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="444"/>
<source>Time Moving:</source>
<translation>Время движения:</translation>
</message>
<message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="277"/>
- <location filename="../gis/trk/CActivityTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CActivityTrk.cpp" line="468"/>
<source>Time Total:</source>
<translation>Общее время:</translation>
</message>
- <message>
- <location filename="../gis/trk/CActivityTrk.cpp" line="414"/>
- <source>None</source>
- <translation>Никакое</translation>
- </message>
</context>
<context>
<name>CCanvas</name>
@@ -267,27 +270,27 @@
<context>
<name>CDBProject</name>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="112"/>
+ <location filename="../gis/db/CDBProject.cpp" line="113"/>
<source>Failed to load...</source>
<translation>Не удалось загрузить...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="113"/>
+ <location filename="../gis/db/CDBProject.cpp" line="114"/>
<source>Can't load file "%1" . It will be skipped.</source>
<translation>Загрузить файл %1 не удалось. Он будет пропущен.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="126"/>
+ <location filename="../gis/db/CDBProject.cpp" line="127"/>
<source>Project already in database...</source>
<translation>Проект уже в базе данных...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="127"/>
+ <location filename="../gis/db/CDBProject.cpp" line="128"/>
<source>The project "%1" has already been imported into the database. It will be skipped.</source>
<translation>Проект "%1" уже был загружен в базу данных. Он будет пропущен.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="278"/>
+ <location filename="../gis/db/CDBProject.cpp" line="279"/>
<source>The item %1 has been changed by %2 (%3).
To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -296,47 +299,47 @@ To solve this conflict you can create and save a clone, force your version or dr
Для решения этого конфликта можно создать и сохранить клон, заставить вашу версию или бросить вашу версию и взять версию базы данных</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="284"/>
+ <location filename="../gis/db/CDBProject.cpp" line="285"/>
<source>Conflict with database...</source>
<translation>Конфликт с базой данных...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="285"/>
+ <location filename="../gis/db/CDBProject.cpp" line="286"/>
<source>Clone && Save</source>
<translation>Клонировать и сохранить</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="286"/>
+ <location filename="../gis/db/CDBProject.cpp" line="287"/>
<source>Force Save</source>
<translation>Сохранить принудительно</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="287"/>
+ <location filename="../gis/db/CDBProject.cpp" line="288"/>
<source>Take remote</source>
<translation>Взять удаленную версию</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="569"/>
+ <location filename="../gis/db/CDBProject.cpp" line="572"/>
<source>Missing folder...</source>
<translation>Отсутствует папка...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="570"/>
+ <location filename="../gis/db/CDBProject.cpp" line="573"/>
<source>Failed to save project. The folder has been deleted in the database.</source>
<translation>Не удалось сохранить проект. Папка удалена с базы данных.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="577"/>
+ <location filename="../gis/db/CDBProject.cpp" line="580"/>
<source>Save ...</source>
<translation>Сохранить ...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="640"/>
+ <location filename="../gis/db/CDBProject.cpp" line="644"/>
<source>There was an unexpected database error:
%1</source>
@@ -345,12 +348,12 @@ To solve this conflict you can create and save a clone, force your version or dr
%1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="755"/>
+ <location filename="../gis/db/CDBProject.cpp" line="760"/>
<source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
<translation>Проект '%1' собирается обновить себя с базы данных. Однако имеются несохранённые изменения.</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="756"/>
+ <location filename="../gis/db/CDBProject.cpp" line="761"/>
<source>Save changes?</source>
<translation>Сохранить изменения?</translation>
</message>
@@ -446,7 +449,7 @@ To solve this conflict you can create and save a clone, force your version or dr
</message>
<message>
<location filename="../gis/prj/CDetailsPrj.cpp" line="267"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="774"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
<source>none</source>
<translation>нет</translation>
</message>
@@ -461,97 +464,97 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation><b>Резюме всех треков в проекте</b><br/></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="437"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="419"/>
<source><h2>Waypoints</h2></source>
<translation><h2>Маршрутные точки</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="444"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="470"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="591"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="709"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="739"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="426"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="452"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="573"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="691"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="721"/>
<source>Info</source>
<translation>Информация</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="471"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="427"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="574"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="692"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="722"/>
<source>Comment</source>
<translation>Комментарий</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="463"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="445"/>
<source><h2>Tracks</h2></source>
<translation><h2>Треки</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>From Start</source>
<translation>С начала</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To Next</source>
<translation>До следующего</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="610"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
<source>To End</source>
<translation>До конца</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="613"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="595"/>
<source>distance: </source>
<translation>Расстояние: </translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="623"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="605"/>
<source>ascent: </source>
<translation>Подъем: </translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="633"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="615"/>
<source>descent: </source>
<translation>Спуск: </translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="702"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="684"/>
<source><h2>Areas</h2></source>
<translation><h2>Области</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="732"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="714"/>
<source><h2>Routes</h2></source>
<translation><h2>Маршруты</h2></translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Edit name...</source>
<translation>Изменить имя...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="760"/>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="787"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="742"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
<source>Enter new project name.</source>
<translation>Ввести новое имя проекта.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Edit keywords...</source>
<translation>Изменить ключевые слова...</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="769"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="751"/>
<source>Enter keywords.</source>
<translation>Ввести ключевые слова.</translation>
</message>
<message>
- <location filename="../gis/prj/CDetailsPrj.cpp" line="915"/>
+ <location filename="../gis/prj/CDetailsPrj.cpp" line="897"/>
<source>Print Diary</source>
<translation>Печатать дневник</translation>
</message>
@@ -559,45 +562,35 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CDetailsTrk</name>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="168"/>
<source>Reduce visible track points</source>
<translation>Уменьшить число видимых точек трека</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="171"/>
<source>Change elevation of track points</source>
<translation>Изменить высоту точек трека</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="174"/>
<source>Change timestamp of track points</source>
<translation>Изменить метки времени точек трека</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="177"/>
<source>Miscellaneous</source>
<translation>Разное</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="402"/>
<source>Color</source>
<translation>Цвет</translation>
</message>
<message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="404"/>
+ <location filename="../gis/trk/CDetailsTrk.cpp" line="403"/>
<source>Activity</source>
<translation>Мероприятие</translation>
</message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>Reset activities...</source>
- <translation>Сбросить мероприятия...</translation>
- </message>
- <message>
- <location filename="../gis/trk/CDetailsTrk.cpp" line="633"/>
- <source>This will remove all activities from the track. Proceed?</source>
- <translation>Это удалит все мероприятия с трека. Продолжить?</translation>
- </message>
</context>
<context>
<name>CDetailsWpt</name>
@@ -610,7 +603,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CDeviceGarmin</name>
<message>
- <location filename="../device/CDeviceGarmin.cpp" line="265"/>
+ <location filename="../device/CDeviceGarmin.cpp" line="272"/>
<source>Picture%1</source>
<translation>Изображение %1</translation>
</message>
@@ -972,7 +965,7 @@ To solve this conflict you can create and save a clone, force your version or dr
<context>
<name>CGisItemTrk</name>
<message>
- <location filename="../gis/fit/serialization.cpp" line="246"/>
+ <location filename="../gis/fit/serialization.cpp" line="285"/>
<source>FIT file %1 contains no GPS data.</source>
<translation>FIT файл %1 не содержит данных GPS.</translation>
</message>
@@ -1013,252 +1006,252 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation>Изменены точки трека, удалены все предыдущие данные.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="305"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="322"/>
<source>Length: %1 %2</source>
<translation>Длина: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="312"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="329"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation>, %1%2 %3, %4%5 %6</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="316"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="333"/>
<source>, %1-, %2-</source>
<translation>, %1-, %2-</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="328"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="345"/>
<source>Time: -, Speed: -</source>
<translation>Время: -, скорость: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="357"/>
<source>Moving: -, Speed: -</source>
<translation>В движении: -, скорость: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="346"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="366"/>
<source>Start: %1</source>
<translation>Начало: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="350"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="370"/>
<source>Start: -</source>
<translation>Начало: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="356"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="376"/>
<source>End: %1</source>
<translation>Конец: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="360"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="380"/>
<source>End: -</source>
<translation>Конец: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="364"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="384"/>
<source>Points: %1 (%2)</source>
<translation>Точки: %1 (%2)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="368"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="388"/>
<source>Invalid elevations!</source>
<translation>Неверные высоты!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="373"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
<source>Invalid timestamps!</source>
<translation>Неверные метки времени!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="378"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="398"/>
<source>Invalid positions!</source>
<translation>Неверные позиции!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="387"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="407"/>
<source>Activities: %1</source>
- <translation>Мероприятие %1</translation>
+ <translation>Мероприятие: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="495"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="517"/>
<source>Index: %1</source>
<translation>Индекс: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="499"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="521"/>
<source>Index: visible %1, total %2</source>
<translation>Индекс: видимо %1, всего %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="510"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="532"/>
<source>Ele.: %1 %2</source>
<translation>Высота: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="513"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="535"/>
<source> slope: %1%3 (%2%)</source>
<translation> склон: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="518"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="540"/>
<source> speed: %1%2</source>
<translation> скорость: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="546"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="568"/>
<source>... and %1 tags not displayed</source>
<translation>... и %1 не показанных элементов</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
<source>Distance: - (-)</source>
<translation>Расстояние: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="559"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
<source>Moving: - (-)</source>
<translation>В движении: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1223"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1236"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1292"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1336"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1475"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1258"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1314"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1497"/>
<source>track</source>
<translation>трек</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1427"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1449"/>
<source>Hide point %1.</source>
<translation>Скрыть точку %1.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1431"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1453"/>
<source>Hide points %1..%2.</source>
<translation>Скрыть точки %1..%2.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="582"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
<source> Moving: %1%2 (%3%)</source>
<translation> В движении: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="643"/>
<source>, %1%2</source>
<translation>, %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="631"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="653"/>
<source> Time: %1%2</source>
<translation> Время: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="324"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="341"/>
<source>Time: %1, Speed: %2 %3</source>
<translation>Время: %1, скорость: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="336"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="353"/>
<source>Moving: %1, Speed: %2 %3</source>
<translation>В движении: %1, скорость: %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="556"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="578"/>
<source>Ascent: - (-)</source>
<translation>Подъем: -(-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="557"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="579"/>
<source>Descent: - (-)</source>
<translation>Спуск: -(-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="564"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
<source>Ascent: %1%2 (%3%)</source>
<translation>Подъем: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="570"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="592"/>
<source> Descent: %1%2 (%3%)</source>
<translation> Спуск: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
<source>Distance: %1%2 (%3%)</source>
<translation>Расстояние: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="598"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
<source>Ascent: -</source>
<translation>Подъем: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="599"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
<source>Descent: -</source>
<translation>Спуск: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
<source>Ascent: %1%2</source>
<translation>Подъем: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="616"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="638"/>
<source> Descent: %1%2</source>
<translation> Спуск: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="626"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
<source>Distance: %1%2</source>
<translation>Расстояние: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1282"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1304"/>
<source>Permanently removed points %1..%2</source>
<translation>Удалены безвозвратно точки %1..%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1460"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1482"/>
<source>Show points.</source>
<translation>Показать точки.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1988"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2010"/>
<source>Changed name</source>
<translation>Изменено имя</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1994"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2016"/>
<source>Changed comment</source>
<translation>Изменен комментарий</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2000"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2022"/>
<source>Changed description</source>
<translation>Изменено описание</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2006"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2028"/>
<source>Changed links</source>
<translation>Изменены ссылки</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2017"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2039"/>
<source>Changed elevation of point %1 to %2 %3</source>
<translation>Изменена высота точки %1 на %2 %3</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2041"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2063"/>
<source>Changed activity to '%1' for complete track.</source>
<translation>Изменено мероприятие на '%1' для всего трека.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="2080"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="2102"/>
<source>Changed activity to '%1' for range(%2..%3).</source>
<translation>Изменено мероприятие на '%1' для интервала (%2..%3).</translation>
</message>
@@ -1599,191 +1592,201 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation>Скрыть с карты</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="110"/>
+ <location filename="../gis/CGisListWks.cpp" line="109"/>
<source>Sort by Time</source>
<translation>Сортировать по времени</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="111"/>
+ <location filename="../gis/CGisListWks.cpp" line="110"/>
<source>Sort by Name</source>
<translation>Сортировать по именам</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="117"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Save as GPX 1.1 w/o ext...</source>
<translation>Сохранить как GPX 1.1 без расширений...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <location filename="../gis/CGisListWks.cpp" line="122"/>
<source>Send to Devices</source>
<translation>Отправить в устройства</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Sync. with Database</source>
<translation>Синхронизировать с базой данных</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="123"/>
+ <location filename="../gis/CGisListWks.cpp" line="126"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="132"/>
+ <location filename="../gis/CGisListWks.cpp" line="135"/>
<source>Update Project on Device</source>
<translation>Обновить проект на устройстве</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="134"/>
- <location filename="../gis/CGisListWks.cpp" line="157"/>
+ <location filename="../gis/CGisListWks.cpp" line="137"/>
+ <location filename="../gis/CGisListWks.cpp" line="161"/>
<source>Delete</source>
<translation>Удалить</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="146"/>
+ <location filename="../gis/CGisListWks.cpp" line="149"/>
<source>Edit...</source>
<translation>Изменить...</translation>
</message>
<message>
<location filename="../gis/CGisListWks.cpp" line="102"/>
- <location filename="../gis/CGisListWks.cpp" line="147"/>
+ <location filename="../gis/CGisListWks.cpp" line="150"/>
<source>Copy to...</source>
<translation>Копировать в...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <location filename="../gis/CGisListWks.cpp" line="113"/>
+ <source>Autom. Save</source>
+ <translation>Сохранить автоматически</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="118"/>
<source>Save as...</source>
<translation>Сохранить как...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="149"/>
+ <location filename="../gis/CGisListWks.cpp" line="152"/>
<source>Track Profile</source>
<translation>Профиль трека</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="151"/>
+ <location filename="../gis/CGisListWks.cpp" line="154"/>
<source>Select Range</source>
<translation>Выделить интервал</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="152"/>
+ <location filename="../gis/CGisListWks.cpp" line="155"/>
<source>Edit Track Points</source>
<translation>Изменить точки трека</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="153"/>
+ <location filename="../gis/CGisListWks.cpp" line="156"/>
<source>Reverse Track</source>
<translation>Обратить трек</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="154"/>
+ <location filename="../gis/CGisListWks.cpp" line="157"/>
<source>Combine Tracks</source>
<translation>Соединить треки</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="155"/>
+ <location filename="../gis/CGisListWks.cpp" line="158"/>
+ <source>Set Track Activity</source>
+ <translation>Добавить мероприятие</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="159"/>
<source>Copy Track with Waypoints</source>
<translation>Копировать трек с маршрутными точками</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="163"/>
+ <location filename="../gis/CGisListWks.cpp" line="167"/>
<source>Show Bubble</source>
<translation>Показать пузырек</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="165"/>
+ <location filename="../gis/CGisListWks.cpp" line="169"/>
<source>Move Waypoint</source>
<translation>Переместить маршрутную точку</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="166"/>
+ <location filename="../gis/CGisListWks.cpp" line="170"/>
<source>Proj. Waypoint...</source>
<translation>Проекция маршрутной точки...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="174"/>
+ <location filename="../gis/CGisListWks.cpp" line="178"/>
<source>Route Instructions</source>
<translation>Маршрутные инструкции</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="176"/>
+ <location filename="../gis/CGisListWks.cpp" line="180"/>
<source>Calculate Route</source>
<translation>Вычислить маршрут</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="177"/>
+ <location filename="../gis/CGisListWks.cpp" line="181"/>
<source>Reset Route</source>
<translation>Сбросить маршрутизацию</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="178"/>
+ <location filename="../gis/CGisListWks.cpp" line="182"/>
<source>Edit Route</source>
<translation>Изменить маршрут</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="179"/>
+ <location filename="../gis/CGisListWks.cpp" line="183"/>
<source>Convert to Track</source>
<translation>Преобразовать в трек</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="188"/>
+ <location filename="../gis/CGisListWks.cpp" line="192"/>
<source>Edit Area Points</source>
<translation>Изменить точки области</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="195"/>
+ <location filename="../gis/CGisListWks.cpp" line="199"/>
<source>Create Route</source>
<translation>Создать маршрут</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="196"/>
+ <location filename="../gis/CGisListWks.cpp" line="200"/>
<source>Change Icon (sel. waypt. only)</source>
<translation>Изменить пиктограмму (выбрать только маршрутные точки)</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="627"/>
+ <location filename="../gis/CGisListWks.cpp" line="634"/>
<source>Drop items...</source>
<translation>Удалить элементы...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="652"/>
- <location filename="../gis/CGisListWks.cpp" line="1646"/>
- <location filename="../gis/CGisListWks.cpp" line="1684"/>
+ <location filename="../gis/CGisListWks.cpp" line="659"/>
+ <location filename="../gis/CGisListWks.cpp" line="1691"/>
+ <location filename="../gis/CGisListWks.cpp" line="1729"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation><b>Обновить устройства</b><p>Обновить %1<br/>Подождите...</p></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="778"/>
+ <location filename="../gis/CGisListWks.cpp" line="785"/>
<source>Saving workspace. Please wait.</source>
<translation>Сохранить рабочую область. Подождите.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="824"/>
+ <location filename="../gis/CGisListWks.cpp" line="831"/>
<source>Loading workspace. Please wait.</source>
<translation>Загрузка рабочей области. Подождите.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>Close all projects...</source>
<translation>Закрыть все проекты...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1174"/>
+ <location filename="../gis/CGisListWks.cpp" line="1187"/>
<source>This will remove all projects from the workspace.</source>
<translation>Это удалит все проекты с рабочей области.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Delete project...</source>
<translation>Удалить проект...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="1197"/>
+ <location filename="../gis/CGisListWks.cpp" line="1210"/>
<source>Do you really want to delete %1?</source>
<translation>Вы действительно хотите удалить %1?</translation>
</message>
@@ -1801,22 +1804,22 @@ To solve this conflict you can create and save a clone, force your version or dr
<translation>Проект "%1" уже находится в рабочей области.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="554"/>
+ <location filename="../gis/CGisWidget.cpp" line="559"/>
<source>Copy items...</source>
<translation>Копировать элемент ...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="573"/>
+ <location filename="../gis/CGisWidget.cpp" line="578"/>
<source>Change waypoint symbols.</source>
<translation>Изменить символов путевых точек.</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Cut Track...</source>
<translation>Вырезать трек...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="702"/>
+ <location filename="../gis/CGisWidget.cpp" line="707"/>
<source>Do you want to delete the original track?</source>
<translation>Желаете удалить изначальный трек?</translation>
</message>
@@ -1974,7 +1977,7 @@ line %2, column %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="97"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="132"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="137"/>
<source>Speed</source>
<translation>Скорость</translation>
</message>
@@ -2000,37 +2003,42 @@ line %2, column %3:
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="128"/>
+ <source>Energy</source>
+ <translation>Энергия</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="133"/>
<source>Sea Level Pressure</source>
<translation>Давление на уровень моря</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="136"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="141"/>
<source>Speed (vertical)</source>
<translation>Скорость (вертикальная)</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="145"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
<source>Slope*</source>
<translation>Наклон*</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="150"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
<source>Speed*</source>
<translation>Скорость*</translation>
</message>
<message>
<location filename="../gis/trk/CKnownExtension.cpp" line="124"/>
- <location filename="../gis/trk/CKnownExtension.cpp" line="155"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
<source>Elevation</source>
<translation>Высота</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="160"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
<source>Progress</source>
<translation>Выполнение</translation>
</message>
<message>
- <location filename="../gis/trk/CKnownExtension.cpp" line="165"/>
+ <location filename="../gis/trk/CKnownExtension.cpp" line="170"/>
<source>Terrain slope</source>
<translation>Склон местности</translation>
</message>
@@ -2046,53 +2054,53 @@ line %2, column %3:
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="769"/>
+ <location filename="../CMainWindow.cpp" line="813"/>
<source>Use <b>Menu->View->Add Map View</b> to open a new view. Or <b>Menu->File->Load Map View</b> to restore a saved one. Or click <a href='newview'>here</a>.</source>
<translation>Использовать <b>Меню->Вид->Добавить окно карты</b> для добавления нового вида. Или <b>Меню->Файл->Загрузить вид карты</b> для восстановления сохраненного вида. Или нажмите <a href='newview'>здесь</a>.</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="897"/>
+ <location filename="../CMainWindow.cpp" line="941"/>
<source>Ele: %1%2</source>
<translation>Высота: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="909"/>
+ <location filename="../CMainWindow.cpp" line="953"/>
<source>Slope: %1%2</source>
<translation>Склон: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="925"/>
+ <location filename="../CMainWindow.cpp" line="969"/>
<source>[Grid: %1]</source>
<translation>[Координатная сетка: %1]</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1066"/>
+ <location filename="../CMainWindow.cpp" line="1110"/>
<source>Load GIS Data...</source>
<translation>Загрузить данные GIS...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
<source>Select output file</source>
<translation>Выбрать выходной файл</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1100"/>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1144"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>QMapShack View (*.view)</source>
<translation>QMapShack вид (*.view)</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1126"/>
+ <location filename="../CMainWindow.cpp" line="1170"/>
<source>Select file to load</source>
<translation>Выбрать файл для загрузки</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1369"/>
+ <location filename="../CMainWindow.cpp" line="1481"/>
<source>Fatal...</source>
<translation>Неустранимая ошибка...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="1370"/>
+ <location filename="../CMainWindow.cpp" line="1482"/>
<source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your distribution to fix it.</source>
<translation>QMapShack обнаружил плохо установленную библиотеку Proj4. Таблицы перевода для проекций EPSG обычно находятся в /usr/share/pro отсутствуют. Пожалуйста, сообщите об этом администратору пакета чтобы поправить это.</translation>
</message>
@@ -2855,19 +2863,18 @@ Fall back to internal types.</source>
<context>
<name>CMapTMS</name>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
- <location filename="../map/CMapTMS.cpp" line="77"/>
- <location filename="../map/CMapTMS.cpp" line="136"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Error...</source>
<translation>Ошибка...</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="67"/>
+ <location filename="../map/CMapTMS.cpp" line="68"/>
<source>Failed to open %1</source>
<translation>Не удалось открыть %1</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="77"/>
+ <location filename="../map/CMapTMS.cpp" line="78"/>
<source>Failed to read: %1
line %2, column %3:
%4</source>
@@ -2876,27 +2883,17 @@ line %2, column %3:
%4</translation>
</message>
<message>
- <location filename="../map/CMapTMS.cpp" line="115"/>
+ <location filename="../map/CMapTMS.cpp" line="116"/>
<source>Layer %1</source>
<translation>Слой %1</translation>
</message>
- <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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Эта карта требует поддержки OpenSSL. Однако для соблюдения законов некоторых стран OpenSSL не поставляется с QMapShack. Вы можете посетить <a href='https://www.openssl.org/community/binaries.html'> домашнюю страницу OpenSSL</a> для бинарных файлов. Вы должны скопировать libeay32.dll и ssleay32.dll в папку программы QMapShack.</translation>
- </message>
- <message>
- <location filename="../map/CMapTMS.cpp" line="299"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 плиток ожидается<br/></translation>
- </message>
</context>
<context>
<name>CMapVRT</name>
<message>
<location filename="../map/CMapVRT.cpp" line="45"/>
<location filename="../map/CMapVRT.cpp" line="59"/>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<location filename="../map/CMapVRT.cpp" line="133"/>
<source>Error...</source>
<translation>Ошибка...</translation>
@@ -2908,7 +2905,7 @@ line %2, column %3:
<translation>Не удалось загрузить файл: %1</translation>
</message>
<message>
- <location filename="../map/CMapVRT.cpp" line="88"/>
+ <location filename="../map/CMapVRT.cpp" line="83"/>
<source>File must be 8 bit palette or gray indexed.</source>
<translation>Файл должен быть 8 битной палитрой или серый проиндексирован.</translation>
</message>
@@ -2926,17 +2923,17 @@ line %2, column %3:
<translation>Построить GDAL VRT</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="47"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="63"/>
<source>Select files...</source>
<translation>Выбрать файлы...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="71"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="87"/>
<source>Select target file...</source>
<translation>Выбрать целевой файл...</translation>
</message>
<message>
- <location filename="../tool/CMapVrtBuilder.cpp" line="115"/>
+ <location filename="../tool/CMapVrtBuilder.cpp" line="150"/>
<source>!!! done !!!
</source>
<translation>Сделано!</translation>
@@ -2949,8 +2946,7 @@ line %2, column %3:
<location filename="../map/CMapWMTS.cpp" line="53"/>
<location filename="../map/CMapWMTS.cpp" line="63"/>
<location filename="../map/CMapWMTS.cpp" line="72"/>
- <location filename="../map/CMapWMTS.cpp" line="157"/>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>Error...</source>
<translation>Ошибка...</translation>
</message>
@@ -2981,20 +2977,10 @@ Unknown structure.</source>
<translation>Неожиданный сервис. Ожидается '* WMTS 1.0.0'. Получено '%1 %2'.</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 <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
- <translation>Эта карта требует поддержки OpenSSL. Однако для соблюдения законов некоторых стран OpenSSL не поставляется с QMapShack. Вы можете посетить <a href='https://www.openssl.org/community/binaries.html'> домашнюю страницу OpenSSL</a> для бинарных файлов. Вы должны скопировать libeay32.dll и ssleay32.dll в папку программы QMapShack.</translation>
- </message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="217"/>
+ <location filename="../map/CMapWMTS.cpp" line="209"/>
<source>No georeference information found.</source>
<translation>Не удалось найти геопозиционную информацию.</translation>
</message>
- <message>
- <location filename="../map/CMapWMTS.cpp" line="413"/>
- <source><b>%1</b>: %2 tiles pending<br/></source>
- <translation><b>%1</b>: %2 плиток ожидается<br/></translation>
- </message>
</context>
<context>
<name>CMouseEditArea</name>
@@ -3010,7 +2996,7 @@ Unknown structure.</source>
<translation><b>Изменить область</b><br/>Выберите функцию и режим маршрутизации с помощью кнопок панели инструментов. Потом выберите точку на линии. Только точки, отмеченные большим квадратиком могут быть изменены. Те с черной точкой являются подточки добавлены маршрутизацией<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditArea.cpp" line="96"/>
+ <location filename="../mouse/CMouseEditArea.cpp" line="94"/>
<source>area</source>
<translation>область</translation>
</message>
@@ -3029,7 +3015,7 @@ Unknown structure.</source>
<translation><b>Изменить точки маршрута</b><br/>Выберите функцию и режим маршрутизации с помощью кнопок панели инструментов. Потом выберите точку на линии. Только точки, отмеченные большим квадратиком могут быть изменены. Точки с черным пунктиром являются подточки введены маршрутизацией<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseEditRte.cpp" line="107"/>
+ <location filename="../mouse/CMouseEditRte.cpp" line="105"/>
<source>route</source>
<translation>маршрут</translation>
</message>
@@ -3058,7 +3044,7 @@ Unknown structure.</source>
<translation>Это заменит все данные оригинала простой линией. Все остальные данные будут потеряны безвозвратно.</translation>
</message>
<message>
- <location filename="../mouse/CMouseEditTrk.cpp" line="112"/>
+ <location filename="../mouse/CMouseEditTrk.cpp" line="110"/>
<source>track</source>
<translation>трек</translation>
</message>
@@ -3130,27 +3116,27 @@ Unknown structure.</source>
<translation><b>Выбрать элементы на карте</b><br/> Выберите прямоугольную область на карте. Используйте левую кнопку мышки и двигайте её. Прервать с правой кнопкой мышки. Уточните выбор с помощью метода указать-нажать-переместить по углам.</translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="99"/>
<source><b>Selected:</b><br/></source>
<translation><b>Выбрано:</b><br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="106"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="107"/>
<source>%1 waypoints<br/></source>
<translation>%1 маршрутных точек<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="101"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="102"/>
<source>%1 tracks<br/></source>
<translation>%1 треков<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="111"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="112"/>
<source>%1 routes<br/></source>
<translation>%1 маршрутов<br/></translation>
</message>
<message>
- <location filename="../mouse/CMouseSelect.cpp" line="116"/>
+ <location filename="../mouse/CMouseSelect.cpp" line="117"/>
<source>%1 areas<br/></source>
<translation>%1 областей<br/></translation>
</message>
@@ -3238,12 +3224,12 @@ y: %4 м/пиксель</translation>
<context>
<name>CProgressDialog</name>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="40"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="46"/>
<source>Elapsed time: %1</source>
<translation>Истёкшее время: %1</translation>
</message>
<message>
- <location filename="../helpers/CProgressDialog.cpp" line="87"/>
+ <location filename="../helpers/CProgressDialog.cpp" line="132"/>
<source>Elapsed time: %1 seconds.</source>
<translation>Истёкшее время: %1 сек.</translation>
</message>
@@ -3535,7 +3521,7 @@ is not a valid coordinate system definition:
<message>
<location filename="../gis/rte/router/CRouterBRouter.cpp" line="415"/>
<source><b>BRouter</b><br/>Bad response from server:<br/>%1</source>
- <translation><b>BRouter</b><br/>Плохой ответ от сервер:<br/>%1</translation>
+ <translation><b>BRouter</b><br/>Плохой ответ от сервера:<br/>%1</translation>
</message>
<message>
<location filename="../gis/rte/router/CRouterBRouter.cpp" line="405"/>
@@ -3598,7 +3584,7 @@ is not a valid coordinate system definition:
<message>
<location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="489"/>
<source>%1 invalid result</source>
- <translation>%1 неверный ресультат</translation>
+ <translation>%1 неверный результат</translation>
</message>
<message>
<location filename="../gis/rte/router/brouter/CRouterBRouterSetup.cpp" line="533"/>
@@ -3671,7 +3657,7 @@ is not a valid coordinate system definition:
<message>
<location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="446"/>
<source>doesn't seem to be a valid Java-executable</source>
- <translation>Не похоже на допустый исполняемый файл Java</translation>
+ <translation>Не похоже на допустимый исполняемый файл Java</translation>
</message>
<message>
<location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="451"/>
@@ -3701,7 +3687,7 @@ is not a valid coordinate system definition:
<message>
<location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="529"/>
<source>Download: %1<br/><br/>This will download and install a zip file from a download location that is not secured by any standard at all, using plain HTTP. Usually this should be HTTPS. The risk is someone redirecting the request and sending you a replacement zip with malware. There is no way for QMapShack to detect this. <br/>If you do not understand this or if you are in doubt, do not proceed and abort. Use the Web version of BRouter instead.</source>
- <translation>Загузка:%1 <br/>Это загрузит и установит файл ZIP из места загрузки, которое не защищено никаким стандартом вообще, используя простой HTTP. Обычно это должно быть HTTPS. Риск заключается в том, что кто-то перенаправляет запрос и отправляет вам заменяющий ZIP с помощью вредоносной программы. QMapShack не может обнаружить это. <br/> Если вы не понимаете этого или если у вас есть сомнения, не начинайте и прерываете. Вместо этого используйте веб-версию BRoute [...]
+ <translation>Загрузка:%1 <br/>Это загрузит и установит файл ZIP из места загрузки, которое не защищено никаким стандартом вообще, используя простой HTTP. Обычно это должно быть HTTPS. Риск заключается в том, что кто-то перенаправляет запрос и отправляет вам заменяющий ZIP с помощью вредоносной программы. QMapShack не может обнаружить это. <br/> Если вы не понимаете этого или если у вас есть сомнения, не начинайте и прерываете. Вместо этого используйте веб-версию BRout [...]
</message>
<message>
<location filename="../gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp" line="541"/>
@@ -3882,7 +3868,7 @@ is not a valid coordinate system definition:
<message>
<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>
+ <translation>Локальные данные устарели (%1, %2 - удаленные %3, %4)</translation>
</message>
<message>
<location filename="../gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp" line="190"/>
@@ -4623,14 +4609,47 @@ line %2, column %3:
</message>
</context>
<context>
+ <name>CTemplateWidget</name>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="39"/>
+ <source>choose one...</source>
+ <translation>выбрать один...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="40"/>
+ <source>Hiking Tour Summary (built-in)</source>
+ <translation>Сводка пеших экскурсий (встроенная)</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="158"/>
+ <source>-</source>
+ <translation>-</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="168"/>
+ <source>Template path...</source>
+ <translation>Путь к шаблонам...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="192"/>
+ <source>Failed to read template file %1.</source>
+ <translation>Не удалось читать шаблон %1.</translation>
+ </message>
+ <message>
+ <location filename="../widgets/CTemplateWidget.cpp" line="246"/>
+ <source>Preview...</source>
+ <translation>Просмотр...</translation>
+ </message>
+</context>
+<context>
<name>CTextEditWidget</name>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="71"/>
<source>&Color...</source>
<translation>&Цвет...</translation>
</message>
<message>
- <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+ <location filename="../widgets/CTextEditWidget.cpp" line="117"/>
<source>Reset format</source>
<translation>Сбросить форматирование</translation>
</message>
@@ -4693,7 +4712,195 @@ line %2, column %3:
<message>
<location filename="../helpers/CWptIconDialog.cpp" line="161"/>
<source>Path to user icons...</source>
- <translation>Путь к пользовательскими пиктограммами...</translation>
+ <translation>Путь к пользовательским пиктограммам...</translation>
+ </message>
+</context>
+<context>
+ <name>Form</name>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="14"/>
+ <source>Form</source>
+ <translation>Форма</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="20"/>
+ <source>Participants</source>
+ <translation>Участники</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="32"/>
+ <source>Weather</source>
+ <translation>Погода</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="38"/>
+ <source>rain</source>
+ <translation>дождь</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="48"/>
+ <source>sunny</source>
+ <translation>солнце</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="58"/>
+ <source>snow</source>
+ <translation>снег</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="68"/>
+ <source>clouds</source>
+ <translation>облака</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="128"/>
+ <source>windy</source>
+ <translation>ветер</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="81"/>
+ <source>hot</source>
+ <translation>жарко</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="91"/>
+ <source>warm</source>
+ <translation>тепло</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="101"/>
+ <source>cold</source>
+ <translation>холодно</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="111"/>
+ <source>freezing</source>
+ <translation>заморозка</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="121"/>
+ <source>foggy</source>
+ <translation>туман</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="138"/>
+ <source>humid</source>
+ <translation>влажно</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="171"/>
+ <source>Character</source>
+ <translation>Характер</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="242"/>
+ <source>easy hiking</source>
+ <translation>легкий поход</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="184"/>
+ <source>climbing</source>
+ <translation>альпинизм</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="256"/>
+ <source>alpine</source>
+ <translation>высокогорно</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="177"/>
+ <source>large ascend</source>
+ <translation>большой подъем</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="249"/>
+ <source>long distance</source>
+ <translation>длинная дистанция</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="194"/>
+ <source>via ferrata</source>
+ <translation>феррата</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="161"/>
+ <source>hail/soft hail</source>
+ <translation>град</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="201"/>
+ <source>Rating</source>
+ <translation>Рейтинг</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="214"/>
+ <source>Rating 5 stars</source>
+ <translation>Рейтинг 5 звезд</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="219"/>
+ <source>Rating 4 stars</source>
+ <translation>Рейтинг 4 звезды</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="224"/>
+ <source>Rating 3 stars</source>
+ <translation>Рейтинг 3 звезды</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="229"/>
+ <source>Rating 2 stars</source>
+ <translation>Рейтинг 2 звезды</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="234"/>
+ <source>Rating 1 star</source>
+ <translation>Рейтинг 1 звезда</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="263"/>
+ <source>aborted</source>
+ <translation>прервано</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="273"/>
+ <source>Equipment</source>
+ <translation>Экипировка</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="293"/>
+ <source>ferrata gear</source>
+ <translation>принадлежности для ферраты</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="307"/>
+ <source>night gear</source>
+ <translation>ночные принадлежности</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="314"/>
+ <source>snow shoes</source>
+ <translation>снежная обувь</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="286"/>
+ <source>climbing gear</source>
+ <translation>альпинистские принадлежности</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="279"/>
+ <source>ski</source>
+ <translation>лыжи</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="300"/>
+ <source>camping gear</source>
+ <translation>походные принадлежности</translation>
+ </message>
+ <message>
+ <location filename="../templates/Hiking_Tour_Summary.ui" line="324"/>
+ <source>Details</source>
+ <translation>Деталь</translation>
</message>
</context>
<context>
@@ -4886,8 +5093,8 @@ Norbert Truchsess (norbert.truchsess at t-online.de)</translation>
</message>
<message>
<location filename="../canvas/ICanvasSetup.ui" line="66"/>
- <source>Square (optimized for TMS and WTMS tiles)</source>
- <translation>Квадратичный (оптимальный для карт TMS и WTMS)</translation>
+ <source>Square (optimized for TMS and WMTS tiles)</source>
+ <translation>Квадратичный (оптимальный для карт TMS и WMTS)</translation>
</message>
</context>
<context>
@@ -5522,7 +5729,7 @@ If you want to keep just one half you can simply remove the points, or check thi
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="451"/>
<source>Use/edit user defined visibility of arrows for this track</source>
- <translation>Использовать/изменить определённая пользователем видимость стрелок направления для этого трека</translation>
+ <translation>Использовать/изменить определённую пользователем видимость стрелок направления для этого трека</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="480"/>
@@ -5629,7 +5836,7 @@ If you want to keep just one half you can simply remove the points, or check thi
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1334"/>
<source>Activity</source>
- <translation>Мероприятия</translation>
+ <translation>Мероприятие</translation>
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
@@ -5637,72 +5844,67 @@ If you want to keep just one half you can simply remove the points, or check thi
<translation>Добавить мероприятие</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
- <source>Remove Track Activity</source>
- <translation>Сбросить мероприятия</translation>
- </message>
- <message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1400"/>
<source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
<translation>Чтобы получить статистику трека выбрать мероприятие для полного трека из списка. Или выбрать часть трека, чтобы назначить мероприятие.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1427"/>
<source>Points</source>
<translation>Точки</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
<source>Time</source>
<translation>Время</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
<source>Ele.</source>
<translation>Высота</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
<source>Delta</source>
<translation>Разница</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
<source>Dist.</source>
<translation>Расстояние</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1495"/>
<source>Speed</source>
<translation>Скорость</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1500"/>
<source>Slope</source>
<translation>Наклон</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1505"/>
<source>Ascent</source>
<translation>Подъем</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1510"/>
<source>Descent</source>
<translation>Спуск</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1515"/>
<source>Position</source>
<translation>Позиция</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1524"/>
<source>Filter</source>
<translation>Фильтр</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="1561"/>
<source>Hist.</source>
<translation>История</translation>
</message>
@@ -5969,7 +6171,7 @@ If you want to keep just one half you can simply remove the points, or check thi
<message>
<location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="105"/>
<source>Preview</source>
- <translation>Предпросмотр</translation>
+ <translation>Просмотр</translation>
</message>
<message>
<location filename="../gis/trk/filter/IFilterInterpolateElevation.ui" line="112"/>
@@ -6371,70 +6573,70 @@ It is either a new item or it has been deleted in the database by someone else.<
<context>
<name>IGisProject</name>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source>Save project?</source>
<translation>Сохранить проект?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="155"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="156"/>
<source><h3>%1</h3>The project was changed. Save before closing it?</source>
<translation><h3>%1</h3> Проект изменен. Сохранить его перед закрытием?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="329"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="356"/>
<source>%1: Correlate tracks and waypoints.</source>
<translation>%1: коррелировать треки и маршрутные точки.</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="339"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="366"/>
<source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
<translation><h3>%1</h3> Было слишком долго? Желаете ли вы пропускать корреляцию треков и маршрутных точек для этого проекта в будущем?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="340"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="367"/>
<source>Canceled correlation...</source>
<translation>Корреляция отменена ...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="385"/>
- <location filename="../gis/prj/IGisProject.cpp" line="442"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="412"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="469"/>
<source>Save "%1" to...</source>
<translation>Сохранить "%1" в...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="527"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="554"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Имя файла: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="532"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="559"/>
<source>Waypoints: %1</source>
<translation>Маршрутные точки: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="536"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="563"/>
<source>Tracks: %1</source>
<translation>Треки: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="540"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="567"/>
<source>Routes: %1</source>
<translation>Маршруты: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="544"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="571"/>
<source>Areas: %1</source>
<translation>Области: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="664"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="691"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Вы уверены что хотите удалить '%1' из проекта '%2'?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="665"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="692"/>
<source>Delete...</source>
<translation>Удалить...</translation>
</message>
@@ -6642,364 +6844,374 @@ Filename: %1</source>
<translation>Окно</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="112"/>
+ <location filename="../IMainWindow.ui" line="113"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="120"/>
+ <location filename="../IMainWindow.ui" line="121"/>
<source>Project</source>
<translation>Проект</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="131"/>
+ <location filename="../IMainWindow.ui" line="132"/>
<source>Tool</source>
<translation>Инструмент</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="156"/>
+ <location filename="../IMainWindow.ui" line="157"/>
<source>Maps</source>
<translation>Карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="199"/>
+ <location filename="../IMainWindow.ui" line="200"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Цифровая модель рельефа (ЦМР)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="238"/>
+ <location filename="../IMainWindow.ui" line="239"/>
<source>Data</source>
<translation>Данные</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="256"/>
+ <location filename="../IMainWindow.ui" line="257"/>
<source>Route</source>
<translation>Маршрутизация</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="286"/>
+ <location filename="../IMainWindow.ui" line="287"/>
<source>Toolbar</source>
<translation>Панель инструментов</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="301"/>
- <location filename="../IMainWindow.ui" line="304"/>
+ <location filename="../IMainWindow.ui" line="302"/>
+ <location filename="../IMainWindow.ui" line="305"/>
<source>Add Map View</source>
<translation>Добавить окно карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="307"/>
+ <location filename="../IMainWindow.ui" line="308"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="322"/>
+ <location filename="../IMainWindow.ui" line="323"/>
<source>Show Scale</source>
<translation>Показать масштаб</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="334"/>
+ <location filename="../IMainWindow.ui" line="335"/>
<source>Setup Map Font</source>
<translation>Настройка шрифта карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="349"/>
+ <location filename="../IMainWindow.ui" line="350"/>
<source>Show Grid</source>
<translation>Показать координатную сетку</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="352"/>
+ <location filename="../IMainWindow.ui" line="353"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="364"/>
+ <location filename="../IMainWindow.ui" line="365"/>
<source>Setup Grid</source>
<translation>Настройка координатной сетки</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="367"/>
+ <location filename="../IMainWindow.ui" line="368"/>
<source>Ctrl+Alt+G</source>
<translation>Ctrl+Alt+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="382"/>
+ <location filename="../IMainWindow.ui" line="383"/>
<source>Flip Mouse Wheel</source>
<translation>Флип колесо мышки</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="394"/>
- <location filename="../IMainWindow.ui" line="397"/>
+ <location filename="../IMainWindow.ui" line="395"/>
+ <location filename="../IMainWindow.ui" line="398"/>
<source>Setup Map Paths</source>
<translation>Настройка пути к картам</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="412"/>
+ <location filename="../IMainWindow.ui" line="413"/>
<source>POI Text</source>
<translation>Текст для точек интереса</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="427"/>
+ <location filename="../IMainWindow.ui" line="428"/>
<source>Night / Day</source>
<translation>Ночь/день</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="442"/>
+ <location filename="../IMainWindow.ui" line="443"/>
<source>Map Tool Tip</source>
<translation>Подсказка карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="445"/>
+ <location filename="../IMainWindow.ui" line="446"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="457"/>
+ <location filename="../IMainWindow.ui" line="458"/>
<source>Setup DEM Paths</source>
<translation>Настройка пути к ЦМР</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="469"/>
+ <location filename="../IMainWindow.ui" line="470"/>
<source>About</source>
<translation>О программе</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="481"/>
+ <location filename="../IMainWindow.ui" line="482"/>
<source>Help</source>
<translation>Справки</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="484"/>
+ <location filename="../IMainWindow.ui" line="485"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="496"/>
- <location filename="../IMainWindow.ui" line="499"/>
+ <location filename="../IMainWindow.ui" line="497"/>
+ <location filename="../IMainWindow.ui" line="500"/>
<source>Setup Map View</source>
<translation>Настройка вида карт</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="511"/>
+ <location filename="../IMainWindow.ui" line="512"/>
<source>Load GIS Data</source>
<translation>Загрузить данные ГИС</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="514"/>
+ <location filename="../IMainWindow.ui" line="515"/>
<source>Load projects from file</source>
<translation>Загрузить проекты с файла</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="517"/>
+ <location filename="../IMainWindow.ui" line="518"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="529"/>
+ <location filename="../IMainWindow.ui" line="530"/>
<source>Save All GIS Data</source>
<translation>Сохранить все данные ГИС</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="532"/>
+ <location filename="../IMainWindow.ui" line="533"/>
<source>Save all projects in the workspace</source>
<translation>Сохранить все проекты в рабочей области</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="535"/>
+ <location filename="../IMainWindow.ui" line="536"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="547"/>
+ <location filename="../IMainWindow.ui" line="548"/>
<source>Setup Time Zone</source>
<translation>Настройка часового пояса</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="559"/>
+ <location filename="../IMainWindow.ui" line="560"/>
<source>Add empty project</source>
<translation>Добавить пустой проект</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="574"/>
+ <location filename="../IMainWindow.ui" line="575"/>
<source>Search Google</source>
<translation>Поиск в Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="586"/>
+ <location filename="../IMainWindow.ui" line="587"/>
<source>Close all projects</source>
<translation>Закрыть все проекты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="589"/>
+ <location filename="../IMainWindow.ui" line="590"/>
<source>F8</source>
<translation>F8</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="601"/>
+ <location filename="../IMainWindow.ui" line="602"/>
<source>Setup Units</source>
<translation>Настройка единиц</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="613"/>
+ <location filename="../IMainWindow.ui" line="614"/>
<source>Setup Workspace</source>
<translation>Настройка рабочей области</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="616"/>
+ <location filename="../IMainWindow.ui" line="617"/>
<source>Setup save on exit.</source>
<translation>Настройка рабочей области.</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="628"/>
+ <location filename="../IMainWindow.ui" line="629"/>
<source>Import Database from QLandkarte</source>
<translation>Импортировать базу данных QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="631"/>
+ <location filename="../IMainWindow.ui" line="632"/>
<source>Import QLandkarte GT database</source>
<translation>Импортировать базу данных QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="643"/>
+ <location filename="../IMainWindow.ui" line="644"/>
<source>VRT Builder</source>
<translation>Создать файл VRT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="646"/>
+ <location filename="../IMainWindow.ui" line="647"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>Графический интерфейс к gdalbuildvrt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="658"/>
+ <location filename="../IMainWindow.ui" line="659"/>
<source>Store Map View</source>
<translation>Сохранить вид карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="661"/>
+ <location filename="../IMainWindow.ui" line="662"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation>Сохранить вид карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="673"/>
+ <location filename="../IMainWindow.ui" line="674"/>
<source>Load Map View</source>
<translation>Загрузить вид карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="676"/>
+ <location filename="../IMainWindow.ui" line="677"/>
<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="691"/>
+ <location filename="../IMainWindow.ui" line="692"/>
<source>Ext. Profile</source>
<translation>Расширенный профиль</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="694"/>
+ <location filename="../IMainWindow.ui" line="695"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="706"/>
+ <location filename="../IMainWindow.ui" line="707"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="709"/>
+ <location filename="../IMainWindow.ui" line="710"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="721"/>
+ <location filename="../IMainWindow.ui" line="722"/>
<source>Clone Map View</source>
<translation>Клонировать вид карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="724"/>
+ <location filename="../IMainWindow.ui" line="725"/>
<source>Ctrl+Shift+T</source>
<translation>Ctrl+Shift+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="736"/>
+ <location filename="../IMainWindow.ui" line="737"/>
<source>Create Routino Database</source>
<translation>Создать базу данных Routino</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="748"/>
+ <location filename="../IMainWindow.ui" line="749"/>
<source>Save(Print) Map Screenshot</source>
<translation>Сохранить (Печатать) снимок экрана карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="751"/>
+ <location filename="../IMainWindow.ui" line="752"/>
<source>Print a selected area of the map</source>
<translation>Печатать выбранную область карты</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="754"/>
+ <location filename="../IMainWindow.ui" line="755"/>
<source>Ctrl+P</source>
<translation>Ctrl+P</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="766"/>
+ <location filename="../IMainWindow.ui" line="767"/>
<source>Setup Coord. Format</source>
<translation>Настройка формата координат</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="769"/>
+ <location filename="../IMainWindow.ui" line="770"/>
<source>Change the format coordinates are displayed</source>
<translation>Изменить формат отображения координат</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="781"/>
+ <location filename="../IMainWindow.ui" line="782"/>
<source>Setup Map Background</source>
<translation>Настройка фона карт</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="793"/>
+ <location filename="../IMainWindow.ui" line="794"/>
<source>Setup Waypoint Icons</source>
<translation>Настройка пиктограмм для маршрутных точек</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="796"/>
+ <location filename="../IMainWindow.ui" line="797"/>
<source>Setup path to custom icons</source>
<translation>Настройка пути к пользовательским пиктограммам</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="805"/>
+ <location filename="../IMainWindow.ui" line="806"/>
<source>Close Tab</source>
<translation>Закрыть вкладку</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="808"/>
+ <location filename="../IMainWindow.ui" line="809"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="817"/>
+ <location filename="../IMainWindow.ui" line="818"/>
<source>Quickstart Help</source>
<translation>Помощь для быстрого старта</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="826"/>
+ <location filename="../IMainWindow.ui" line="827"/>
<source>Setup Toolbar</source>
<translation>Настройка панели инструментов</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="838"/>
+ <location filename="../IMainWindow.ui" line="839"/>
<source>Toggle Docks</source>
<translation>Переключить закрепленные окна</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="841"/>
+ <location filename="../IMainWindow.ui" line="842"/>
<source>Toggle visibility of dockable windows</source>
<translation>Переключить видимость закрепленных окон</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="844"/>
+ <location filename="../IMainWindow.ui" line="845"/>
<source>Ctrl+D</source>
<translation>Ctrl+D</translation>
</message>
+ <message>
+ <location filename="../IMainWindow.ui" line="854"/>
+ <source>Full Screen</source>
+ <translation>Во весь экран</translation>
+ </message>
+ <message>
+ <location filename="../IMainWindow.ui" line="857"/>
+ <source>F11</source>
+ <translation>F11</translation>
+ </message>
</context>
<context>
<name>IMapList</name>
@@ -7057,6 +7269,24 @@ I don't want to read the documentation!</source>
</message>
</context>
<context>
+ <name>IMapOnline</name>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="41"/>
+ <source>This map requires OpenSSL support. However due to legal restrictions in some countries OpenSSL is not packaged with QMapShack. You can have a look at the <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory.</source>
+ <translation>Эта карта требует поддержки OpenSSL. Однако для соблюдения законов некоторых стран OpenSSL не поставляется с QMapShack. Вы можете посетить <a href='https://www.openssl.org/community/binaries.html'> домашнюю страницу OpenSSL</a> для бинарных файлов. Вы должны скопировать libeay32.dll и ssleay32.dll в папку программы QMapShack.</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="47"/>
+ <source>Error...</source>
+ <translation>Ошибка...</translation>
+ </message>
+ <message>
+ <location filename="../map/IMapOnline.cpp" line="98"/>
+ <source><b>%1</b>: %2 tiles pending<br/></source>
+ <translation><b>%1</b>: %2 плиток ожидается<br/></translation>
+ </message>
+</context>
+<context>
<name>IMapPathSetup</name>
<message>
<location filename="../map/IMapPathSetup.ui" line="14"/>
@@ -7188,28 +7418,72 @@ I don't want to read the documentation!</source>
<translation>Форма</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="22"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="27"/>
+ <source>Advanced Options</source>
+ <translation>Дополнительные параметры</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <source>Source No Data (-srcnodata)</source>
+ <translation>Нет данных в источнике (-srcnodata)</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="46"/>
+ <source>Target No Data (-vrtnodata)</source>
+ <translation>Нет данных в цели (-vrtnodata)</translation>
+ </message>
+ <message>
<location filename="../tool/IMapVrtBuilder.ui" line="56"/>
+ <source>Target Projection (-a_srs)</source>
+ <translation>Целевая проекция (-a_srs)</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="63"/>
+ <source>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</source>
+ <translation>Эти параметры относятся к частным случаям и обычно не заполняются. Сравните <a href='http://www.gdal.org/gdalbuildvrt.html'>GDAL справка </a> для дополнительной информации.</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="202"/>
+ <source>1. Select one or multiple source files.
+2. Select a file name for the target VRT file.
+3. Press "Start" button.
+
+Tip:
+* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
+* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
+* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</source>
+ <translation>1. Выбрать один или несколько исходных файлов.
+2. Выбрать имя файла для целевого файла VRT.
+3. Нажать кнопку "Начать"
+
+Намек:
+* Если у вас есть несколько файлов, поместите их в подпапку вашего пути к картам. Создайте файл VRT в вашем пути к картам.
+* Используйте дополнительные параметры, чтобы добавить значение "нет данных", если исходные файлы не имеют одного и файлы не образуют прямоугольную карту. Области без файла карты станут прозрачными.
+* Параметр "-a_srs" предназначен для назначения проекции/датума, когда в исходном файле этого нет. Это НЕ перепроектирует данные.</translation>
+ </message>
+ <message>
+ <location filename="../tool/IMapVrtBuilder.ui" line="98"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="139"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="39"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="156"/>
<source>Select source files:</source>
<translation>Выбрать исходные файлы:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="79"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="121"/>
<source>Target Filename:</source>
<translation>Имя целевого файла:</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="86"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="128"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../tool/IMapVrtBuilder.ui" line="95"/>
+ <location filename="../tool/IMapVrtBuilder.ui" line="20"/>
<source>Start</source>
<translation>Начать</translation>
</message>
@@ -7993,13 +8267,13 @@ or
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="161"/>
- <source>Delete a point. (Ctrl+D)</source>
- <translation>Удалить точку. (Ctrl+D)</translation>
+ <source>Delete a point. (Ctrl+-)</source>
+ <translation>Удалить точку. (Ctrl+-)</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="171"/>
- <source>Ctrl+D</source>
- <translation>Ctrl+D</translation>
+ <source>Ctrl+-</source>
+ <translation>Ctrl+-</translation>
</message>
<message>
<location filename="../mouse/line/IScrOptEditLine.ui" line="215"/>
@@ -8173,8 +8447,8 @@ or
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="68"/>
- <source>Select an activity for the selected range.</source>
- <translation>Выбрать мероприятие для выбранного интервала.</translation>
+ <source>Set an activity for the selected range.</source>
+ <translation>Установить мероприятие для выбранного интервала..</translation>
</message>
<message>
<location filename="../mouse/IScrOptRangeTrk.ui" line="82"/>
@@ -8265,12 +8539,13 @@ or
<location filename="../mouse/IScrOptSelect.ui" line="102"/>
<location filename="../mouse/IScrOptSelect.ui" line="122"/>
<location filename="../mouse/IScrOptSelect.ui" line="142"/>
- <location filename="../mouse/IScrOptSelect.ui" line="196"/>
- <location filename="../mouse/IScrOptSelect.ui" line="225"/>
- <location filename="../mouse/IScrOptSelect.ui" line="285"/>
- <location filename="../mouse/IScrOptSelect.ui" line="312"/>
- <location filename="../mouse/IScrOptSelect.ui" line="339"/>
- <location filename="../mouse/IScrOptSelect.ui" line="366"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="156"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="210"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="239"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="299"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="326"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="353"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="380"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -8291,36 +8566,41 @@ or
</message>
<message>
<location filename="../mouse/IScrOptSelect.ui" line="139"/>
+ <source>Set an activity for all selected tracks.</source>
+ <translation>Установить мероприятие для всех выбранных треков.</translation>
+ </message>
+ <message>
+ <location filename="../mouse/IScrOptSelect.ui" line="153"/>
<source>Delete all selected items.</source>
<translation>Удалить все выбранные элементы.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="193"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="207"/>
<source>Select all items that intersect the selected area.</source>
<translation>Выбрать все элементы, которые пересекают выбранную область.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="222"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="236"/>
<source>Select all items that are completely inside the selected area.</source>
<translation>Выбрать все элементы полностью внутри выбранной области.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="282"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="296"/>
<source>Add tracks to selection.</source>
<translation>Добавить треки к выбору.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="309"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="323"/>
<source>Add waypoints to selection.</source>
<translation>Добавить маршрутные точки к выбору.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="336"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="350"/>
<source>Add routes to selection.</source>
<translation>Добавить маршруты к выбору.</translation>
</message>
<message>
- <location filename="../mouse/IScrOptSelect.ui" line="363"/>
+ <location filename="../mouse/IScrOptSelect.ui" line="377"/>
<source>Add areas to selection.</source>
<translation>Добавить области к выбору.</translation>
</message>
@@ -8348,6 +8628,7 @@ or
<location filename="../gis/trk/IScrOptTrk.ui" line="151"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="170"/>
<location filename="../gis/trk/IScrOptTrk.ui" line="184"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="198"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -8403,11 +8684,16 @@ or
</message>
<message>
<location filename="../gis/trk/IScrOptTrk.ui" line="181"/>
+ <source>Set an activity for the complete track.</source>
+ <translation>Установить мероприятие для всего трека.</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="195"/>
<source>Copy track together with all attached waypoints into another project.</source>
<translation>Скопировать трек вместе со всеми присоединёнными маршрутными точками в другой проект.</translation>
</message>
<message>
- <location filename="../gis/trk/IScrOptTrk.ui" line="210"/>
+ <location filename="../gis/trk/IScrOptTrk.ui" line="224"/>
<source>TextLabel</source>
<translation>Метка текста</translation>
</message>
@@ -8918,6 +9204,34 @@ or
</message>
</context>
<context>
+ <name>ITemplateWidget</name>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="14"/>
+ <source>Insert Template...</source>
+ <translation>Вставить шаблон...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="32"/>
+ <source>Templates</source>
+ <translation>Шаблоны</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="42"/>
+ <source>Select a path with your own templates.</source>
+ <translation>Выбрать путь собственных шаблонов.</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="45"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITemplateWidget.ui" line="77"/>
+ <source>Preview</source>
+ <translation>Просмотр</translation>
+ </message>
+</context>
+<context>
<name>ITextEditWidget</name>
<message>
<location filename="../widgets/ITextEditWidget.ui" line="14"/>
@@ -8925,264 +9239,279 @@ or
<translation>Изменить текст...</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="25"/>
- <location filename="../widgets/ITextEditWidget.ui" line="331"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="45"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="351"/>
<source>Undo</source>
<translation>Отменить</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="354"/>
<source>Ctrl+Z</source>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="38"/>
- <location filename="../widgets/ITextEditWidget.ui" line="343"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="58"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="363"/>
<source>Redo</source>
<translation>Вернуть</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="346"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="366"/>
<source>Ctrl+Shift+Z</source>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="51"/>
- <location filename="../widgets/ITextEditWidget.ui" line="355"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="71"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="375"/>
<source>Cut</source>
<translation>Вырезать</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="358"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="378"/>
<source>Ctrl+X</source>
<translation>Ctrl+X</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="64"/>
- <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="84"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="387"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="370"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="390"/>
<source>Ctrl+C</source>
<translation>Ctrl+C</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="77"/>
- <location filename="../widgets/ITextEditWidget.ui" line="375"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="97"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="395"/>
<source>Paste</source>
<translation>Вставить</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="25"/>
+ <source>Templ.</source>
+ <translation>Шаблон</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="120"/>
<source>A:L</source>
<translation>A:L</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="133"/>
<source>A:C</source>
<translation>A:C</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="146"/>
<source>A:R</source>
<translation>A:R</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="159"/>
<source>A:B</source>
<translation>A:B</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="192"/>
<source>B</source>
<translation>B</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="205"/>
<source>I</source>
<translation>I</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="218"/>
<source>U</source>
<translation>U</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="238"/>
<source>C</source>
<translation>C</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="285"/>
<source>Standard</source>
<translation>Стандарт</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="290"/>
<source>Bullet List (Disc)</source>
<translation>Маркированный список (диск)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="295"/>
<source>Bullet List (Circle)</source>
<translation>Маркированный список (круг)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="300"/>
<source>Bullet List (Square)</source>
<translation>Маркированный список (квадрат)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="305"/>
<source>Ordered List (Decimal)</source>
<translation>Упорядоченный список (цифра, арабская)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="310"/>
<source>Ordered List (Alpha lower)</source>
<translation>Упорядоченный список (буква маленькая)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="315"/>
<source>Ordered List (Alpha upper)</source>
<translation>Упорядоченный список (буква большая)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="320"/>
<source>Ordered List (Roman lower)</source>
<translation>Упорядоченный список (цифра, латинская маленькая)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="325"/>
<source>Ordered List (Roman upper)</source>
<translation>Упорядоченный список (цифра, латинская большая)</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="378"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="398"/>
<source>Ctrl+V</source>
<translation>Ctrl+V</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="390"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="410"/>
<source>Align Left</source>
<translation>Выровнять по левому краю</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="393"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="413"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="405"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="425"/>
<source>Align Right</source>
<translation>Выровнять по правому краю</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="408"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="428"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="420"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="440"/>
<source>Align Center</source>
<translation>Выровнять по центру</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="423"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="443"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="435"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="455"/>
<source>Align Block</source>
<translation>Выровнять в блок</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="438"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="458"/>
<source>Ctrl+J</source>
<translation>Ctrl+J</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="450"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="470"/>
<source>Underline</source>
<translation>Подчеркнуть</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="453"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="473"/>
<source>Ctrl+U</source>
<translation>Ctrl+U</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="465"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="485"/>
<source>Bold</source>
<translation>Жирный</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="468"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="488"/>
<source>Ctrl+B</source>
<translation>Ctrl+B</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="480"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="500"/>
<source>Italic</source>
<translation>Курсив</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="483"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="503"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="515"/>
<source>Plain</source>
<translation>Обычный</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="518"/>
<source>Reset the text's format before pasting</source>
<translation>Сбросить форматирование текста до вставки</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="503"/>
- <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="523"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="526"/>
<source>Select All</source>
<translation>Выделить все</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="529"/>
<source>Ctrl+A</source>
<translation>Ctrl+A</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="514"/>
- <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="534"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="537"/>
<source>Delete</source>
<translation>Удалить</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="522"/>
- <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="542"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="545"/>
<source>Reset Font</source>
<translation>Сбросить шрифт</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="530"/>
- <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="550"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="553"/>
<source>Reset Layout</source>
<translation>Сбросить раскладку</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="565"/>
<source>Normal</source>
<translation>Нормально</translation>
</message>
<message>
- <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+ <location filename="../widgets/ITextEditWidget.ui" line="568"/>
<source>Paste without resetting the text's format</source>
<translation>Вставить без сброса форматирования текста</translation>
</message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="577"/>
+ <source>Insert From Template</source>
+ <translation>Вставить из шаблона</translation>
+ </message>
+ <message>
+ <location filename="../widgets/ITextEditWidget.ui" line="580"/>
+ <source>Create text from template.</source>
+ <translation>Создать текст из шаблона.</translation>
+ </message>
</context>
<context>
<name>ITextEditWidgetSelMenu</name>
@@ -9263,6 +9592,11 @@ or
<source>Setup Toolbar</source>
<translation>Настройка панели инструментов</translation>
</message>
+ <message>
+ <location filename="../helpers/IToolBarSetupDialog.ui" line="23"/>
+ <source>Toolbar is visible in Fullscreen-mode</source>
+ <translation>Панель инструментов видна в полноэкранном режиме</translation>
+ </message>
</context>
<context>
<name>IToolShell</name>
diff --git a/src/map/CMapIMG.cpp b/src/map/CMapIMG.cpp
index c85b825..93cb84c 100644
--- a/src/map/CMapIMG.cpp
+++ b/src/map/CMapIMG.cpp
@@ -428,7 +428,7 @@ void CMapIMG::setupTyp()
{
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();
@@ -1508,7 +1508,7 @@ void CMapIMG::loadSubDiv(CFileExt &file, const subdiv_desc_t& subdiv, IGarminStr
#ifdef DEBUG_SHOW_POLY_DATA
qDebug() << "--- Subdivision" << subdiv.n << "---";
- qDebug() << "adress:" << hex << subdiv.rgn_start << "- " << subdiv.rgn_end;
+ qDebug() << "address:" << hex << subdiv.rgn_start << "- " << subdiv.rgn_end;
qDebug() << "points: " << hex << opnt;
qDebug() << "indexed points: " << hex << oidx;
qDebug() << "polylines: " << hex << opline;
diff --git a/src/map/CMapIMG.h b/src/map/CMapIMG.h
index f139e31..919ac4f 100644
--- a/src/map/CMapIMG.h
+++ b/src/map/CMapIMG.h
@@ -65,7 +65,7 @@ public:
bool hasPoints; //< there are points stored in the RGN subsection
- bool hasIdxPoints; //< there are indexd points stored in the RGN subsection
+ bool hasIdxPoints; //< there are index points stored in the RGN subsection
bool hasPolylines; //< there are polylines stored in the RGN subsection
bool hasPolygons; //< there are polygons stored in the RGN subsection
diff --git a/src/map/CMapTMS.cpp b/src/map/CMapTMS.cpp
index 2d6611d..80456d2 100644
--- a/src/map/CMapTMS.cpp
+++ b/src/map/CMapTMS.cpp
@@ -27,6 +27,7 @@
#include <QtScript>
#include <QtWidgets>
#include <QtXml>
+
#include <ogr_spatialref.h>
#include <proj_api.h>
@@ -52,7 +53,7 @@ inline double tile2lat(int y, int z)
}
CMapTMS::CMapTMS(const QString &filename, CMapDraw *parent)
- : IMap(eFeatVisibility|eFeatTileCache, parent)
+ : IMapOnline(parent)
{
qDebug() << "------------------------------";
qDebug() << "TMS: try to open" << filename;
@@ -125,15 +126,8 @@ CMapTMS::CMapTMS(const QString &filename, CMapDraw *parent)
layers[idx].maxZoomLevel = xmlLayer.firstChildElement("MaxZoomLevel").text().toInt();
}
- if(layers[idx].strUrl.toLower().startsWith("https") && !QSslSocket::supportsSsl())
+ if(!httpsCheck(layers[idx].strUrl))
{
- QString msg = tr(
- "This map requires OpenSSL support. However due to legal restrictions in some countries "
- "OpenSSL is not packaged with QMapShack. You can have a look at the "
- "<a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> "
- "for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory."
- );
- QMessageBox::critical(CMainWindow::getBestWidgetForParent(),tr("Error..."),msg,QMessageBox::Abort);
return;
}
}
@@ -143,11 +137,11 @@ CMapTMS::CMapTMS(const QString &filename, CMapDraw *parent)
N = xmlValues.count();
for(qint32 n = 0; n < N; ++n)
{
- rawHeaderItem_t item;
const QDomNode& xmlValue = xmlValues.item(n);
- item.name = xmlValue.attributes().namedItem("name").nodeValue();
- item.value = xmlValue.toElement().text();
- rawHeaderItems << item;
+ registerHeaderItem(
+ xmlValue.attributes().namedItem("name").nodeValue(),
+ xmlValue.toElement().text()
+ );
}
// if there is more than one layer the layer list in the properties widget has to be enabled.
@@ -161,10 +155,6 @@ CMapTMS::CMapTMS(const QString &filename, CMapDraw *parent)
QFileInfo fi(filename);
slotSetCachePath(QDir(CMapDraw::getCacheRoot()).absoluteFilePath(fi.completeBaseName()));
- accessManager = new QNetworkAccessManager(parent->thread());
- connect(this, &CMapTMS::sigQueueChanged, this, &CMapTMS::slotQueueChanged);
- connect(accessManager, &QNetworkAccessManager::finished, this, &CMapTMS::slotRequestFinished);
-
name = fi.completeBaseName().replace("_", " ");
isActivated = true;
@@ -196,7 +186,7 @@ void CMapTMS::saveConfig(QSettings& cfg) /* override */
{
QMutexLocker lock(&mutex);
- IMap::saveConfig(cfg);
+ IMapOnline::saveConfig(cfg);
if(layers.size() < 2)
{
return;
@@ -218,7 +208,7 @@ void CMapTMS::loadConfig(QSettings& cfg)
{
QMutexLocker lock(&mutex);
- IMap::loadConfig(cfg);
+ IMapOnline::loadConfig(cfg);
if(layers.size() < 2)
{
return;
@@ -244,98 +234,6 @@ void CMapTMS::loadConfig(QSettings& cfg)
}
}
-void CMapTMS::configureCache() /* override */
-{
- QMutexLocker lock(&mutex);
-
- delete diskCache;
- diskCache = new CDiskCache(getCachePath(), getCacheSize(), getCacheExpiration(), this);
-}
-
-void CMapTMS::slotQueueChanged()
-{
- QMutexLocker lock(&mutex);
-
- if(!urlQueue.isEmpty() && urlPending.size() < 6)
- {
- // request up to 6 pending request
- for(int i = 0; i < (6 - urlPending.size()); i++)
- {
- QString url = urlQueue.dequeue();
- lastRequest = urlQueue.isEmpty();
-
- QNetworkRequest request;
- request.setUrl(url);
- for(const rawHeaderItem_t &item : rawHeaderItems)
- {
- request.setRawHeader(item.name.toLatin1(), item.value.toLatin1());
- }
- accessManager->get(request);
- urlPending << url;
-
- if(lastRequest)
- {
- break;
- }
- }
- }
- else if(lastRequest && urlPending.isEmpty())
- {
- lastRequest = false;
- // if all tiles are received the map layer can be redrawn with all tiles from cache
- map->emitSigCanvasUpdate();
- }
-
- if(timeLastUpdate.elapsed() > 2000)
- {
- timeLastUpdate.start();
- map->emitSigCanvasUpdate();
- }
-
- // report status of pending tiles
- int pending = urlQueue.size() + urlPending.size();
- if(pending)
- {
- map->reportStatusToCanvas(name, tr("<b>%1</b>: %2 tiles pending<br/>").arg(name).arg(pending));
- }
- else
- {
- map->reportStatusToCanvas(name, "");
- }
-}
-
-void CMapTMS::slotRequestFinished(QNetworkReply* reply)
-{
- QMutexLocker lock(&mutex);
-
- QString url = reply->url().toString();
- if(urlPending.contains(url))
- {
- QImage img;
- // only take good responses
- if(!reply->error())
- {
- // read image data
- img.loadFromData(reply->readAll());
- }
- // always store image to cache, the cache will take care of NULL images
- diskCache->store(url, img);
-
- urlPending.removeAll(url);
- }
-
- // debug output any error
- if(reply->error())
- {
- qDebug() << reply->errorString();
- }
-
- // delete reply object
- reply->deleteLater();
-
- // check for more items to be queued
- slotQueueChanged();
-}
void CMapTMS::slotLayersChanged(QListWidgetItem * item)
{
@@ -522,6 +420,7 @@ void CMapTMS::draw(IDrawContext::buffer_t& buf) /* override */
}
}
}
+
emit sigQueueChanged();
}
}
diff --git a/src/map/CMapTMS.h b/src/map/CMapTMS.h
index b0ed034..25d9bda 100644
--- a/src/map/CMapTMS.h
+++ b/src/map/CMapTMS.h
@@ -19,16 +19,14 @@
#ifndef CMAPTMS_H
#define CMAPTMS_H
-#include "map/IMap.h"
-#include <QQueue>
-#include <QTime>
+#include "map/IMapOnline.h"
class CDiskCache;
class QListWidgetItem;
class QNetworkAccessManager;
class QNetworkReply;
-class CMapTMS : public IMap
+class CMapTMS : public IMapOnline
{
Q_OBJECT
public:
@@ -40,21 +38,11 @@ public:
void getLayers(QListWidget& list) override;
void saveConfig(QSettings& cfg) override;
-
void loadConfig(QSettings& cfg) override;
-signals:
- void sigQueueChanged();
-
-protected:
- void configureCache() override;
-
private slots:
- void slotQueueChanged();
- void slotRequestFinished(QNetworkReply* reply);
void slotLayersChanged(QListWidgetItem * item);
-
private:
struct layer_t;
QString createUrl(const layer_t& layer, int x, int y, int z);
@@ -72,36 +60,10 @@ private:
QString script;
};
- struct rawHeaderItem_t
- {
- QString name;
- QString value;
- };
-
QVector<layer_t> layers;
- QString name;
-
qint32 minZoomLevel = 1;
-
qint32 maxZoomLevel = 21;
-
- QList<rawHeaderItem_t> rawHeaderItems;
-
- /// Mutex to control access to url queue
- QMutex mutex {QMutex::Recursive};
- /// a queue with all tile urls to request
- QQueue<QString> urlQueue;
- /// the tile cache
- CDiskCache * diskCache = nullptr;
- /// access manager to request tiles
- QNetworkAccessManager * accessManager = nullptr;
-
- QList<QString> urlPending;
-
- bool lastRequest = false;
-
- QTime timeLastUpdate;
};
#endif //CMAPTMS_H
diff --git a/src/map/CMapVRT.cpp b/src/map/CMapVRT.cpp
index 2ca3f51..478c0c9 100644
--- a/src/map/CMapVRT.cpp
+++ b/src/map/CMapVRT.cpp
@@ -60,11 +60,6 @@ CMapVRT::CMapVRT(const QString &filename, CMapDraw *parent)
return;
}
-
- hasOverviews = pBand->GetOverviewCount() != 0;
-
- // qDebug() << pBand->GetColorInterpretation();
-
if(pBand->GetColorInterpretation() == GCI_PaletteIndex )
{
GDALColorTable * pct = pBand->GetColorTable();
@@ -107,6 +102,11 @@ CMapVRT::CMapVRT(const QString &filename, CMapDraw *parent)
}
}
+ if(dataset->GetRasterCount() > 0)
+ {
+ hasOverviews = dataset->GetRasterBand(1)->GetOverviewCount() != 0;
+ }
+
qDebug() << "has overviews" << hasOverviews;
diff --git a/src/map/CMapWMTS.cpp b/src/map/CMapWMTS.cpp
index 34ff20d..8405ffa 100644
--- a/src/map/CMapWMTS.cpp
+++ b/src/map/CMapWMTS.cpp
@@ -28,13 +28,13 @@
#include <QtXml>
#include <ogr_spatialref.h>
-#include <proj_api.h>
+
CMapWMTS::CMapWMTS(const QString &filename, CMapDraw *parent)
- : IMap(eFeatVisibility|eFeatTileCache, parent)
+ : IMapOnline(parent)
{
qDebug() << "------------------------------";
- qDebug() << "WTMS: try to open" << filename;
+ qDebug() << "WMTS: try to open" << filename;
QFile file(filename);
@@ -146,21 +146,13 @@ CMapWMTS::CMapWMTS(const QString &filename, CMapDraw *parent)
layer.resourceURL = layer.resourceURL.replace("{" + Identifier + "}", Default, Qt::CaseInsensitive);
}
- if(layer.resourceURL.toLower().startsWith("https") && !QSslSocket::supportsSsl())
+ if(!httpsCheck(layer.resourceURL))
{
- QString msg = tr(
- "This map requires OpenSSL support. However due to legal restrictions in some countries "
- "OpenSSL is not packaged with QMapShack. You can have a look at the "
- "<a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> "
- "for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory."
- );
- QMessageBox::critical(CMainWindow::getBestWidgetForParent(),tr("Error..."),msg,QMessageBox::Abort);
return;
}
-
// enable layer by default
- layer.enabled = true;
+ layer.enabled = true;
layers << layer;
}
@@ -246,20 +238,11 @@ CMapWMTS::CMapWMTS(const QString &filename, CMapDraw *parent)
QFileInfo fi(filename);
slotSetCachePath(QDir(CMapDraw::getCacheRoot()).absoluteFilePath(fi.completeBaseName()));
- accessManager = new QNetworkAccessManager(parent->thread());
- connect(this, &CMapWMTS::sigQueueChanged, this, &CMapWMTS::slotQueueChanged);
- connect(accessManager, &QNetworkAccessManager::finished, this, &CMapWMTS::slotRequestFinished);
-
name = fi.completeBaseName().replace("_", " ");
isActivated = true;
}
-CMapWMTS::~CMapWMTS()
-{
-// map->reportStatusToCanvas(name, "");
-}
-
void CMapWMTS::getLayers(QListWidget& list)
{
QMutexLocker lock(&mutex);
@@ -281,11 +264,12 @@ void CMapWMTS::getLayers(QListWidget& list)
connect(&list, &QListWidget::itemChanged, this, &CMapWMTS::slotLayersChanged);
}
+
void CMapWMTS::saveConfig(QSettings& cfg) /* override */
{
QMutexLocker lock(&mutex);
- IMap::saveConfig(cfg);
+ IMapOnline::saveConfig(cfg);
if(layers.size() < 2)
{
return;
@@ -307,7 +291,7 @@ void CMapWMTS::loadConfig(QSettings& cfg) /* override */
{
QMutexLocker lock(&mutex);
- IMap::loadConfig(cfg);
+ IMapOnline::loadConfig(cfg);
if(layers.size() < 2)
{
return;
@@ -334,14 +318,6 @@ void CMapWMTS::loadConfig(QSettings& cfg) /* override */
}
-void CMapWMTS::configureCache()
-{
- QMutexLocker lock(&mutex);
-
- delete diskCache;
- diskCache = new CDiskCache(getCachePath(), getCacheSize(), getCacheExpiration(), this);
-}
-
void CMapWMTS::slotLayersChanged(QListWidgetItem * item)
{
QMutexLocker lock(&mutex);
@@ -369,87 +345,6 @@ void CMapWMTS::slotLayersChanged(QListWidgetItem * item)
map->emitSigCanvasUpdate();
}
-void CMapWMTS::slotQueueChanged()
-{
- QMutexLocker lock(&mutex);
-
- if(!urlQueue.isEmpty() && urlPending.size() < 6)
- {
- // request up to 6 pending request
- for(int i = 0; i < (6 - urlPending.size()); i++)
- {
- QString url = urlQueue.dequeue();
- lastRequest = urlQueue.isEmpty();
-
- QNetworkRequest request;
- request.setUrl(url);
- accessManager->get(request);
- urlPending << url;
-
- if(lastRequest)
- {
- break;
- }
- }
- }
- else if(lastRequest && urlPending.isEmpty())
- {
- lastRequest = false;
- // if all tiles are received the map layer can be redrawn with all tiles from cache
- map->emitSigCanvasUpdate();
- }
-
- if(timeLastUpdate.elapsed() > 2000)
- {
- timeLastUpdate.start();
- map->emitSigCanvasUpdate();
- }
-
-
- // report status of pending tiles
- int pending = urlQueue.size() + urlPending.size();
- if(pending)
- {
- map->reportStatusToCanvas(name, tr("<b>%1</b>: %2 tiles pending<br/>").arg(name).arg(pending));
- }
- else
- {
- map->reportStatusToCanvas(name, "");
- }
-}
-
-void CMapWMTS::slotRequestFinished(QNetworkReply* reply)
-{
- QMutexLocker lock(&mutex);
-
- QString url = reply->url().toString();
- if(urlPending.contains(url))
- {
- QImage img;
- // only take good responses
- if(!reply->error())
- {
- // read image data
- img.loadFromData(reply->readAll());
- }
- // always store image to cache, the cache will take care of NULL images
- diskCache->store(url, img);
-
- urlPending.removeAll(url);
- }
-
- // debug output any error
- if(reply->error())
- {
- qDebug() << reply->errorString();
- }
-
- // delete reply object
- reply->deleteLater();
-
- // check for more items to be queued
- slotQueueChanged();
-}
void CMapWMTS::draw(IDrawContext::buffer_t& buf) /* override */
{
@@ -470,7 +365,6 @@ void CMapWMTS::draw(IDrawContext::buffer_t& buf) /* override */
return;
}
-
// get pixel offset of top left buffer corner
QPointF pp = buf.ref1;
map->convertRad2Px(pp);
diff --git a/src/map/CMapWMTS.h b/src/map/CMapWMTS.h
index 3399ba6..8d789a2 100644
--- a/src/map/CMapWMTS.h
+++ b/src/map/CMapWMTS.h
@@ -18,11 +18,8 @@
#ifndef CMAPWMTS_H
#define CMAPWMTS_H
-#include "map/IMap.h"
+#include "map/IMapOnline.h"
#include <QMap>
-#include <QMutex>
-#include <QQueue>
-#include <QTime>
class CMapDraw;
@@ -32,31 +29,21 @@ class QNetworkReply;
class QListWidgetItem;
-class CMapWMTS : public IMap
+class CMapWMTS : public IMapOnline
{
Q_OBJECT
public:
CMapWMTS(const QString& filename, CMapDraw *parent);
- virtual ~CMapWMTS();
+ virtual ~CMapWMTS() {}
void draw(IDrawContext::buffer_t& buf) override;
void getLayers(QListWidget& list) override;
void saveConfig(QSettings& cfg) override;
-
void loadConfig(QSettings& cfg) override;
-
-signals:
- void sigQueueChanged();
-
-protected:
- void configureCache() override;
-
private slots:
- void slotQueueChanged();
- void slotRequestFinished(QNetworkReply* reply);
void slotLayersChanged(QListWidgetItem * item);
private:
@@ -109,22 +96,6 @@ private:
};
QMap<QString,tileset_t> tilesets;
-
- QString name;
- /// Mutex to control access to url queue
- QMutex mutex {QMutex::Recursive};
- /// a queue with all tile urls to request
- QQueue<QString> urlQueue;
- /// the tile cache
- CDiskCache * diskCache = nullptr;
- /// access manager to request tiles
- QNetworkAccessManager * accessManager = nullptr;
-
- QList<QString> urlPending;
-
- bool lastRequest = false;
-
- QTime timeLastUpdate;
};
#endif //CMAPWMTS_H
diff --git a/src/map/IMap.h b/src/map/IMap.h
index 78f0278..e06ba7a 100644
--- a/src/map/IMap.h
+++ b/src/map/IMap.h
@@ -19,6 +19,7 @@
#ifndef IMAP_H
#define IMAP_H
+#include "canvas/IDrawContext.h"
#include "canvas/IDrawObject.h"
#include <QImage>
#include <QMutex>
@@ -253,7 +254,7 @@ protected:
bool showPolygons = true; //< vector maps only: hide/show polygons
bool showPolylines = true; //< vector maps only: hide/show polylines
bool showPOIs = true; //< vector maps only: hide/show point of interest
- qint32 adjustDetailLevel = 0; //< vector maps only: alter threshold to show deatils.
+ qint32 adjustDetailLevel = 0; //< vector maps only: alter threshold to show details.
QString cachePath; //< streaming map only: path to cached tiles
qint32 cacheSizeMB = 100; //< streaming map only: maximum size of all tiles in cache [MByte]
diff --git a/src/map/IMapOnline.cpp b/src/map/IMapOnline.cpp
new file mode 100644
index 0000000..087aa07
--- /dev/null
+++ b/src/map/IMapOnline.cpp
@@ -0,0 +1,148 @@
+/**********************************************************************************************
+ Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Christian Eichler code at christian-eichler.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "CMainWindow.h"
+#include "map/CMapDraw.h"
+#include "map/IMapOnline.h"
+#include "map/cache/CDiskCache.h"
+
+#include <QMessageBox>
+#include <QtNetwork>
+
+IMapOnline::IMapOnline(CMapDraw * parent)
+ : IMap(eFeatVisibility | eFeatTileCache, parent)
+{
+ accessManager = new QNetworkAccessManager(parent->thread());
+ connect(accessManager, &QNetworkAccessManager::finished, this, &IMapOnline::slotRequestFinished);
+
+ connect(this, &IMapOnline::sigQueueChanged, this, &IMapOnline::slotQueueChanged);
+}
+
+bool IMapOnline::httpsCheck(const QString &url)
+{
+ if(url.toLower().startsWith("https") && !QSslSocket::supportsSsl())
+ {
+ QString msg = tr(
+ "This map requires OpenSSL support. However due to legal restrictions in some countries "
+ "OpenSSL is not packaged with QMapShack. You can have a look at the "
+ "<a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> "
+ "for binaries. You have to copy libeay32.dll and ssleay32.dll into the QMapShack program directory."
+ );
+ QMessageBox::critical(CMainWindow::getBestWidgetForParent(), tr("Error..."), msg, QMessageBox::Abort);
+ return false;
+ }
+ return true;
+}
+
+
+void IMapOnline::slotQueueChanged()
+{
+ QMutexLocker lock(&mutex);
+
+ if(!urlQueue.isEmpty() && urlPending.size() < 6)
+ {
+ // request up to 6 pending request
+ for(int i = 0; i < (6 - urlPending.size()); i++)
+ {
+ QString url = urlQueue.dequeue();
+ lastRequest = urlQueue.isEmpty();
+
+ QNetworkRequest request;
+ request.setUrl(url);
+ for(const rawHeaderItem_t &item : rawHeaderItems)
+ {
+ request.setRawHeader(item.name.toLatin1(), item.value.toLatin1());
+ }
+ accessManager->get(request);
+ urlPending << url;
+
+ if(lastRequest)
+ {
+ break;
+ }
+ }
+ }
+ else if(lastRequest && urlPending.isEmpty())
+ {
+ lastRequest = false;
+ // if all tiles are received the map layer can be redrawn with all tiles from cache
+ map->emitSigCanvasUpdate();
+ }
+
+ if(timeLastUpdate.elapsed() > 2000)
+ {
+ timeLastUpdate.start();
+ map->emitSigCanvasUpdate();
+ }
+
+ // report status of pending tiles
+ int pending = urlQueue.size() + urlPending.size();
+ if(pending)
+ {
+ map->reportStatusToCanvas(name, tr("<b>%1</b>: %2 tiles pending<br/>").arg(name).arg(pending));
+ }
+ else
+ {
+ map->reportStatusToCanvas(name, "");
+ }
+}
+
+
+void IMapOnline::slotRequestFinished(QNetworkReply* reply)
+{
+ QMutexLocker lock(&mutex);
+
+ QString url = reply->url().toString();
+ if(urlPending.contains(url))
+ {
+ QImage img;
+ // only take good responses
+ if(!reply->error())
+ {
+ // read image data
+ img.loadFromData(reply->readAll());
+ }
+ // always store image to cache, the cache will take care of NULL images
+ diskCache->store(url, img);
+
+ urlPending.removeAll(url);
+ }
+
+ // debug output any error
+ if(reply->error())
+ {
+ qDebug() << "Request to" << url << "failed:" << reply->errorString();
+ }
+
+ // delete reply object
+ reply->deleteLater();
+
+ // check for more items to be queued
+ slotQueueChanged();
+}
+
+
+void IMapOnline::configureCache()
+{
+ QMutexLocker lock(&mutex);
+
+ delete diskCache;
+ diskCache = new CDiskCache(getCachePath(), getCacheSize(), getCacheExpiration(), this);
+}
+
diff --git a/src/map/CMapTMS.h b/src/map/IMapOnline.h
similarity index 66%
copy from src/map/CMapTMS.h
copy to src/map/IMapOnline.h
index b0ed034..28cdc22 100644
--- a/src/map/CMapTMS.h
+++ b/src/map/IMapOnline.h
@@ -1,5 +1,6 @@
/**********************************************************************************************
Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Christian Eichler code at christian-eichler.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,61 +17,20 @@
**********************************************************************************************/
-#ifndef CMAPTMS_H
-#define CMAPTMS_H
-
+#ifndef IMAPONLINE_H
+#define IMAPONLINE_H
#include "map/IMap.h"
+#include <QMutex>
#include <QQueue>
#include <QTime>
class CDiskCache;
-class QListWidgetItem;
class QNetworkAccessManager;
class QNetworkReply;
-class CMapTMS : public IMap
+class IMapOnline : public IMap
{
Q_OBJECT
-public:
- CMapTMS(const QString& filename, CMapDraw *parent);
- virtual ~CMapTMS() {}
-
- void draw(IDrawContext::buffer_t& buf) override;
-
- void getLayers(QListWidget& list) override;
-
- void saveConfig(QSettings& cfg) override;
-
- void loadConfig(QSettings& cfg) override;
-
-signals:
- void sigQueueChanged();
-
-protected:
- void configureCache() override;
-
-private slots:
- void slotQueueChanged();
- void slotRequestFinished(QNetworkReply* reply);
- void slotLayersChanged(QListWidgetItem * item);
-
-
-private:
- struct layer_t;
- QString createUrl(const layer_t& layer, int x, int y, int z);
-
- struct layer_t
- {
- layer_t() : enabled(true), minZoomLevel(0), maxZoomLevel(0)
- {
- }
- bool enabled;
- qint32 minZoomLevel;
- qint32 maxZoomLevel;
- QString title;
- QString strUrl;
- QString script;
- };
struct rawHeaderItem_t
{
@@ -78,16 +38,12 @@ private:
QString value;
};
- QVector<layer_t> layers;
-
- QString name;
-
- qint32 minZoomLevel = 1;
-
- qint32 maxZoomLevel = 21;
-
QList<rawHeaderItem_t> rawHeaderItems;
+signals:
+ void sigQueueChanged();
+
+protected:
/// Mutex to control access to url queue
QMutex mutex {QMutex::Recursive};
/// a queue with all tile urls to request
@@ -96,13 +52,33 @@ private:
CDiskCache * diskCache = nullptr;
/// access manager to request tiles
QNetworkAccessManager * accessManager = nullptr;
-
QList<QString> urlPending;
- bool lastRequest = false;
+ bool lastRequest = false;
QTime timeLastUpdate;
+ QString name;
+
+ static bool httpsCheck(const QString &url);
+
+ void registerHeaderItem(const QString &name, const QString &value)
+ {
+ struct rawHeaderItem_t item;
+ item.name = name;
+ item.value = value;
+ rawHeaderItems << item;
+ }
+
+ void configureCache() override;
+
+public:
+ void slotQueueChanged();
+ void slotRequestFinished(QNetworkReply* reply);
+
+
+ IMapOnline(CMapDraw * parent);
+ virtual ~IMapOnline() {}
};
-#endif //CMAPTMS_H
+#endif //IMAPONLINE_H
diff --git a/src/mouse/CMouseEditArea.cpp b/src/mouse/CMouseEditArea.cpp
index 297fc66..459da2f 100644
--- a/src/mouse/CMouseEditArea.cpp
+++ b/src/mouse/CMouseEditArea.cpp
@@ -75,8 +75,6 @@ void CMouseEditArea::slotCopyToOrig()
void CMouseEditArea::slotCopyToNew()
{
- QMutexLocker lock(&IGisItem::mutexItems);
-
canvas->reportStatus(key.item,"");
if(points.size() < 3)
@@ -98,7 +96,10 @@ void CMouseEditArea::slotCopyToNew()
return;
}
- new CGisItemOvlArea(points, name, project, NOIDX);
+ {
+ QMutexLocker lock(&IGisItem::mutexItems);
+ new CGisItemOvlArea(points, name, project, NOIDX);
+ }
canvas->resetMouse();
canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
diff --git a/src/mouse/CMouseEditRte.cpp b/src/mouse/CMouseEditRte.cpp
index ea90b5e..f7eaa93 100644
--- a/src/mouse/CMouseEditRte.cpp
+++ b/src/mouse/CMouseEditRte.cpp
@@ -85,8 +85,6 @@ void CMouseEditRte::slotCopyToOrig()
void CMouseEditRte::slotCopyToNew()
{
- QMutexLocker lock(&IGisItem::mutexItems);
-
canvas->reportStatus(key.item,"");
if(points.size() < 2)
@@ -110,8 +108,10 @@ void CMouseEditRte::slotCopyToNew()
}
- new CGisItemRte(points,name, project, NOIDX);
-
+ {
+ QMutexLocker lock(&IGisItem::mutexItems);
+ new CGisItemRte(points,name, project, NOIDX);
+ }
canvas->resetMouse();
canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
}
diff --git a/src/mouse/CMouseEditTrk.cpp b/src/mouse/CMouseEditTrk.cpp
index b2a3221..4d07f6b 100644
--- a/src/mouse/CMouseEditTrk.cpp
+++ b/src/mouse/CMouseEditTrk.cpp
@@ -90,8 +90,6 @@ void CMouseEditTrk::slotCopyToOrig()
void CMouseEditTrk::slotCopyToNew()
{
- QMutexLocker lock(&IGisItem::mutexItems);
-
canvas->reportStatus(key.item,"");
if(points.size() < 2)
@@ -117,8 +115,10 @@ void CMouseEditTrk::slotCopyToNew()
CMainWindow::self().getElevationAt(points);
- new CGisItemTrk(points, name, project, NOIDX);
-
+ {
+ QMutexLocker lock(&IGisItem::mutexItems);
+ new CGisItemTrk(points, name, project, NOIDX);
+ }
canvas->resetMouse();
canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
}
diff --git a/src/mouse/CMouseSelect.cpp b/src/mouse/CMouseSelect.cpp
index 96d897b..334365d 100644
--- a/src/mouse/CMouseSelect.cpp
+++ b/src/mouse/CMouseSelect.cpp
@@ -37,7 +37,8 @@ CMouseSelect::CMouseSelect(CGisDraw *gis, CCanvas *parent)
connect(scrOptSelect->toolCopy, &QToolButton::clicked, this, &CMouseSelect::slotCopy);
connect(scrOptSelect->toolRoute, &QToolButton::clicked, this, &CMouseSelect::slotRoute);
connect(scrOptSelect->toolSymWpt, &QToolButton::clicked, this, &CMouseSelect::slotSymWpt);
- connect(scrOptSelect->toolCombineTracks, &QToolButton::clicked, this, &CMouseSelect::slotCombine);
+ connect(scrOptSelect->toolCombineTrk, &QToolButton::clicked, this, &CMouseSelect::slotCombineTrk);
+ connect(scrOptSelect->toolActivityTrk, &QToolButton::clicked, this, &CMouseSelect::slotActivityTrk);
connect(scrOptSelect->toolDelete, &QToolButton::clicked, this, &CMouseSelect::slotDelete);
}
@@ -125,7 +126,8 @@ void CMouseSelect::findItems(QList<IGisItem*>& items)
scrOptSelect->frameFunction->setDisabled(items.isEmpty());
scrOptSelect->toolSymWpt->setEnabled(cntWpt);
scrOptSelect->toolRoute->setEnabled(cntWpt > 1);
- scrOptSelect->toolCombineTracks->setEnabled(cntTrk > 1);
+ scrOptSelect->toolCombineTrk->setEnabled(cntTrk > 1);
+ scrOptSelect->toolActivityTrk->setEnabled(cntTrk > 0);
}
void CMouseSelect::draw(QPainter& p, CCanvas::redraw_e needsRedraw, const QRect &rect)
@@ -166,12 +168,18 @@ void CMouseSelect::slotRoute() const
canvas->resetMouse();
}
-void CMouseSelect::slotCombine() const
+void CMouseSelect::slotCombineTrk() const
{
CGisWidget::self().combineTrkByKey(itemKeys, itemKeys);
canvas->resetMouse();
}
+void CMouseSelect::slotActivityTrk() const
+{
+ CGisWidget::self().activityTrkByKey(itemKeys);
+ canvas->resetMouse();
+}
+
void CMouseSelect::slotSymWpt() const
{
QToolButton tb;
diff --git a/src/mouse/CMouseSelect.h b/src/mouse/CMouseSelect.h
index 5df628d..2e27121 100644
--- a/src/mouse/CMouseSelect.h
+++ b/src/mouse/CMouseSelect.h
@@ -40,7 +40,8 @@ private slots:
void slotCopy() const;
void slotRoute() const;
void slotSymWpt() const;
- void slotCombine() const;
+ void slotCombineTrk() const;
+ void slotActivityTrk() const;
void slotDelete() const;
private:
diff --git a/src/mouse/CScrOptRangeTrk.cpp b/src/mouse/CScrOptRangeTrk.cpp
index a250a2f..c5def1d 100644
--- a/src/mouse/CScrOptRangeTrk.cpp
+++ b/src/mouse/CScrOptRangeTrk.cpp
@@ -68,7 +68,7 @@ void CScrOptRangeTrk::draw(QPainter& p)
void CScrOptRangeTrk::selectActivity()
{
quint32 flags = CActivityTrk::selectActivity(this);
- if(0 != flags)
+ if(0xFFFFFFFF != flags)
{
emit activitySelected(flags);
}
diff --git a/src/mouse/IScrOptRangeTrk.ui b/src/mouse/IScrOptRangeTrk.ui
index 8b0dd16..aa4f5c0 100644
--- a/src/mouse/IScrOptRangeTrk.ui
+++ b/src/mouse/IScrOptRangeTrk.ui
@@ -65,7 +65,7 @@
<item>
<widget class="QToolButton" name="toolActivity">
<property name="toolTip">
- <string>Select an activity for the selected range.</string>
+ <string>Set an activity for the selected range.</string>
</property>
<property name="text">
<string>...</string>
diff --git a/src/mouse/IScrOptSelect.ui b/src/mouse/IScrOptSelect.ui
index ddd8c4d..d1be8d0 100644
--- a/src/mouse/IScrOptSelect.ui
+++ b/src/mouse/IScrOptSelect.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>27</width>
- <height>271</height>
+ <height>294</height>
</rect>
</property>
<property name="windowTitle">
@@ -114,7 +114,7 @@
</widget>
</item>
<item>
- <widget class="QToolButton" name="toolCombineTracks">
+ <widget class="QToolButton" name="toolCombineTrk">
<property name="toolTip">
<string>Combine all selected tracks to a new one.</string>
</property>
@@ -134,6 +134,20 @@
</widget>
</item>
<item>
+ <widget class="QToolButton" name="toolActivityTrk">
+ <property name="toolTip">
+ <string>Set an activity for all selected tracks.</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../resources.qrc">
+ <normaloff>:/icons/32x32/Activity.png</normaloff>:/icons/32x32/Activity.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QToolButton" name="toolDelete">
<property name="toolTip">
<string>Delete all selected items.</string>
diff --git a/src/mouse/line/ILineOp.cpp b/src/mouse/line/ILineOp.cpp
index c1a6cdd..97f68a2 100644
--- a/src/mouse/line/ILineOp.cpp
+++ b/src/mouse/line/ILineOp.cpp
@@ -233,6 +233,8 @@ void ILineOp::tryRouting(IGisLine::point_t& pt1, IGisLine::point_t& pt2) const
{
showRoutingErrorMessage(msg);
}
+ // that is a workaround for canvas loosing mousetracking caused by modal CProgressDialog:
+ canvas->setMouseTracking(true);
}
void ILineOp::finalizeOperation(qint32 idx)
diff --git a/src/mouse/line/IScrOptEditLine.ui b/src/mouse/line/IScrOptEditLine.ui
index e30050b..89a2e25 100644
--- a/src/mouse/line/IScrOptEditLine.ui
+++ b/src/mouse/line/IScrOptEditLine.ui
@@ -158,7 +158,7 @@
<item>
<widget class="QToolButton" name="toolDeletePoint">
<property name="toolTip">
- <string>Delete a point. (Ctrl+D)</string>
+ <string>Delete a point. (Ctrl+-)</string>
</property>
<property name="text">
<string>...</string>
@@ -168,7 +168,7 @@
<normaloff>:/icons/32x32/PointDel.png</normaloff>:/icons/32x32/PointDel.png</iconset>
</property>
<property name="shortcut">
- <string>Ctrl+D</string>
+ <string>Ctrl+-</string>
</property>
<property name="checkable">
<bool>true</bool>
diff --git a/src/qlgt/CQlgtDb.cpp b/src/qlgt/CQlgtDb.cpp
index a069d7b..1ed98cc 100644
--- a/src/qlgt/CQlgtDb.cpp
+++ b/src/qlgt/CQlgtDb.cpp
@@ -3,7 +3,7 @@
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 Softwareation, either version 3 of the License, or
+ 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,
diff --git a/src/qlgt/CQmsDb.cpp b/src/qlgt/CQmsDb.cpp
index 8345929..a986181 100644
--- a/src/qlgt/CQmsDb.cpp
+++ b/src/qlgt/CQmsDb.cpp
@@ -266,7 +266,7 @@ quint64 CQmsDb::store(IGisItem& item)
query.bindValue(":icon", buffer.data());
query.bindValue(":name", item.getName());
query.bindValue(":date", item.getTimestamp());
- query.bindValue(":comment", item.getInfo(true, true));
+ query.bindValue(":comment", item.getInfo(IGisItem::eFeatureShowName|IGisItem::eFeatureShowFullText));
query.bindValue(":data", data);
query.bindValue(":hash", item.getHash());
QUERY_EXEC(return 0);
diff --git a/src/resources.qrc b/src/resources.qrc
index 83375b6..808a9db 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -28,6 +28,7 @@
<file>icons/16x16/ActSwim.png</file>
<file>icons/16x16/ActAero.png</file>
<file>icons/16x16/ActSki.png</file>
+ <file>icons/16x16/ActTrain.png</file>
<file>icons/16x16/EditDetails.png</file>
<file>icons/32x32/Add.png</file>
<file>icons/32x32/AddMapWorkspace.png</file>
@@ -192,6 +193,7 @@
<file>icons/32x32/ActSwim.png</file>
<file>icons/32x32/ActAero.png</file>
<file>icons/32x32/ActSki.png</file>
+ <file>icons/32x32/ActTrain.png</file>
<file>icons/32x32/Activity.png</file>
<file>icons/32x32/CSrcSolid.png</file>
<file>icons/32x32/CSrcHR.png</file>
@@ -206,6 +208,7 @@
<file>icons/32x32/CSrcAccel.png</file>
<file>icons/32x32/CSrcCourse.png</file>
<file>icons/32x32/CSrcDistance.png</file>
+ <file>icons/32x32/CSrcEnergy.png</file>
<file>icons/32x32/CSrcSeaLevelPressure.png</file>
<file>icons/32x32/CSrcVertSpeed.png</file>
<file>icons/32x32/Progress.png</file>
@@ -226,6 +229,17 @@
<file>icons/32x32/SortName.png</file>
<file>icons/32x32/SaveGISAsGpx11.png</file>
<file>icons/32x32/CopyTrkWithWpt.png</file>
+ <file>icons/32x32/ToolBarSetup.png</file>
+ <file>icons/32x32/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/32x32/ToolBar.png</file>
+ <file>icons/32x32/FullScreen.png</file>
+ <file>icons/32x32/RegularScreen.png</file>
+ <file>icons/32x32/Template.png</file>
+ <file>icons/32x32/AutoSave.png</file>
<file>icons/48x48/Add.png</file>
<file>icons/48x48/AddMapWorkspace.png</file>
<file>icons/48x48/CloneMapWorkspace.png</file>
@@ -389,6 +403,7 @@
<file>icons/48x48/ActSwim.png</file>
<file>icons/48x48/ActAero.png</file>
<file>icons/48x48/ActSki.png</file>
+ <file>icons/48x48/ActTrain.png</file>
<file>icons/48x48/Activity.png</file>
<file>icons/48x48/CSrcSolid.png</file>
<file>icons/48x48/CSrcHR.png</file>
@@ -403,6 +418,7 @@
<file>icons/48x48/CSrcAccel.png</file>
<file>icons/48x48/CSrcCourse.png</file>
<file>icons/48x48/CSrcDistance.png</file>
+ <file>icons/48x48/CSrcEnergy.png</file>
<file>icons/48x48/CSrcSeaLevelPressure.png</file>
<file>icons/48x48/CSrcVertSpeed.png</file>
<file>icons/48x48/Progress.png</file>
@@ -423,6 +439,17 @@
<file>icons/48x48/SortName.png</file>
<file>icons/48x48/SaveGISAsGpx11.png</file>
<file>icons/48x48/CopyTrkWithWpt.png</file>
+ <file>icons/48x48/ToggleDem.png</file>
+ <file>icons/48x48/ToggleDocks.png</file>
+ <file>icons/48x48/ToggleGis.png</file>
+ <file>icons/48x48/ToggleMaps.png</file>
+ <file>icons/48x48/ToggleRouter.png</file>
+ <file>icons/48x48/ToolBarSetup.png</file>
+ <file>icons/48x48/ToolBar.png</file>
+ <file>icons/48x48/FullScreen.png</file>
+ <file>icons/48x48/RegularScreen.png</file>
+ <file>icons/48x48/Template.png</file>
+ <file>icons/48x48/AutoSave.png</file>
<file>icons/cache/32x32/bluepin.png</file>
<file>icons/cache/32x32/cito.png</file>
<file>icons/cache/32x32/corrected.png</file>
@@ -495,7 +522,17 @@
<file>icons/waypoints/32x32/Straight.png</file>
<file>icons/waypoints/32x32/Summit.png</file>
<file>icons/waypoints/32x32/Valley.png</file>
- <file>icons/waypoints/32x32/Water.png</file>
+ <file>icons/waypoints/32x32/Water.png</file>
+ <file>icons/waypoints/32x32/LeftFork.png</file>
+ <file>icons/waypoints/32x32/RightFork.png</file>
+ <file>icons/waypoints/32x32/MiddleFork.png</file>
+ <file>icons/waypoints/32x32/SlightLeft.png</file>
+ <file>icons/waypoints/32x32/SharpLeft.png</file>
+ <file>icons/waypoints/32x32/SlightRight.png</file>
+ <file>icons/waypoints/32x32/SharpRight.png</file>
+ <file>icons/waypoints/32x32/UTurn.png</file>
+ <file>icons/waypoints/32x32/Start.png</file>
+ <file>icons/waypoints/32x32/End.png</file>
<file>cursors/cursorArrow.png</file>
<file>cursors/cursorMove.png</file>
<file>cursors/cursorPointMove.png</file>
@@ -524,19 +561,6 @@
<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>
+ <file>templates/Hiking_Tour_Summary.ui</file>
</qresource>
</RCC>
diff --git a/src/setup/CAppSetupMac.cpp b/src/setup/CAppSetupMac.cpp
index 5d99e53..8addd19 100644
--- a/src/setup/CAppSetupMac.cpp
+++ b/src/setup/CAppSetupMac.cpp
@@ -66,6 +66,16 @@ void CAppSetupMac::initQMapShack()
prepareTranslator(translationPath, "qt_");
prepareTranslator(translationPath, "qmapshack_");
+ // load and apply style sheet
+ QApplication* app = (QApplication*) QCoreApplication::instance();
+
+ QString fileName = QDir(getApplicationDir("Resources")).absoluteFilePath("qms-style.qss");
+ qDebug() << "Stylesheet" << fileName;
+ QFile styleFile(fileName);
+ styleFile.open(QFile::ReadOnly);
+ QString style(QLatin1String(styleFile.readAll()));
+ app->setStyleSheet(style);
+
migrateDirContent(defaultCachePath());
migrateDirContent(userDataPath());
diff --git a/src/templates/Hiking_Tour_Summary.ui b/src/templates/Hiking_Tour_Summary.ui
new file mode 100644
index 0000000..4794ccd
--- /dev/null
+++ b/src/templates/Hiking_Tour_Summary.ui
@@ -0,0 +1,369 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>564</width>
+ <height>578</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="3" column="0" colspan="2">
+ <widget class="QGroupBox" name="groupBox4">
+ <property name="title">
+ <string>Participants</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QLineEdit" name="lineEdit"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox1">
+ <property name="title">
+ <string>Weather</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="3" column="0">
+ <widget class="QCheckBox" name="checkBox_6">
+ <property name="text">
+ <string>rain</string>
+ </property>
+ <property name="shortcut">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="checkBox">
+ <property name="text">
+ <string>sunny</string>
+ </property>
+ <property name="shortcut">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QCheckBox" name="checkBox_7">
+ <property name="text">
+ <string>snow</string>
+ </property>
+ <property name="shortcut">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="checkBox_5">
+ <property name="text">
+ <string>clouds</string>
+ </property>
+ <property name="shortcut">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" colspan="3">
+ <widget class="QLineEdit" name="lineEdit_2"/>
+ </item>
+ <item row="1" column="2">
+ <widget class="QRadioButton" name="radioButton">
+ <property name="text">
+ <string>hot</string>
+ </property>
+ <property name="shortcut">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QRadioButton" name="radioButton_2">
+ <property name="text">
+ <string>warm</string>
+ </property>
+ <property name="shortcut">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2">
+ <widget class="QRadioButton" name="radioButton_3">
+ <property name="text">
+ <string>cold</string>
+ </property>
+ <property name="shortcut">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2">
+ <widget class="QRadioButton" name="radioButton_4">
+ <property name="text">
+ <string>freezing</string>
+ </property>
+ <property name="shortcut">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="checkBox_20">
+ <property name="text">
+ <string>foggy</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="checkBox_18">
+ <property name="text">
+ <string>windy</string>
+ </property>
+ <property name="shortcut">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QCheckBox" name="checkBox_11">
+ <property name="text">
+ <string>humid</string>
+ </property>
+ <property name="shortcut">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="4" column="1">
+ <widget class="QCheckBox" name="checkBox_2">
+ <property name="text">
+ <string>hail/soft hail</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="groupBox2">
+ <property name="title">
+ <string>Character</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="1">
+ <widget class="QCheckBox" name="checkBox_14">
+ <property name="text">
+ <string>large ascend</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="checkBox_17">
+ <property name="text">
+ <string>climbing</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" colspan="2">
+ <widget class="QLineEdit" name="lineEdit_3"/>
+ </item>
+ <item row="3" column="1">
+ <widget class="QCheckBox" name="checkBox_16">
+ <property name="text">
+ <string>via ferrata</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Rating</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QComboBox" name="comboBox">
+ <item>
+ <property name="text">
+ <string/>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Rating 5 stars</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Rating 4 stars</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Rating 3 stars</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Rating 2 stars</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Rating 1 star</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="radioButton_6">
+ <property name="text">
+ <string>easy hiking</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="checkBox_13">
+ <property name="text">
+ <string>long distance</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QRadioButton" name="radioButton_5">
+ <property name="text">
+ <string>alpine</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="checkBox_4">
+ <property name="text">
+ <string>aborted</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QGroupBox" name="groupBox3">
+ <property name="title">
+ <string>Equipment</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="4">
+ <widget class="QCheckBox" name="checkBox_8">
+ <property name="text">
+ <string>ski</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="checkBox_3">
+ <property name="text">
+ <string>climbing gear</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QCheckBox" name="checkBox_19">
+ <property name="text">
+ <string>ferrata gear</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="checkBox_12">
+ <property name="text">
+ <string>camping gear</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="checkBox_10">
+ <property name="text">
+ <string>night gear</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="4">
+ <widget class="QCheckBox" name="checkBox_9">
+ <property name="text">
+ <string>snow shoes</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="4" column="0" colspan="2">
+ <widget class="QGroupBox" name="groupBox5">
+ <property name="title">
+ <string>Details</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QTextEdit" name="textEdit"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <tabstops>
+ <tabstop>checkBox</tabstop>
+ <tabstop>checkBox_5</tabstop>
+ <tabstop>checkBox_6</tabstop>
+ <tabstop>checkBox_7</tabstop>
+ <tabstop>checkBox_20</tabstop>
+ <tabstop>checkBox_18</tabstop>
+ <tabstop>checkBox_11</tabstop>
+ <tabstop>checkBox_2</tabstop>
+ <tabstop>radioButton</tabstop>
+ <tabstop>radioButton_2</tabstop>
+ <tabstop>radioButton_3</tabstop>
+ <tabstop>radioButton_4</tabstop>
+ <tabstop>lineEdit_2</tabstop>
+ <tabstop>radioButton_6</tabstop>
+ <tabstop>radioButton_5</tabstop>
+ <tabstop>checkBox_4</tabstop>
+ <tabstop>checkBox_14</tabstop>
+ <tabstop>checkBox_13</tabstop>
+ <tabstop>checkBox_17</tabstop>
+ <tabstop>checkBox_16</tabstop>
+ <tabstop>comboBox</tabstop>
+ <tabstop>lineEdit_3</tabstop>
+ <tabstop>checkBox_3</tabstop>
+ <tabstop>checkBox_19</tabstop>
+ <tabstop>checkBox_8</tabstop>
+ <tabstop>checkBox_12</tabstop>
+ <tabstop>checkBox_10</tabstop>
+ <tabstop>checkBox_9</tabstop>
+ <tabstop>lineEdit</tabstop>
+ <tabstop>textEdit</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/tool/CMapVrtBuilder.cpp b/src/tool/CMapVrtBuilder.cpp
index 4f1ad65..c6fca0a 100644
--- a/src/tool/CMapVrtBuilder.cpp
+++ b/src/tool/CMapVrtBuilder.cpp
@@ -31,12 +31,28 @@ CMapVrtBuilder::CMapVrtBuilder(QWidget *parent)
connect(toolSourceFiles, &QToolButton::clicked, this, &CMapVrtBuilder::slotSelectSourceFiles);
connect(toolTargetFile, &QToolButton::clicked, this, &CMapVrtBuilder::slotSelectTargetFile);
connect(pushStart, &QPushButton::clicked, this, &CMapVrtBuilder::slotStart);
+ connect(labelHelpGDAL, &QLabel::linkActivated,this, &CMapVrtBuilder::slotLinkActivated);
pushStart->setDisabled(true);
+
+ SETTINGS;
+ cfg.beginGroup("VrtBuilder");
+ groupAdvancedOptions->setChecked(cfg.value("AdvancedOptions", false).toBool());
+ lineASrs->setText(cfg.value("a_srs", "").toString());
+ lineSrcNoData->setText(cfg.value("srcndata", "").toString());
+ lineVrtNoData->setText(cfg.value("vrtndata", "").toString());
+ cfg.endGroup();
}
CMapVrtBuilder::~CMapVrtBuilder()
{
+ SETTINGS;
+ cfg.beginGroup("VrtBuilder");
+ cfg.setValue("AdvancedOptions", groupAdvancedOptions->isChecked());
+ cfg.setValue("a_srs", lineASrs->text());
+ cfg.setValue("srcndata", lineSrcNoData->text());
+ cfg.setValue("vrtndata", lineVrtNoData->text());
+ cfg.endGroup();
}
void CMapVrtBuilder::slotSelectSourceFiles()
@@ -98,6 +114,25 @@ void CMapVrtBuilder::slotStart()
pushStart->setDisabled(true);
QStringList args;
+
+ if(groupAdvancedOptions->isChecked())
+ {
+ if(!lineASrs->text().isEmpty())
+ {
+ args << "-a_srs" << lineASrs->text();
+ }
+
+ if(!lineSrcNoData->text().isEmpty())
+ {
+ args << "-srcnodata" << lineSrcNoData->text();
+ }
+
+ if(!lineVrtNoData->text().isEmpty())
+ {
+ args << "-vrtnodata" << lineVrtNoData->text();
+ }
+ }
+
args << labelTargetFilename->text();
for(const QListWidgetItem * item : listWidget->findItems("*", Qt::MatchWildcard))
@@ -115,3 +150,8 @@ void CMapVrtBuilder::finished(int exitCode, QProcess::ExitStatus status)
textBrowser->append(tr("!!! done !!!\n"));
pushStart->setEnabled(true);
}
+
+void CMapVrtBuilder::slotLinkActivated(const QUrl& url)
+{
+ QDesktopServices::openUrl(url);
+}
diff --git a/src/tool/CMapVrtBuilder.h b/src/tool/CMapVrtBuilder.h
index c1ca12d..98e845f 100644
--- a/src/tool/CMapVrtBuilder.h
+++ b/src/tool/CMapVrtBuilder.h
@@ -34,6 +34,7 @@ private slots:
void slotSelectSourceFiles();
void slotSelectTargetFile();
void slotStart();
+ void slotLinkActivated(const QUrl& url);
private:
void finished(int exitCode, QProcess::ExitStatus status) override;
diff --git a/src/tool/IMapVrtBuilder.ui b/src/tool/IMapVrtBuilder.ui
index 5d6405a..305bcc8 100644
--- a/src/tool/IMapVrtBuilder.ui
+++ b/src/tool/IMapVrtBuilder.ui
@@ -14,16 +14,92 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item row="3" column="1">
+ <widget class="QPushButton" name="pushStart">
+ <property name="text">
+ <string>Start</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="groupAdvancedOptions">
+ <property name="title">
+ <string>Advanced Options</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Source No Data (-srcnodata)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Target No Data (-vrtnodata)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="lineVrtNoData"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Target Projection (-a_srs)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="labelHelpGDAL">
+ <property name="text">
+ <string>These options are for particular cases and usually you would like to leave blank.See GDAL <a href='http://www.gdal.org/gdalbuildvrt.html'>Help</a> for more information.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="lineSrcNoData">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lineASrs">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QToolButton" name="toolSourceFiles">
+ <widget class="QToolButton" name="toolTargetFile">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../resources.qrc">
- <normaloff>:/icons/32x32/PathGreen.png</normaloff>:/icons/32x32/PathGreen.png</iconset>
+ <normaloff>:/icons/32x32/PathBlue.png</normaloff>:/icons/32x32/PathBlue.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -34,30 +110,37 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="label_4">
+ <widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
- <string>Select source files:</string>
+ <string>Target Filename:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="labelTargetFilename">
+ <property name="text">
+ <string>-</string>
</property>
</widget>
</item>
</layout>
</item>
- <item row="1" column="0">
- <widget class="QListWidget" name="listWidget"/>
- </item>
- <item row="1" column="1">
- <widget class="QTextBrowser" name="textBrowser"/>
- </item>
- <item row="2" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
- <widget class="QToolButton" name="toolTargetFile">
+ <widget class="QToolButton" name="toolSourceFiles">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../resources.qrc">
- <normaloff>:/icons/32x32/PathBlue.png</normaloff>:/icons/32x32/PathBlue.png</iconset>
+ <normaloff>:/icons/32x32/PathGreen.png</normaloff>:/icons/32x32/PathGreen.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -68,33 +151,75 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="label">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Select source files:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <widget class="QListWidget" name="listWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="label_7">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
- <string>Target Filename:</string>
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="../resources.qrc">:/icons/48x48/Help.png</pixmap>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="labelTargetFilename">
+ <widget class="QLabel" name="label_8">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
- <string>-</string>
+ <string>1. Select one or multiple source files.
+2. Select a file name for the target VRT file.
+3. Press "Start" button.
+
+Tip:
+* If you have several files place them in a subfolder of your map path. Create the VRT file in your map path.
+* Use the advanced options to add a "no data" value if your source files do not have one and do not form a rectangular map. Areas with no map file will become transparent.
+* The "-a_srs" option is intended to assign a Projection/Datum when the source file lacks it. This does NOT re-project the data.</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
- <item row="2" column="1">
- <widget class="QPushButton" name="pushStart">
- <property name="text">
- <string>Start</string>
- </property>
- </widget>
+ <item row="1" column="1">
+ <widget class="QTextBrowser" name="textBrowser"/>
</item>
</layout>
</widget>
diff --git a/src/tool/IToolShell.h b/src/tool/IToolShell.h
index 2b72147..3fd7b5a 100644
--- a/src/tool/IToolShell.h
+++ b/src/tool/IToolShell.h
@@ -38,9 +38,9 @@ public:
}
protected slots:
- /// read the stderr from the process and paste it into the text browswer
+ /// read the stderr from the process and paste it into the text browser
void slotStderr();
- /// read the stdout from the process and paste it into the text browswer
+ /// read the stdout from the process and paste it into the text browser
void slotStdout();
void slotError(QProcess::ProcessError error);
virtual void slotFinished(int exitCode, QProcess::ExitStatus status);
diff --git a/src/widgets/CTemplateWidget.cpp b/src/widgets/CTemplateWidget.cpp
new file mode 100644
index 0000000..f22512e
--- /dev/null
+++ b/src/widgets/CTemplateWidget.cpp
@@ -0,0 +1,258 @@
+/**********************************************************************************************
+ Copyright (C) 2017 Oliver Eichler oliver.eichler at gmx.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "helpers/CSettings.h"
+#include "widgets/CTemplateWidget.h"
+
+#include <QtGui>
+#include <QtUiTools>
+
+CTemplateWidget::CTemplateWidget(QWidget *parent)
+ : QDialog(parent)
+{
+ setupUi(this);
+ connect(comboTemplates, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &CTemplateWidget::slotTemplateActivated);
+ connect(pushPreview, &QPushButton::pressed, this, &CTemplateWidget::slotPreview);
+ connect(toolPathTemplates, &QToolButton::pressed, this, &CTemplateWidget::slotSetPath);
+ listTemplates();
+}
+
+
+void CTemplateWidget::listTemplates()
+{
+ comboTemplates->clear();
+ comboTemplates->addItem(tr("choose one..."));
+ comboTemplates->addItem(tr("Hiking Tour Summary (built-in)"), "://templates/Hiking_Tour_Summary.ui");
+
+ SETTINGS;
+ const QString& path = cfg.value("TextEditWidget/templatePath", "").toString();
+
+ if(!path.isEmpty())
+ {
+ QDir dir(path);
+ QStringList files = dir.entryList(QStringList("*.ui"), QDir::Files);
+ for(const QString& file : files)
+ {
+ QString name = QFileInfo(file).completeBaseName().replace("_", " ");
+ comboTemplates->addItem(name, dir.absoluteFilePath(file));
+ }
+ }
+
+ const QString& data = cfg.value("TextEditWidget/template", "").toString();
+ const int idx = comboTemplates->findData(data);
+ if(idx != -1)
+ {
+ comboTemplates->setCurrentIndex(idx);
+ }
+}
+
+QString CTemplateWidget::text()
+{
+ if(widget.isNull())
+ {
+ return "";
+ }
+ QString str;
+
+ QList<QGroupBox*> groups = widget->findChildren<QGroupBox*>(QRegExp("group.*"), Qt::FindDirectChildrenOnly);
+ qSort(groups.begin(), groups.end(), [](const QGroupBox * g1, const QGroupBox * g2){return g1->objectName() < g2->objectName(); });
+
+ for(const QGroupBox * group : groups)
+ {
+ str += QString("<p><b>%1</b>: ").arg(group->title());
+ str += resolveGroup(group);
+ str += "</p>";
+ }
+
+ return str;
+}
+
+QString CTemplateWidget::resolveGroup(const QGroupBox * group)
+{
+ QString str;
+ QList<QWidget *> widgets = group->findChildren<QWidget*>(QRegExp(".*"), Qt::FindDirectChildrenOnly);
+ qSort(widgets.begin(), widgets.end(), [](const QWidget * w1, const QWidget * w2){return w1->property("order") < w2->property("order"); });
+
+ for(const QWidget * w : widgets)
+ {
+ const QString pre(str.isEmpty() ? "" : ", ");
+
+ {
+ const QCheckBox * obj = dynamic_cast<const QCheckBox*>(w);
+ if(obj != nullptr)
+ {
+ if(obj->isChecked())
+ {
+ str += pre + obj->text().replace("&","");
+ }
+ continue;
+ }
+ }
+
+ {
+ const QRadioButton * obj = dynamic_cast<const QRadioButton*>(w);
+ if(obj != nullptr)
+ {
+ if(obj->isChecked())
+ {
+ str += pre + obj->text().replace("&","");
+ }
+ continue;
+ }
+ }
+
+ {
+ const QComboBox * obj = dynamic_cast<const QComboBox*>(w);
+ if(obj != nullptr)
+ {
+ if(!obj->currentText().isEmpty())
+ {
+ str += pre + obj->currentText();
+ }
+ continue;
+ }
+ }
+
+ {
+ const QLineEdit * obj = dynamic_cast<const QLineEdit*>(w);
+ if(obj != nullptr)
+ {
+ if(!obj->text().simplified().isEmpty())
+ {
+ str += pre + obj->text();
+ }
+ continue;
+ }
+ }
+
+ {
+ const QTextEdit * obj = dynamic_cast<const QTextEdit*>(w);
+ if(obj != nullptr)
+ {
+ if(!obj->toPlainText().simplified().isEmpty())
+ {
+ str += pre + obj->toHtml();
+ }
+ continue;
+ }
+ }
+ }
+
+ if(str.isEmpty())
+ {
+ str += tr("-");
+ }
+
+ return str;
+}
+
+void CTemplateWidget::slotSetPath()
+{
+ SETTINGS;
+ QString path = cfg.value("TextEditWidget/templatePath", QDir::homePath()).toString();
+ path = QFileDialog::getExistingDirectory(this, tr("Template path..."), path);
+ if(path.isEmpty())
+ {
+ return;
+ }
+ cfg.setValue("TextEditWidget/templatePath", path);
+ listTemplates();
+}
+
+void CTemplateWidget::slotTemplateActivated(int idx)
+{
+ delete widget;
+ if(idx < 1)
+ {
+ pushPreview->setEnabled(false);
+ buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+ return;
+ }
+
+ bool success = false;
+ const QString& filename = comboTemplates->itemData(idx).toString();
+ QFile file(filename);
+ if(!file.open(QFile::ReadOnly))
+ {
+ widget = new QLabel(tr("Failed to read template file %1.").arg(filename));
+ }
+ else
+ {
+ QUiLoader loader;
+ widget = loader.load(&file, this);
+ file.close();
+
+ if(widget.isNull())
+ {
+ widget = new QLabel(loader.errorString());
+ }
+ else
+ {
+ // convert focus chain into a sortable property.
+ quint32 cnt = 0;
+ QWidget * first = nextInFocusChain();
+ QWidget * next = first;
+ do
+ {
+ if( (dynamic_cast<QCheckBox*>(next) != nullptr)
+ || (dynamic_cast<QRadioButton*>(next) != nullptr)
+ || (dynamic_cast<QComboBox*>(next) != nullptr)
+ || (dynamic_cast<QLineEdit*>(next) != nullptr)
+ || (dynamic_cast<QTextEdit*>(next) != nullptr)
+ )
+ {
+ next->setProperty("order", cnt++);
+ }
+
+ next = next->nextInFocusChain();
+ }
+ while(next != first);
+
+ success = true;
+ }
+ }
+
+ layoutWidget->insertWidget(0,widget);
+ pushPreview->setEnabled(success);
+ buttonBox->button(QDialogButtonBox::Ok)->setEnabled(success);
+
+ SETTINGS;
+ cfg.setValue("TextEditWidget/template", filename);
+}
+
+void CTemplateWidget::slotPreview()
+{
+ QTextBrowser * preview = new QTextBrowser();
+
+ preview->setAttribute(Qt::WA_DeleteOnClose, true);
+ preview->setWindowModality(Qt::ApplicationModal);
+ preview->setReadOnly(true);
+ preview->setHtml(text());
+ preview->setWindowTitle(tr("Preview..."));
+
+ preview->setMinimumWidth(600);
+ preview->move(QApplication::desktop()->screen()->rect().center() - preview->rect().center());
+ preview->show();
+ preview->raise();
+
+ QAction * action = new QAction(preview);
+ action->setShortcut(Qt::Key_Escape);
+
+ preview->addAction(action);
+ connect(action, &QAction::triggered, preview, &QTextBrowser::close);
+}
diff --git a/src/tool/CMapVrtBuilder.h b/src/widgets/CTemplateWidget.h
similarity index 60%
copy from src/tool/CMapVrtBuilder.h
copy to src/widgets/CTemplateWidget.h
index c1ca12d..44dce9c 100644
--- a/src/tool/CMapVrtBuilder.h
+++ b/src/widgets/CTemplateWidget.h
@@ -1,5 +1,5 @@
/**********************************************************************************************
- Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+ Copyright (C) 2017 Oliver Eichler oliver.eichler at gmx.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,29 +16,37 @@
**********************************************************************************************/
-#ifndef CMAPVRTBUILDER_H
-#define CMAPVRTBUILDER_H
+#ifndef CTEMPLATEWIDGET_H
+#define CTEMPLATEWIDGET_H
-#include "tool/IToolShell.h"
-#include "ui_IMapVrtBuilder.h"
-#include <QWidget>
+#include <QDialog>
+#include <QPointer>
-class CMapVrtBuilder : public IToolShell, private Ui::IMapVrtBuilder
+#include "ui_ITemplateWidget.h"
+
+class QGroupBox;
+
+class CTemplateWidget : public QDialog, private Ui::ITemplateWidget
{
Q_OBJECT
public:
- CMapVrtBuilder(QWidget * parent);
- virtual ~CMapVrtBuilder();
+ CTemplateWidget(QWidget * parent);
+ virtual ~CTemplateWidget() = default;
+
+ QString text();
private slots:
- void slotSelectSourceFiles();
- void slotSelectTargetFile();
- void slotStart();
+ void slotTemplateActivated(int idx);
+ void slotPreview();
+ void slotSetPath();
private:
- void finished(int exitCode, QProcess::ExitStatus status) override;
- void enableStartButton();
+ void listTemplates();
+ QString resolveGroup(const QGroupBox * group);
+
+
+ QPointer<QWidget> widget;
};
-#endif //CMAPVRTBUILDER_H
+#endif //CTEMPLATEWIDGET_H
diff --git a/src/widgets/CTextEditWidget.cpp b/src/widgets/CTextEditWidget.cpp
index 4c4ee46..7ed8d37 100644
--- a/src/widgets/CTextEditWidget.cpp
+++ b/src/widgets/CTextEditWidget.cpp
@@ -22,6 +22,7 @@
#include "CTextEditWidget.h"
#include "helpers/CSettings.h"
#include "helpers/Signals.h"
+#include "widgets/CTemplateWidget.h"
#include "widgets/CTextEditWidgetSelMenu.h"
#include <QtWidgets>
@@ -88,6 +89,7 @@ CTextEditWidget::CTextEditWidget(const QString &html, QWidget * parent)
colorChanged(textEdit->textColor());
alignmentChanged(textEdit->alignment());
+ toolInsertFromTemplate->setDefaultAction(actionInsertFromTemplate);
toolUndo->setDefaultAction(actionUndo);
toolRedo->setDefaultAction(actionRedo);
toolCut->setDefaultAction(actionCut);
@@ -101,6 +103,8 @@ CTextEditWidget::CTextEditWidget(const QString &html, QWidget * parent)
/* Setup contextmenu for textEdit */
menuTextEdit = new QMenu(this);
+ menuTextEdit->addAction(actionInsertFromTemplate);
+ menuTextEdit->addSeparator();
menuTextEdit->addAction(actionUndo);
menuTextEdit->addAction(actionRedo);
menuTextEdit->addSeparator();
@@ -130,6 +134,7 @@ CTextEditWidget::CTextEditWidget(const QString &html, QWidget * parent)
connect(textEdit->document(), &QTextDocument::undoAvailable, actionUndo, &QAction::setEnabled);
connect(textEdit->document(), &QTextDocument::redoAvailable, actionRedo, &QAction::setEnabled);
+ connect(actionInsertFromTemplate, &QAction::triggered, this, &CTextEditWidget::insertFromTemplate);
connect(actionUndo, &QAction::triggered, textEdit, &QTextEdit::undo);
connect(actionRedo, &QAction::triggered, textEdit, &QTextEdit::redo);
@@ -179,6 +184,7 @@ QString CTextEditWidget::getHtml()
return str;
}
+
void CTextEditWidget::textBold()
{
QTextCharFormat fmt;
@@ -506,3 +512,13 @@ void CTextEditWidget::updateSelectionWindow()
selectionWindow->hide();
}
}
+
+
+void CTextEditWidget::insertFromTemplate()
+{
+ CTemplateWidget dlg(this);
+ if(dlg.exec() == QDialog::Accepted)
+ {
+ textEdit->insertHtml(dlg.text());
+ }
+}
diff --git a/src/widgets/CTextEditWidget.h b/src/widgets/CTextEditWidget.h
index a18eda6..b1bbf76 100644
--- a/src/widgets/CTextEditWidget.h
+++ b/src/widgets/CTextEditWidget.h
@@ -23,6 +23,7 @@
#include "ui_ITextEditWidget.h"
#include <QDialog>
+#include <QDir>
#include <QTextCharFormat>
@@ -60,12 +61,12 @@ private slots:
void textEditScrolled();
+ void insertFromTemplate();
private:
void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
void fontChanged(const QFont &f);
void colorChanged(const QColor &c);
void alignmentChanged(Qt::Alignment a);
-
void updateSelectionWindow();
QAction *actionTextColor;
diff --git a/src/canvas/ICanvasSetup.ui b/src/widgets/ITemplateWidget.ui
similarity index 50%
copy from src/canvas/ICanvasSetup.ui
copy to src/widgets/ITemplateWidget.ui
index 9a2697b..4de3fcd 100644
--- a/src/canvas/ICanvasSetup.ui
+++ b/src/widgets/ITemplateWidget.ui
@@ -1,92 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>ICanvasSetup</class>
- <widget class="QDialog" name="ICanvasSetup">
+ <class>ITemplateWidget</class>
+ <widget class="QDialog" name="ITemplateWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>446</width>
- <height>179</height>
+ <width>400</width>
+ <height>300</height>
</rect>
</property>
<property name="windowTitle">
- <string>Setup Map View...</string>
+ <string>Insert Template...</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="windowIcon">
+ <iconset resource="../resources.qrc">
+ <normaloff>:/icons/32x32/Template.png</normaloff>:/icons/32x32/Template.png</iconset>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QLabel" name="label_2">
+ <widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
- <string>Projection & Datum</string>
+ <string>Templates</string>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="lineProjection"/>
+ <widget class="QComboBox" name="comboTemplates"/>
</item>
<item>
- <widget class="QToolButton" name="toolWizard">
+ <widget class="QToolButton" name="toolPathTemplates">
+ <property name="toolTip">
+ <string>Select a path with your own templates.</string>
+ </property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../resources.qrc">
- <normaloff>:/icons/32x32/GridWizzard.png</normaloff>:/icons/32x32/GridWizzard.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
+ <normaloff>:/icons/32x32/PathBlue.png</normaloff>:/icons/32x32/PathBlue.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="layoutWidget">
<item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Scales</string>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QRadioButton" name="radioScalesDefault">
- <property name="text">
- <string>Logarithmic</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="radioScalesSquare">
- <property name="text">
- <string>Square (optimized for TMS and WTMS tiles)</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
</item>
</layout>
</item>
<item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>9</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QPushButton" name="pushPreview">
+ <property name="text">
+ <string>Preview</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
@@ -108,7 +112,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>ICanvasSetup</receiver>
+ <receiver>ITemplateWidget</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -124,7 +128,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>ICanvasSetup</receiver>
+ <receiver>ITemplateWidget</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
diff --git a/src/widgets/ITextEditWidget.ui b/src/widgets/ITextEditWidget.ui
index 1eb80df..7c18c91 100644
--- a/src/widgets/ITextEditWidget.ui
+++ b/src/widgets/ITextEditWidget.ui
@@ -6,20 +6,40 @@
<rect>
<x>0</x>
<y>0</y>
- <width>429</width>
+ <width>504</width>
<height>341</height>
</rect>
</property>
<property name="windowTitle">
<string>Edit text...</string>
</property>
- <layout class="QVBoxLayout">
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout">
<property name="spacing">
<number>2</number>
</property>
<item>
+ <widget class="QToolButton" name="toolInsertFromTemplate">
+ <property name="text">
+ <string>Templ.</string>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>24</width>
+ <height>24</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QToolButton" name="toolUndo">
<property name="text">
<string>Undo</string>
@@ -548,6 +568,18 @@
<string>Paste without resetting the text's format</string>
</property>
</action>
+ <action name="actionInsertFromTemplate">
+ <property name="icon">
+ <iconset resource="../resources.qrc">
+ <normaloff>:/icons/32x32/Template.png</normaloff>:/icons/32x32/Template.png</iconset>
+ </property>
+ <property name="text">
+ <string>Insert From Template</string>
+ </property>
+ <property name="toolTip">
+ <string>Create text from template.</string>
+ </property>
+ </action>
</widget>
<customwidgets>
<customwidget>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git
More information about the Pkg-grass-devel
mailing list